@@ -9940,14 +9940,6 @@ def CatFileValidate(infile, fmttype="auto", filestart=0,
99409940 checkcompressfile = CheckCompressionSubType(fp, formatspecs, filestart, True)
99419941 if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
99429942 formatspecs = formatspecs[checkcompressfile]
9943- if(checkcompressfile == "tarfile" and TarFileCheck(infile)):
9944- return TarFileToArray(infile, 0, 0, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
9945- elif(checkcompressfile == "zipfile" and zipfile.is_zipfile(infile)):
9946- return ZipFileToArray(infile, 0, 0, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
9947- elif(rarfile_support and checkcompressfile == "rarfile" and (rarfile.is_rarfile(infile) or rarfile.is_rarfile_sfx(infile))):
9948- return RarFileToArray(infile, 0, 0, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
9949- elif(py7zr_support and checkcompressfile == "7zipfile" and py7zr.is_7zfile(infile)):
9950- return SevenZipFileToArray(infile, 0, 0, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
99519943 elif(IsSingleDict(formatspecs) and checkcompressfile != formatspecs['format_magic']):
99529944 return False
99539945 elif(IsNestedDict(formatspecs) and checkcompressfile not in formatspecs):
@@ -10309,9 +10301,10 @@ def StackedCatFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__fi
1030910301 while True:
1031010302 if outstartfile >= outfsize: # stop when function signals False
1031110303 break
10312- is_valid_file = CatFileValidate (infile, fmttype, filestart , formatspecs, seektoend, verbose, True)
10304+ is_valid_file = ArchiveFileValidate (infile, fmttype, outstartfile , formatspecs, seektoend, verbose, True)
1031310305 if is_valid_file is False: # stop when function signals False
1031410306 outretval.append(is_valid_file)
10307+ break
1031510308 else:
1031610309 outretval.append(True)
1031710310 infile = is_valid_file
@@ -11317,35 +11310,6 @@ def MultipleCatFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, s
1131711310 return outretval
1131811311
1131911312
11320- def StackedCatFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, returnfp=False):
11321- outretval = []
11322- outstartfile = filestart
11323- outfsize = float('inf')
11324- while True:
11325- if outstartfile >= outfsize: # stop when function signals False
11326- break
11327- is_valid_file = CatFileValidate(infile, fmttype, filestart, formatspecs, seektoend, verbose, True)
11328- if is_valid_file is False: # stop when function signals False
11329- outretval.append(is_valid_file)
11330- else:
11331- outretval.append(True)
11332- infile = is_valid_file
11333- outstartfile = infile.tell()
11334- try:
11335- infile.seek(0, 2)
11336- except OSError:
11337- SeekToEndOfFile(infile)
11338- except ValueError:
11339- SeekToEndOfFile(infile)
11340- outfsize = infile.tell()
11341- infile.seek(outstartfile, 0)
11342- if(returnfp):
11343- return infile
11344- else:
11345- infile.close()
11346- return outretval
11347-
11348-
1134911313def StackedCatFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0, skipchecksum=False, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, newstyle=False, returnfp=False):
1135011314 outretval = []
1135111315 outstartfile = filestart
0 commit comments