This commit is contained in:
Jing Ling
2020-11-19 01:24:02 +08:00
parent 94e729dd6c
commit c5c3d7a70d
+3 -3
View File
@@ -46,7 +46,7 @@ def export_data(target, db=None, alive=False, limit=None, path=None, fmt='csv',
rows = database.export_data(table_name, alive, limit) rows = database.export_data(table_name, alive, limit)
if rows is None: if rows is None:
continue continue
data, _, _ = do_export(fmt, path, rows, show, table_name, target) data, _, _ = do_export(fmt, path, rows, show, domain, target)
datas.extend(data) datas.extend(data)
database.close() database.close()
if len(domains) > 1: if len(domains) > 1:
@@ -54,14 +54,14 @@ def export_data(target, db=None, alive=False, limit=None, path=None, fmt='csv',
return datas return datas
def do_export(fmt, path, rows, show, table_name, target): def do_export(fmt, path, rows, show, domain, target):
fmt = utils.check_format(fmt) fmt = utils.check_format(fmt)
path = utils.check_path(path, target, fmt) path = utils.check_path(path, target, fmt)
if show: if show:
print(rows.dataset) print(rows.dataset)
data = rows.export(fmt) data = rows.export(fmt)
utils.save_to_file(path, data) utils.save_to_file(path, data)
logger.log('ALERT', f'The subdomain result for {table_name}: {path}') logger.log('ALERT', f'The subdomain result for {domain}: {path}')
data = rows.as_dict() data = rows.as_dict()
return data, fmt, path return data, fmt, path