Skip to content

Commit ab1422b

Browse files
authored
Add files via upload
1 parent 4251015 commit ab1422b

1 file changed

Lines changed: 53 additions & 8 deletions

File tree

pycatfile.py

Lines changed: 53 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3302,7 +3302,7 @@ def ReadInStackedFileWithContentToArray(infile, fmttype="auto", filestart=0, see
33023302
while True:
33033303
if outstartfile >= outfsize: # stop when function signals False
33043304
break
3305-
outarray = ArchiveFileToArray(infile, fmttype, outstartfile, seekstart, seekend, listonly, contentasfile, uncompress, skipchecksum, formatspecs, seektoend, True)
3305+
outarray = CatFileToArray(infile, fmttype, outstartfile, seekstart, seekend, listonly, contentasfile, uncompress, skipchecksum, formatspecs, seektoend, True)
33063306
outfsize = outarray['fsize']
33073307
if outarray is False: # stop when function signals False
33083308
break
@@ -7069,24 +7069,69 @@ def CatFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_form
70697069
return False
70707070

70717071

7072-
def CatFileValidateFile(infile, fmttype="auto", formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
7073-
return CatFileValidate(infile, fmttype, formatspecs, verbose, returnfp)
7072+
def CatFileValidateFile(infile, fmttype="auto", filestart=0, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, returnfp=False):
7073+
return CatFileValidate(infile, fmttype, filestart, formatspecs, seektoend, verbose, returnfp)
70747074

70757075

7076-
def CatFileValidateMultiple(infile, fmttype="auto", formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
7076+
def CatFileValidateMultiple(infile, fmttype="auto", filestart=0, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, returnfp=False):
70777077
if(isinstance(infile, (list, tuple, ))):
70787078
pass
70797079
else:
70807080
infile = [infile]
70817081
outretval = True
70827082
for curfname in infile:
7083-
curretfile = CatFileValidate(curfname, fmttype, formatspecs, verbose, returnfp)
7083+
curretfile = CatFileValidate(curfname, fmttype, filestart, formatspecs, seektoend, verbose, returnfp)
70847084
if(not curretfile):
70857085
outretval = False
70867086
return outretval
70877087

7088-
def CatFileValidateMultipleFiles(infile, fmttype="auto", formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
7089-
return CatFileValidateMultiple(infile, fmttype, formatspecs, verbose, returnfp)
7088+
def CatFileValidateMultipleFiles(infile, fmttype="auto", filestart=0, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, returnfp=False):
7089+
return CatFileValidateMultiple(infile, fmttype, filestart, formatspecs, seektoend, verbose, returnfp)
7090+
7091+
7092+
def StackedCatFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, returnfp=False):
7093+
outretval = []
7094+
outstartfile = filestart
7095+
outfsize = float('inf')
7096+
while True:
7097+
if outstartfile >= outfsize: # stop when function signals False
7098+
break
7099+
is_valid_file = CatFileValidate(infile, fmttype, filestart, formatspecs, seektoend, verbose, True)
7100+
if is_valid_file is False: # stop when function signals False
7101+
outretval.append(is_valid_file)
7102+
else:
7103+
outretval.append(True)
7104+
infile = is_valid_file
7105+
outstartfile = infile.tell()
7106+
try:
7107+
infile.seek(0, 2)
7108+
except OSError:
7109+
SeekToEndOfFile(infile)
7110+
except ValueError:
7111+
SeekToEndOfFile(infile)
7112+
outfsize = infile.tell()
7113+
infile.seek(outstartfile, 0)
7114+
return outretval
7115+
7116+
7117+
def StackedCatFileValidateFile(infile, fmttype="auto", filestart=0, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, returnfp=False):
7118+
return StackedCatFileValidate(infile, fmttype, filestart, formatspecs, seektoend, verbose, returnfp)
7119+
7120+
7121+
def StackedCatFileValidateMultiple(infile, fmttype="auto", filestart=0, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, returnfp=False):
7122+
if(isinstance(infile, (list, tuple, ))):
7123+
pass
7124+
else:
7125+
infile = [infile]
7126+
outretval = True
7127+
for curfname in infile:
7128+
curretfile = StackedCatFileValidate(curfname, fmttype, filestart, formatspecs, seektoend, verbose, returnfp)
7129+
if(not curretfile):
7130+
outretval = False
7131+
return outretval
7132+
7133+
def StackedCatFileValidateMultipleFiles(infile, fmttype="auto", filestart=0, formatspecs=__file_format_multi_dict__, seektoend=False, verbose=False, returnfp=False):
7134+
return StackedCatFileValidateMultiple(infile, fmttype, filestart, formatspecs, seektoend, verbose, returnfp)
70907135

70917136
def CatFileToArray(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0, listonly=False, contentasfile=True, uncompress=True, skipchecksum=False, formatspecs=__file_format_multi_dict__, seektoend=False, returnfp=False):
70927137
if(IsNestedDict(formatspecs) and fmttype!="auto" and fmttype in formatspecs):
@@ -7570,7 +7615,7 @@ def StackedCatFileToArray(infile, fmttype="auto", filestart=0, seekstart=0, seek
75707615
while True:
75717616
if outstartfile >= outfsize: # stop when function signals False
75727617
break
7573-
outarray = ArchiveFileToArray(infile, fmttype, outstartfile, seekstart, seekend, listonly, contentasfile, uncompress, skipchecksum, formatspecs, seektoend, True)
7618+
outarray = CatFileToArray(infile, fmttype, outstartfile, seekstart, seekend, listonly, contentasfile, uncompress, skipchecksum, formatspecs, seektoend, True)
75747619
outfsize = outarray['fsize']
75757620
if outarray is False: # stop when function signals False
75767621
break

0 commit comments

Comments
 (0)