Skip to content

Commit 8a920d5

Browse files
author
Kazuki Suzuki Przyborowski
committed
Update pycatfile.py
1 parent 33d9a1c commit 8a920d5

1 file changed

Lines changed: 14 additions & 13 deletions

File tree

‎pycatfile.py‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1952,7 +1952,7 @@ def ReadFileHeaderDataWithContent(fp, listonly=False, uncompress=True, skipcheck
19521952
return False
19531953
fp.seek(len(delimiter), 1)
19541954
newfcs = GetHeaderChecksum(
1955-
HeaderOut[:-2] + [fprejsoncontent], HeaderOut[-4].lower(), True, formatspecs)
1955+
HeaderOut[:-2], HeaderOut[-4].lower(), True, formatspecs)
19561956
HeaderOut.append(fjsoncontent)
19571957
if(fcs != newfcs and not skipchecksum):
19581958
VerbosePrintOut("File Header Checksum Error with file " +
@@ -2127,7 +2127,7 @@ def ReadFileHeaderDataWithContentToArray(fp, listonly=False, contentasfile=True,
21272127
fcs = HeaderOut[-2].lower()
21282128
fccs = HeaderOut[-1].lower()
21292129
newfcs = GetHeaderChecksum(
2130-
HeaderOut[:-2] + [fprejsoncontent], HeaderOut[-4].lower(), True, formatspecs)
2130+
HeaderOut[:-2], HeaderOut[-4].lower(), True, formatspecs)
21312131
if(fcs != newfcs and not skipchecksum):
21322132
VerbosePrintOut("File Header Checksum Error with file " +
21332133
fname + " at offset " + str(fheaderstart))
@@ -2311,7 +2311,7 @@ def ReadFileHeaderDataWithContentToList(fp, listonly=False, contentasfile=False,
23112311
fcs = HeaderOut[-2].lower()
23122312
fccs = HeaderOut[-1].lower()
23132313
newfcs = GetHeaderChecksum(
2314-
HeaderOut[:-2] + [fprejsoncontent], HeaderOut[-4].lower(), True, formatspecs)
2314+
HeaderOut[:-2], HeaderOut[-4].lower(), True, formatspecs)
23152315
if(fcs != newfcs and not skipchecksum):
23162316
VerbosePrintOut("File Header Checksum Error with file " +
23172317
fname + " at offset " + str(fheaderstart))
@@ -2533,7 +2533,7 @@ def ReadFileDataWithContentToArray(fp, seekstart=0, seekend=0, listonly=False, c
25332533
VerbosePrintOut("'" + prefjsonchecksum + "' != " + "'" + prejsonfcs + "'")
25342534
return False
25352535
prenewfcs = GetHeaderChecksum(
2536-
preheaderdata[:-2] + prefprejsoncontent, preheaderdata[-4].lower(), True, formatspecs)
2536+
preheaderdata[:-2], preheaderdata[-4].lower(), True, formatspecs)
25372537
prefcs = preheaderdata[-2]
25382538
if(prefcs != prenewfcs and not skipchecksum):
25392539
VVerbosePrintOut("File Header Checksum Error with file " +
@@ -3322,7 +3322,7 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, fi
33223322
extrasizestr = extrasizestr + \
33233323
AppendNullBytes(extradata, formatspecs['format_delimiter'])
33243324
extrasizelen = format(len(extrasizestr), 'x').lower()
3325-
tmpoutlen = len(filevalues) + len(extradata) + 12
3325+
tmpoutlen = len(filevalues) + len(extradata) + 11
33263326
tmpoutlenhex = format(tmpoutlen, 'x').lower()
33273327
tmpoutlist = filevalues
33283328
fjsontype = "json"
@@ -3341,9 +3341,10 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, fi
33413341
tmpoutlist.append(fjsonsize)
33423342
if(len(jsondata) > 0):
33433343
tmpoutlist.append(checksumtype[2])
3344+
tmpoutlist.append(GetFileChecksum(fjsoncontent, checksumtype[2], True, formatspecs))
33443345
else:
33453346
tmpoutlist.append("none")
3346-
tmpoutlist.append(GetFileChecksum(fjsoncontent, checksumtype[2], True, formatspecs))
3347+
tmpoutlist.append(GetFileChecksum(fjsoncontent, "none", True, formatspecs))
33473348
tmpoutlist.append(extrasizelen)
33483349
tmpoutlist.append(extrafields)
33493350
outfileoutstr = AppendNullBytes(
@@ -3359,7 +3360,7 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, fi
33593360
AppendNullBytes(checksumlist, formatspecs['format_delimiter'])
33603361
nullstrecd = formatspecs['format_delimiter'].encode('UTF-8')
33613362
outfileheadercshex = GetFileChecksum(
3362-
outfileoutstr + fjsoncontent + nullstrecd, checksumtype[0], True, formatspecs)
3363+
outfileoutstr, checksumtype[0], True, formatspecs)
33633364
if(len(filecontent) == 0):
33643365
outfilecontentcshex = GetFileChecksum(
33653366
filecontent, "none", False, formatspecs)
@@ -3373,7 +3374,7 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, fi
33733374
outfileoutstr = AppendNullByte(
33743375
formheaersize, formatspecs['format_delimiter']) + outfileoutstr
33753376
outfileheadercshex = GetFileChecksum(
3376-
outfileoutstr + fjsoncontent + nullstrecd, checksumtype[0], True, formatspecs)
3377+
outfileoutstr, checksumtype[0], True, formatspecs)
33773378
outfileoutstr = outfileoutstr + \
33783379
AppendNullBytes([outfileheadercshex, outfilecontentcshex],
33793380
formatspecs['format_delimiter'])
@@ -6626,7 +6627,7 @@ def CatFileSeekToFileNum(infile, fmttype="auto", seekto=0, listonly=False, conte
66266627
prefcs = preheaderdata[-2].lower()
66276628
prenewfcs = preheaderdata[-1].lower()
66286629
prenewfcs = GetHeaderChecksum(
6629-
preheaderdata[:-2] + [prefjoutfprejsoncontent], preheaderdata[-4].lower(), True, formatspecs)
6630+
preheaderdata[:-2], preheaderdata[-4].lower(), True, formatspecs)
66306631
if(prefcs != prenewfcs and not skipchecksum):
66316632
VerbosePrintOut("File Header Checksum Error with file " +
66326633
prefname + " at offset " + str(prefhstart))
@@ -6938,7 +6939,7 @@ def CatFileSeekToFileName(infile, fmttype="auto", seekfile=None, listonly=False,
69386939
prefcs = preheaderdata[-2].lower()
69396940
prenewfcs = preheaderdata[-1].lower()
69406941
prenewfcs = GetHeaderChecksum(
6941-
preheaderdata[:-2] + [prefjoutfprejsoncontent], preheaderdata[-4].lower(), True, formatspecs)
6942+
preheaderdata[:-2], preheaderdata[-4].lower(), True, formatspecs)
69426943
if(prefcs != prenewfcs and not skipchecksum):
69436944
VerbosePrintOut("File Header Checksum Error with file " +
69446945
prefname + " at offset " + str(prefhstart))
@@ -7260,7 +7261,7 @@ def CatFileValidate(infile, fmttype="auto", formatspecs=__file_format_multi_dict
72607261
outfcs = inheaderdata[-2].lower()
72617262
outfccs = inheaderdata[-1].lower()
72627263
infcs = GetHeaderChecksum(
7263-
inheaderdata[:-2] + [outfprejsoncontent], inheaderdata[-4].lower(), True, formatspecs)
7264+
inheaderdata[:-2], inheaderdata[-4].lower(), True, formatspecs)
72647265
if(verbose):
72657266
VerbosePrintOut(outfname)
72667267
VerbosePrintOut("Record Number " + str(il) + "; File ID " +
@@ -7594,7 +7595,7 @@ def CatFileToArray(infile, fmttype="auto", seekstart=0, seekend=0, listonly=Fals
75947595
prefcs = preheaderdata[-2].lower()
75957596
prenewfcs = preheaderdata[-1].lower()
75967597
prenewfcs = GetHeaderChecksum(
7597-
preheaderdata[:-2] + [prefjoutfprejsoncontent], preheaderdata[-4].lower(), True, formatspecs)
7598+
preheaderdata[:-2], preheaderdata[-4].lower(), True, formatspecs)
75987599
if(prefcs != prenewfcs and not skipchecksum):
75997600
VerbosePrintOut("File Header Checksum Error with file " +
76007601
prefname + " at offset " + str(prefhstart))
@@ -7753,7 +7754,7 @@ def CatFileToArray(infile, fmttype="auto", seekstart=0, seekend=0, listonly=Fals
77537754
outfcs = inheaderdata[-2].lower()
77547755
outfccs = inheaderdata[-1].lower()
77557756
infcs = GetHeaderChecksum(
7756-
inheaderdata[:-2] + [outfprejsoncontent], inheaderdata[-4].lower(), True, formatspecs)
7757+
inheaderdata[:-2], inheaderdata[-4].lower(), True, formatspecs)
77577758
if(outfcs != infcs and not skipchecksum):
77587759
VerbosePrintOut("File Header Checksum Error with file " +
77597760
outfname + " at offset " + str(outfhstart))

0 commit comments

Comments
 (0)