Skip to content

Commit 947722b

Browse files
author
Kazuki Suzuki Przyborowski
committed
Update pycatfile.py
1 parent 880bd8d commit 947722b

1 file changed

Lines changed: 23 additions & 23 deletions

File tree

‎pycatfile.py‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2210,10 +2210,10 @@ def ReadFileHeaderDataWithContentToArray(fp, listonly=False, contentasfile=True,
22102210
if(extrastart < extraend):
22112211
fextrafieldslist.append(HeaderOut[extrastart])
22122212
extrastart = extrastart + 1
2213-
if(fextrasize==1):
2213+
if(fextrafields==1):
22142214
try:
22152215
fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
2216-
fextrasize = len(fextrafieldslist)
2216+
fextrafields = len(fextrafieldslist)
22172217
except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
22182218
pass
22192219
fcs = HeaderOut[-2].lower()
@@ -2341,10 +2341,10 @@ def ReadFileHeaderDataWithContentToList(fp, listonly=False, contentasfile=False,
23412341
if(extrastart < extraend):
23422342
fextrafieldslist.append(HeaderOut[extrastart])
23432343
extrastart = extrastart + 1
2344-
if(fextrasize==1):
2344+
if(fextrafields==1):
23452345
try:
23462346
fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
2347-
fextrasize = len(fextrafieldslist)
2347+
fextrafields = len(fextrafieldslist)
23482348
except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
23492349
pass
23502350
fcs = HeaderOut[-2].lower()
@@ -2513,10 +2513,10 @@ def ReadFileDataWithContentToArray(fp, seekstart=0, seekend=0, listonly=False, c
25132513
if(extrastart < extraend):
25142514
fextrafieldslist.append(inheader[extrastart])
25152515
extrastart = extrastart + 1
2516-
if(fextrasize==1):
2516+
if(fnumextrafields==1):
25172517
try:
25182518
fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
2519-
fextrasize = len(fextrafieldslist)
2519+
fnumextrafields = len(fextrafieldslist)
25202520
except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
25212521
pass
25222522
if(curloc > 0):
@@ -2654,10 +2654,10 @@ def ReadFileDataWithContentToList(fp, seekstart=0, seekend=0, listonly=False, co
26542654
if(extrastart < extraend):
26552655
fextrafieldslist.append(inheader[extrastart])
26562656
extrastart = extrastart + 1
2657-
if(fextrasize==1):
2657+
if(fnumextrafields==1):
26582658
try:
26592659
fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
2660-
fextrasize = len(fextrafieldslist)
2660+
fnumextrafields = len(fextrafieldslist)
26612661
except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
26622662
pass
26632663
if(curloc > 0):
@@ -3166,7 +3166,7 @@ def AppendFileHeader(fp, numfiles, fencoding, extradata=[], checksumtype="crc32"
31663166
formatspecs['format_magic'] + fileheaderver, formatspecs['format_delimiter'])
31673167
extrafields = format(len(extradata), 'x').lower()
31683168
if isinstance(extradata, dict) or IsNestedDictAlt(extradata):
3169-
extradata = [base64.b64encode(json.dumps(extradata, separators=(',', ':')))]
3169+
extradata = [base64.b64encode(json.dumps(extradata, separators=(',', ':')).encode("UTF-8")).decode("UTF-8")]
31703170
extrasizestr = AppendNullByte(extrafields, formatspecs['format_delimiter'])
31713171
if(len(extradata) > 0):
31723172
extrasizestr = extrasizestr + \
@@ -3320,7 +3320,7 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], filecontent="",
33203320
if(not hasattr(fp, "write")):
33213321
return False
33223322
if isinstance(extradata, dict) or IsNestedDictAlt(extradata):
3323-
extradata = [base64.b64encode(json.dumps(extradata, separators=(',', ':')))]
3323+
extradata = [base64.b64encode(json.dumps(extradata, separators=(',', ':')).encode("UTF-8")).decode("UTF-8")]
33243324
extrafields = format(len(extradata), 'x').lower()
33253325
extrasizestr = AppendNullByte(extrafields, formatspecs['format_delimiter'])
33263326
if(len(extradata) > 0):
@@ -6512,10 +6512,10 @@ def CatFileSeekToFileNum(infile, fmttype="auto", seekto=0, listonly=False, conte
65126512
if(extrastart < extraend):
65136513
fextrafieldslist.append(inheader[extrastart])
65146514
extrastart = extrastart + 1
6515-
if(fextrasize==1):
6515+
if(fnumextrafields==1):
65166516
try:
65176517
fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
6518-
fextrasize = len(fextrafieldslist)
6518+
fnumextrafields = len(fextrafieldslist)
65196519
except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
65206520
pass
65216521
if(curloc > 0):
@@ -6809,10 +6809,10 @@ def CatFileSeekToFileName(infile, fmttype="auto", seekfile=None, listonly=False,
68096809
if(extrastart < extraend):
68106810
fextrafieldslist.append(inheader[extrastart])
68116811
extrastart = extrastart + 1
6812-
if(fnumextrafieldsize==1):
6812+
if(fnumextrafields==1):
68136813
try:
68146814
fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
6815-
fnumextrafieldsize = len(fextrafieldslist)
6815+
fnumextrafields = len(fextrafieldslist)
68166816
except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
68176817
pass
68186818
if(curloc > 0):
@@ -7439,10 +7439,10 @@ def CatFileToArray(infile, fmttype="auto", seekstart=0, seekend=0, listonly=Fals
74397439
if(extrastart < extraend):
74407440
fextrafieldslist.append(inheader[extrastart])
74417441
extrastart = extrastart + 1
7442-
if(fnumextrafieldsize==1):
7442+
if(fnumextrafields==1):
74437443
try:
74447444
fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
7445-
fnumextrafieldsize = len(fextrafieldslist)
7445+
fnumextrafields = len(fextrafieldslist)
74467446
except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
74477447
pass
74487448
if(curloc > 0):
@@ -7603,10 +7603,10 @@ def CatFileToArray(infile, fmttype="auto", seekstart=0, seekend=0, listonly=Fals
76037603
if(extrastart < extraend):
76047604
extrafieldslist.append(inheaderdata[extrastart])
76057605
extrastart = extrastart + 1
7606-
if(outfextrasize==1):
7606+
if(outfextrafields==1):
76077607
try:
76087608
extrafieldslist = json.loads(base64.b64decode(extrafieldslist[0]).decode("UTF-8"))
7609-
outfextrasize = len(extrafieldslist)
7609+
outfextrafields = len(extrafieldslist)
76107610
except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
76117611
pass
76127612
outfcs = inheaderdata[-2].lower()
@@ -8045,7 +8045,7 @@ def ListDirToArrayAlt(infiles, dirlistfromtxt=False, fmttype=__file_format_defau
80458045
fcontents.seek(0, 0)
80468046
ftypehex = format(ftype, 'x').lower()
80478047
if isinstance(extradata, dict) or IsNestedDictAlt(extradata):
8048-
extradata = [base64.b64encode(json.dumps(extradata, separators=(',', ':')))]
8048+
extradata = [base64.b64encode(json.dumps(extradata, separators=(',', ':')).encode("UTF-8")).decode("UTF-8")]
80498049
extrafields = len(extradata)
80508050
extrafieldslist = extradata
80518051
outfextrafields = extrafields
@@ -8335,7 +8335,7 @@ def TarFileToArrayAlt(infile, fmttype=__file_format_default__, listonly=False, c
83358335
fcontents.seek(0, 0)
83368336
ftypehex = format(ftype, 'x').lower()
83378337
if isinstance(extradata, dict) or IsNestedDictAlt(extradata):
8338-
extradata = [base64.b64encode(json.dumps(extradata, separators=(',', ':')))]
8338+
extradata = [base64.b64encode(json.dumps(extradata, separators=(',', ':')).encode("UTF-8")).decode("UTF-8")]
83398339
extrafields = len(extradata)
83408340
extrafieldslist = extradata
83418341
outfextrafields = extrafields
@@ -8620,7 +8620,7 @@ def ZipFileToArrayAlt(infile, fmttype=__file_format_default__, listonly=False, c
86208620
fcontents.seek(0, 0)
86218621
ftypehex = format(ftype, 'x').lower()
86228622
if isinstance(extradata, dict) or IsNestedDictAlt(extradata):
8623-
extradata = [base64.b64encode(json.dumps(extradata, separators=(',', ':')))]
8623+
extradata = [base64.b64encode(json.dumps(extradata, separators=(',', ':')).encode("UTF-8")).decode("UTF-8")]
86248624
extrafields = len(extradata)
86258625
extrafieldslist = extradata
86268626
outfextrafields = extrafields
@@ -8916,7 +8916,7 @@ def RarFileToArrayAlt(infile, fmttype=__file_format_default__, listonly=False, c
89168916
fcontents.seek(0, 0)
89178917
ftypehex = format(ftype, 'x').lower()
89188918
if isinstance(extradata, dict) or IsNestedDictAlt(extradata):
8919-
extradata = [base64.b64encode(json.dumps(extradata, separators=(',', ':')))]
8919+
extradata = [base64.b64encode(json.dumps(extradata, separators=(',', ':')).encode("UTF-8")).decode("UTF-8")]
89208920
extrafields = len(extradata)
89218921
extrafieldslist = extradata
89228922
outfextrafields = extrafields
@@ -9157,7 +9157,7 @@ def SevenZipFileToArrayAlt(infile, fmttype=__file_format_default__, listonly=Fal
91579157
fcontents.seek(0, 0)
91589158
ftypehex = format(ftype, 'x').lower()
91599159
if isinstance(extradata, dict) or IsNestedDictAlt(extradata):
9160-
extradata = [base64.b64encode(json.dumps(extradata, separators=(',', ':')))]
9160+
extradata = [base64.b64encode(json.dumps(extradata, separators=(',', ':')).encode("UTF-8")).decode("UTF-8")]
91619161
extrafields = len(extradata)
91629162
extrafieldslist = extradata
91639163
outfextrafields = extrafields

0 commit comments

Comments
 (0)