@@ -9939,14 +9939,6 @@ def FoxFileValidate(infile, fmttype="auto", filestart=0,
99399939 checkcompressfile = CheckCompressionSubType(fp, formatspecs, filestart, True)
99409940 if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
99419941 formatspecs = formatspecs[checkcompressfile]
9942- if(checkcompressfile == "tarfile" and TarFileCheck(infile)):
9943- return TarFileToArray(infile, 0, 0, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
9944- elif(checkcompressfile == "zipfile" and zipfile.is_zipfile(infile)):
9945- return ZipFileToArray(infile, 0, 0, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
9946- elif(rarfile_support and checkcompressfile == "rarfile" and (rarfile.is_rarfile(infile) or rarfile.is_rarfile_sfx(infile))):
9947- return RarFileToArray(infile, 0, 0, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
9948- elif(py7zr_support and checkcompressfile == "7zipfile" and py7zr.is_7zfile(infile)):
9949- return SevenZipFileToArray(infile, 0, 0, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
99509942 elif(IsSingleDict(formatspecs) and checkcompressfile != formatspecs['format_magic']):
99519943 return False
99529944 elif(IsNestedDict(formatspecs) and checkcompressfile not in formatspecs):
@@ -10308,9 +10300,10 @@ def StackedFoxFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__fi
1030810300 while True:
1030910301 if outstartfile >= outfsize: # stop when function signals False
1031010302 break
10311- is_valid_file = FoxFileValidate (infile, fmttype, filestart , formatspecs, seektoend, verbose, True)
10303+ is_valid_file = ArchiveFileValidate (infile, fmttype, outstartfile , formatspecs, seektoend, verbose, True)
1031210304 if is_valid_file is False: # stop when function signals False
1031310305 outretval.append(is_valid_file)
10306+ break
1031410307 else:
1031510308 outretval.append(True)
1031610309 infile = is_valid_file
@@ -11316,35 +11309,6 @@ def MultipleFoxFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, s
1131611309 return outretval
1131711310
1131811311
11319- def StackedFoxFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, returnfp=False):
11320- outretval = []
11321- outstartfile = filestart
11322- outfsize = float('inf')
11323- while True:
11324- if outstartfile >= outfsize: # stop when function signals False
11325- break
11326- is_valid_file = FoxFileValidate(infile, fmttype, filestart, formatspecs, seektoend, verbose, True)
11327- if is_valid_file is False: # stop when function signals False
11328- outretval.append(is_valid_file)
11329- else:
11330- outretval.append(True)
11331- infile = is_valid_file
11332- outstartfile = infile.tell()
11333- try:
11334- infile.seek(0, 2)
11335- except OSError:
11336- SeekToEndOfFile(infile)
11337- except ValueError:
11338- SeekToEndOfFile(infile)
11339- outfsize = infile.tell()
11340- infile.seek(outstartfile, 0)
11341- if(returnfp):
11342- return infile
11343- else:
11344- infile.close()
11345- return outretval
11346-
11347-
1134811312def StackedFoxFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0, skipchecksum=False, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, newstyle=False, returnfp=False):
1134911313 outretval = []
1135011314 outstartfile = filestart
0 commit comments