Skip to content

Commit d1b011b

Browse files
committed
Small update
1 parent 02aceaa commit d1b011b

3 files changed

Lines changed: 18 additions & 8 deletions

File tree

catfile.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 = pycatfile.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
)

pycatfile/__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 = pycatfile.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
)

pycatfile/pyfile.py

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

98629862

9863-
def InFileListFiles(infile, verbose=False, formatspecs=__file_format_multi_dict__, seektoend=False, newstyle=False, returnfp=False):
9863+
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):
98649864
checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
98659865
if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
98669866
formatspecs = formatspecs[checkcompressfile]
@@ -9873,7 +9873,7 @@ def InFileListFiles(infile, verbose=False, formatspecs=__file_format_multi_dict_
98739873
elif(py7zr_support and checkcompressfile == "7zipfile" and py7zr.is_7zfile(infile)):
98749874
return SevenZipFileListFiles(infile, verbose, returnfp)
98759875
elif(checkcompressfile == formatspecs['format_magic']):
9876-
return CatFileListFiles(infile, 0, 0, False, formatspecs, seektoend, verbose, newstyle, returnfp)
9876+
return ArchiveFileListFiles(infile, fmttype, filestart, seekstart, seekend, skipchecksum, formatspecs, saltkey, seektoend, verbose, newstyle, returnfp)
98779877
else:
98789878
return False
98799879
return False

0 commit comments

Comments
 (0)