@@ -2536,7 +2536,7 @@ def ReadFileDataBySizeWithContentToArray(fp, seekstart=0, seekend=0, listonly=Fa
25362536 return False
25372537 catversions = re .search ('(.*?)(\\ d+)' , catstring ).groups ()
25382538 fcompresstype = ""
2539- catlist = {'fnumfiles' : fnumfiles , 'fformat' : catversions [0 ], 'fcompression' : fcompresstype , 'fencoding' : fhencoding , 'fversion' : catversions [1 ], 'fostype' : fostype , 'fheadersize' : fheadsize , 'ffilesize ' : CatSizeEnd , 'fnumfields' : fnumfields + 2 , 'fformatspecs' : formatspecs , 'fchecksumtype' : fprechecksumtype , 'fheaderchecksum' : fprechecksum , 'frawheader' : [catstring ] + catheader , 'fextrafields' : fnumextrafields , 'fextrafieldsize' : fnumextrafieldsize , 'fextralist' : fextrafieldslist , 'ffilelist' : []}
2539+ catlist = {'fnumfiles' : fnumfiles , 'fformat' : catversions [0 ], 'fcompression' : fcompresstype , 'fencoding' : fhencoding , 'fversion' : catversions [1 ], 'fostype' : fostype , 'fheadersize' : fheadsize , 'fsize ' : CatSizeEnd , 'fnumfields' : fnumfields + 2 , 'fformatspecs' : formatspecs , 'fchecksumtype' : fprechecksumtype , 'fheaderchecksum' : fprechecksum , 'frawheader' : [catstring ] + catheader , 'fextrafields' : fnumextrafields , 'fextrafieldsize' : fnumextrafieldsize , 'fextralist' : fextrafieldslist , 'ffilelist' : []}
25402540 if (seekstart < 0 and seekstart > fnumfiles ):
25412541 seekstart = 0
25422542 if (seekend == 0 or seekend > fnumfiles and seekend < seekstart ):
@@ -6102,7 +6102,7 @@ def ArchiveFileSeekToFileNum(infile, seekto=0, listonly=False, contentasfile=Tru
61026102 fcompresstype = compresscheck
61036103 if (fcompresstype == formatspecs ['format_lower' ]):
61046104 fcompresstype = ""
6105- catlist = {'fnumfiles' : fnumfiles , 'fformat' : catversions [0 ], 'fcompression' : fcompresstype , 'fencoding' : fhencoding , 'fversion' : catversions [1 ], 'fostype' : fostype , 'fheadersize' : fheadsize , 'ffilesize ' : CatSizeEnd , 'fnumfields' : fnumfields + 2 , 'fformatspecs' : formatspecs , 'fchecksumtype' : fprechecksumtype , 'fheaderchecksum' : fprechecksum , 'frawheader' : [catstring ] + catheader , 'fextrafields' : fnumextrafields , 'fextrafieldsize' : fnumextrafieldsize , 'fextralist' : fextrafieldslist , 'ffilelist' : []}
6105+ catlist = {'fnumfiles' : fnumfiles , 'fformat' : catversions [0 ], 'fcompression' : fcompresstype , 'fencoding' : fhencoding , 'fversion' : catversions [1 ], 'fostype' : fostype , 'fheadersize' : fheadsize , 'fsize ' : CatSizeEnd , 'fnumfields' : fnumfields + 2 , 'fformatspecs' : formatspecs , 'fchecksumtype' : fprechecksumtype , 'fheaderchecksum' : fprechecksum , 'frawheader' : [catstring ] + catheader , 'fextrafields' : fnumextrafields , 'fextrafieldsize' : fnumextrafieldsize , 'fextralist' : fextrafieldslist , 'ffilelist' : []}
61066106 if (seekto >= fnumfiles ):
61076107 seekto = fnumfiles - 1
61086108 if (seekto < 0 ):
@@ -6370,7 +6370,7 @@ def ArchiveFileSeekToFileName(infile, seekfile=None, listonly=False, contentasfi
63706370 fcompresstype = compresscheck
63716371 if (fcompresstype == formatspecs ['format_lower' ]):
63726372 fcompresstype = ""
6373- catlist = {'fnumfiles' : fnumfiles , 'fformat' : catversions [0 ], 'fcompression' : fcompresstype , 'fencoding' : fhencoding , 'fversion' : catversions [1 ], 'fostype' : fostype , 'fheadersize' : fheadsize , 'ffilesize ' : CatSizeEnd , 'fnumfields' : fnumfields + 2 , 'fformatspecs' : formatspecs , 'fchecksumtype' : fprechecksumtype , 'fheaderchecksum' : fprechecksum , 'frawheader' : [catstring ] + catheader , 'fextrafields' : fnumextrafields , 'fextrafieldsize' : fnumextrafieldsize , 'fextralist' : fextrafieldslist , 'ffilelist' : []}
6373+ catlist = {'fnumfiles' : fnumfiles , 'fformat' : catversions [0 ], 'fcompression' : fcompresstype , 'fencoding' : fhencoding , 'fversion' : catversions [1 ], 'fostype' : fostype , 'fheadersize' : fheadsize , 'fsize ' : CatSizeEnd , 'fnumfields' : fnumfields + 2 , 'fformatspecs' : formatspecs , 'fchecksumtype' : fprechecksumtype , 'fheaderchecksum' : fprechecksum , 'frawheader' : [catstring ] + catheader , 'fextrafields' : fnumextrafields , 'fextrafieldsize' : fnumextrafieldsize , 'fextralist' : fextrafieldslist , 'ffilelist' : []}
63746374 seekto = fnumfiles - 1
63756375 filefound = False
63766376 if (seekto >= 0 ):
@@ -7010,7 +7010,7 @@ def ArchiveFileToArray(infile, seekstart=0, seekend=0, listonly=False, contentas
70107010 fcompresstype = compresscheck
70117011 if (fcompresstype == formatspecs ['format_lower' ]):
70127012 fcompresstype = ""
7013- catlist = {'fnumfiles' : fnumfiles , 'fformat' : catversions [0 ], 'fcompression' : fcompresstype , 'fencoding' : fhencoding , 'fversion' : catversions [1 ], 'fostype' : fostype , 'fheadersize' : fheadsize , 'ffilesize ' : CatSizeEnd , 'fnumfields' : fnumfields + 2 , 'fformatspecs' : formatspecs , 'fchecksumtype' : fprechecksumtype , 'fheaderchecksum' : fprechecksum , 'frawheader' : [catstring ] + catheader , 'fextrafields' : fnumextrafields , 'fextrafieldsize' : fnumextrafieldsize , 'fextralist' : fextrafieldslist , 'ffilelist' : []}
7013+ catlist = {'fnumfiles' : fnumfiles , 'fformat' : catversions [0 ], 'fcompression' : fcompresstype , 'fencoding' : fhencoding , 'fversion' : catversions [1 ], 'fostype' : fostype , 'fheadersize' : fheadsize , 'fsize ' : CatSizeEnd , 'fnumfields' : fnumfields + 2 , 'fformatspecs' : formatspecs , 'fchecksumtype' : fprechecksumtype , 'fheaderchecksum' : fprechecksum , 'frawheader' : [catstring ] + catheader , 'fextrafields' : fnumextrafields , 'fextrafieldsize' : fnumextrafieldsize , 'fextralist' : fextrafieldslist , 'ffilelist' : []}
70147014 if (seekstart < 0 and seekstart > fnumfiles ):
70157015 seekstart = 0
70167016 if (seekend == 0 or seekend > fnumfiles and seekend < seekstart ):
0 commit comments