@@ -9931,14 +9931,6 @@ def ArchiveFileValidate(infile, fmttype="auto", filestart=0,
99319931 checkcompressfile = CheckCompressionSubType(fp, formatspecs, filestart, True)
99329932 if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
99339933 formatspecs = formatspecs[checkcompressfile]
9934- if(checkcompressfile == "tarfile" and TarFileCheck(infile)):
9935- return TarFileToArray(infile, 0, 0, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
9936- elif(checkcompressfile == "zipfile" and zipfile.is_zipfile(infile)):
9937- return ZipFileToArray(infile, 0, 0, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
9938- elif(rarfile_support and checkcompressfile == "rarfile" and (rarfile.is_rarfile(infile) or rarfile.is_rarfile_sfx(infile))):
9939- return RarFileToArray(infile, 0, 0, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
9940- elif(py7zr_support and checkcompressfile == "7zipfile" and py7zr.is_7zfile(infile)):
9941- return SevenZipFileToArray(infile, 0, 0, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
99429934 elif(IsSingleDict(formatspecs) and checkcompressfile != formatspecs['format_magic']):
99439935 return False
99449936 elif(IsNestedDict(formatspecs) and checkcompressfile not in formatspecs):
@@ -10300,9 +10292,10 @@ def StackedArchiveFileValidate(infile, fmttype="auto", filestart=0, formatspecs=
1030010292 while True:
1030110293 if outstartfile >= outfsize: # stop when function signals False
1030210294 break
10303- is_valid_file = ArchiveFileValidate(infile, fmttype, filestart , formatspecs, seektoend, verbose, True)
10295+ is_valid_file = ArchiveFileValidate(infile, fmttype, outstartfile , formatspecs, seektoend, verbose, True)
1030410296 if is_valid_file is False: # stop when function signals False
1030510297 outretval.append(is_valid_file)
10298+ break
1030610299 else:
1030710300 outretval.append(True)
1030810301 infile = is_valid_file
@@ -11308,35 +11301,6 @@ def MultipleArchiveFileListFiles(infile, fmttype="auto", filestart=0, seekstart=
1130811301 return outretval
1130911302
1131011303
11311- def StackedArchiveFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, returnfp=False):
11312- outretval = []
11313- outstartfile = filestart
11314- outfsize = float('inf')
11315- while True:
11316- if outstartfile >= outfsize: # stop when function signals False
11317- break
11318- is_valid_file = ArchiveFileValidate(infile, fmttype, filestart, formatspecs, seektoend, verbose, True)
11319- if is_valid_file is False: # stop when function signals False
11320- outretval.append(is_valid_file)
11321- else:
11322- outretval.append(True)
11323- infile = is_valid_file
11324- outstartfile = infile.tell()
11325- try:
11326- infile.seek(0, 2)
11327- except OSError:
11328- SeekToEndOfFile(infile)
11329- except ValueError:
11330- SeekToEndOfFile(infile)
11331- outfsize = infile.tell()
11332- infile.seek(outstartfile, 0)
11333- if(returnfp):
11334- return infile
11335- else:
11336- infile.close()
11337- return outretval
11338-
11339-
1134011304def StackedArchiveFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0, skipchecksum=False, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, newstyle=False, returnfp=False):
1134111305 outretval = []
1134211306 outstartfile = filestart
0 commit comments