Skip to content

Commit 64aa37f

Browse files
committed
Small update
1 parent 079ed83 commit 64aa37f

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

neofile.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,12 +408,17 @@ def main(argv: Optional[list[str]] = None) -> int:
408408
False,
409409
)
410410
else:
411-
tmpout = pyneofile.InFileListFiles(
411+
tmpout = pyarchivefile.InFileListFiles(
412412
input_file,
413-
getargs.verbose,
413+
"auto",
414+
0,
415+
0,
416+
0,
417+
False,
418+
fnamedict,
414419
fnamedict,
415420
getargs.insecretkey,
416-
False,
421+
getargs.verbose,
417422
False,
418423
False,
419424
)

pyneofile/__main__.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,12 +408,17 @@ def main(argv: Optional[list[str]] = None) -> int:
408408
False,
409409
)
410410
else:
411-
tmpout = pyneofile.InFileListFiles(
411+
tmpout = pyarchivefile.InFileListFiles(
412412
input_file,
413-
getargs.verbose,
413+
"auto",
414+
0,
415+
0,
416+
0,
417+
False,
418+
fnamedict,
414419
fnamedict,
415420
getargs.insecretkey,
416-
False,
421+
getargs.verbose,
417422
False,
418423
False,
419424
)

pyneofile/pyfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9854,7 +9854,7 @@ def SevenZipFileListFile(infile, verbose=False, returnfp=False):
98549854
return SevenZipFileListFiles(infile, verbose, returnfp)
98559855

98569856

9857-
def InFileListFiles(infile, verbose=False, formatspecs=__file_format_multi_dict__, seektoend=False, newstyle=False, returnfp=False):
9857+
def InFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0, skipchecksum=False, formatspecs=__file_format_multi_dict__, saltkey=None, seektoend=False, verbose=False, newstyle=False, returnfp=False):
98589858
checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
98599859
if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
98609860
formatspecs = formatspecs[checkcompressfile]
@@ -9867,7 +9867,7 @@ def InFileListFiles(infile, verbose=False, formatspecs=__file_format_multi_dict_
98679867
elif(py7zr_support and checkcompressfile == "7zipfile" and py7zr.is_7zfile(infile)):
98689868
return SevenZipFileListFiles(infile, verbose, returnfp)
98699869
elif(checkcompressfile == formatspecs['format_magic']):
9870-
return NeoFileListFiles(infile, 0, 0, False, formatspecs, seektoend, verbose, newstyle, returnfp)
9870+
return ArchiveFileListFiles(infile, fmttype, filestart, seekstart, seekend, skipchecksum, formatspecs, saltkey, seektoend, verbose, newstyle, returnfp)
98719871
else:
98729872
return False
98739873
return False

0 commit comments

Comments
 (0)