Change the dump file name

This commit is contained in:
郭睆 2023-06-21 21:03:57 +08:00
parent 1230e57fca
commit b46851a993
2 changed files with 5 additions and 2 deletions

View File

@ -58,6 +58,7 @@ from lib.core.settings import WINDOWS_RESERVED_NAMES
from lib.utils.safe2bin import safechardecode from lib.utils.safe2bin import safechardecode
from thirdparty import six from thirdparty import six
from thirdparty.magic import magic from thirdparty.magic import magic
from plugins.generic.entries import G_column_name_list
class Dump(object): class Dump(object):
""" """
@ -449,7 +450,7 @@ class Dump(object):
dumpDbPath = tempDir dumpDbPath = tempDir
dumpFileName = conf.dumpFile or os.path.join(dumpDbPath, re.sub(r'[\\/]', UNSAFE_DUMP_FILEPATH_REPLACEMENT, "%s.%s" % (unsafeSQLIdentificatorNaming(table), conf.dumpFormat.lower()))) dumpFileName = conf.dumpFile or os.path.join(dumpDbPath, re.sub(r'[\\/]', UNSAFE_DUMP_FILEPATH_REPLACEMENT, "%s-%s.%s" % (unsafeSQLIdentificatorNaming(table),G_column_name_list[0],conf.dumpFormat.lower())))
if not checkFile(dumpFileName, False): if not checkFile(dumpFileName, False):
try: try:
openFile(dumpFileName, "w+b").close() openFile(dumpFileName, "w+b").close()
@ -470,7 +471,7 @@ class Dump(object):
if not appendToFile: if not appendToFile:
count = 1 count = 1
while True: while True:
candidate = "%s.%d" % (dumpFileName, count) candidate = "%s-%02d.csv" % (dumpFileName.split('.csv')[0], count)
if not checkFile(candidate, False): if not checkFile(candidate, False):
try: try:
shutil.copyfile(dumpFileName, candidate) shutil.copyfile(dumpFileName, candidate)

View File

@ -52,6 +52,7 @@ from lib.utils.pivotdumptable import pivotDumpTable
from thirdparty import six from thirdparty import six
from thirdparty.six.moves import zip as _zip from thirdparty.six.moves import zip as _zip
G_column_name_list=['']
class Entries(object): class Entries(object):
""" """
This class defines entries' enumeration functionalities for plugins. This class defines entries' enumeration functionalities for plugins.
@ -167,6 +168,7 @@ class Entries(object):
infoMsg = "fetching entries" infoMsg = "fetching entries"
if conf.col: if conf.col:
infoMsg += " of column(s) '%s'" % colNames infoMsg += " of column(s) '%s'" % colNames
G_column_name_list[0] = colString
infoMsg += " for table '%s'" % unsafeSQLIdentificatorNaming(tbl) infoMsg += " for table '%s'" % unsafeSQLIdentificatorNaming(tbl)
if METADB_SUFFIX not in conf.db: if METADB_SUFFIX not in conf.db:
infoMsg += " in database '%s'" % unsafeSQLIdentificatorNaming(conf.db) infoMsg += " in database '%s'" % unsafeSQLIdentificatorNaming(conf.db)