Skip to content

Commit 14c38f8

Browse files
author
Kazuki Suzuki Przyborowski
committed
Update pycatfile.py
1 parent de8e12b commit 14c38f8

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

pycatfile.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7968,7 +7968,7 @@ def ListDirToArray(infiles, dirlistfromtxt=False, fmttype=__file_format_default_
79687968
outarray = MkTempFile()
79697969
packform = PackCatFile(infiles, outarray, dirlistfromtxt, fmttype, compression, compresswholefile,
79707970
compressionlevel, followlink, checksumtype, extradata, formatspecs, verbose, True)
7971-
listarrayfiles = CatFileToArray(outarray, "auto", filestart, seekstart, seekend, listonly, True, skipchecksum, formatspecs, seektoend, returnfp)
7971+
listarrayfiles = CatFileToArray(outarray, "auto", filestart, seekstart, seekend, listonly, True, True, skipchecksum, formatspecs, seektoend, returnfp)
79727972
return listarrayfiles
79737973

79747974

@@ -8096,7 +8096,7 @@ def RePackCatFile(infile, outfile, fmttype="auto", compression="auto", compressw
80968096
else:
80978097
if(infile != "-" and not isinstance(infile, bytes) and not hasattr(infile, "read") and not hasattr(infile, "write")):
80988098
infile = RemoveWindowsPath(infile)
8099-
listarrayfiles = CatFileToArray(infile, "auto", filestart, seekstart, seekend, False, True, skipchecksum, formatspecs, seektoend, returnfp)
8099+
listarrayfiles = CatFileToArray(infile, "auto", filestart, seekstart, seekend, False, True, True, skipchecksum, formatspecs, seektoend, returnfp)
81008100
if(IsNestedDict(formatspecs) and fmttype in formatspecs):
81018101
formatspecs = formatspecs[fmttype]
81028102
elif(IsNestedDict(formatspecs) and fmttype not in formatspecs):
@@ -8209,11 +8209,11 @@ def RePackCatFile(infile, outfile, fmttype="auto", compression="auto", compressw
82098209
fdev_major = format(
82108210
int(listarrayfiles['ffilelist'][reallcfi]['fmajor']), 'x').lower()
82118211
fseeknextfile = listarrayfiles['ffilelist'][reallcfi]['fseeknextfile']
8212-
if(len(listarrayfiles['ffilelist'][reallcfi]['fextralist']) > listarrayfiles['ffilelist'][reallcfi]['fextrafields'] and len(listarrayfiles['ffilelist'][reallcfi]['fextralist']) > 0):
8212+
if(len(listarrayfiles['ffilelist'][reallcfi]['fextradata']) > listarrayfiles['ffilelist'][reallcfi]['fextrafields'] and len(listarrayfiles['ffilelist'][reallcfi]['fextradata']) > 0):
82138213
listarrayfiles['ffilelist'][reallcfi]['fextrafields'] = len(
8214-
listarrayfiles['ffilelist'][reallcfi]['fextralist'])
8214+
listarrayfiles['ffilelist'][reallcfi]['fextradata'])
82158215
if(not followlink and len(extradata) <= 0):
8216-
extradata = listarrayfiles['ffilelist'][reallcfi]['fextralist']
8216+
extradata = listarrayfiles['ffilelist'][reallcfi]['fextradata']
82178217
if(not followlink and len(jsondata) <= 0):
82188218
jsondata = listarrayfiles['ffilelist'][reallcfi]['fjsondata']
82198219
fcontents = listarrayfiles['ffilelist'][reallcfi]['fcontents']
@@ -8292,10 +8292,10 @@ def RePackCatFile(infile, outfile, fmttype="auto", compression="auto", compressw
82928292
fdev_minor = format(int(flinkinfo['fminor']), 'x').lower()
82938293
fdev_major = format(int(flinkinfo['fmajor']), 'x').lower()
82948294
fseeknextfile = flinkinfo['fseeknextfile']
8295-
if(len(flinkinfo['fextralist']) > flinkinfo['fextrafields'] and len(flinkinfo['fextralist']) > 0):
8296-
flinkinfo['fextrafields'] = len(flinkinfo['fextralist'])
8295+
if(len(flinkinfo['fextradata']) > flinkinfo['fextrafields'] and len(flinkinfo['fextradata']) > 0):
8296+
flinkinfo['fextrafields'] = len(flinkinfo['fextradata'])
82978297
if(len(extradata) < 0):
8298-
extradata = flinkinfo['fextralist']
8298+
extradata = flinkinfo['fextradata']
82998299
if(len(jsondata) < 0):
83008300
extradata = flinkinfo['fjsondata']
83018301
fcontents = flinkinfo['fcontents']
@@ -8390,7 +8390,7 @@ def UnPackCatFile(infile, outdir=None, followlink=False, filestart=0, seekstart=
83908390
else:
83918391
if(infile != "-" and not hasattr(infile, "read") and not hasattr(infile, "write") and not (sys.version_info[0] >= 3 and isinstance(infile, bytes))):
83928392
infile = RemoveWindowsPath(infile)
8393-
listarrayfiles = CatFileToArray(infile, "auto", filestart, seekstart, seekend, False, True, skipchecksum, formatspecs, seektoend, returnfp)
8393+
listarrayfiles = CatFileToArray(infile, "auto", filestart, seekstart, seekend, False, True, True, skipchecksum, formatspecs, seektoend, returnfp)
83948394
if(not listarrayfiles):
83958395
return False
83968396
lenlist = len(listarrayfiles['ffilelist'])

0 commit comments

Comments
 (0)