Skip to content

Commit cce9d21

Browse files
author
Kazuki Suzuki Przyborowski
committed
Update pyarchivefile.py
1 parent feb98a9 commit cce9d21

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

‎pyarchivefile.py‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,7 +1940,7 @@ def ReadFileHeaderDataWithContent(fp, listonly=False, uncompress=True, skipcheck
19401940
return False
19411941
fp.seek(len(delimiter), 1)
19421942
newfcs = GetHeaderChecksum(
1943-
HeaderOut[:-2] + [fprejsoncontent], HeaderOut[-4].lower(), True, formatspecs)
1943+
HeaderOut[:-2], HeaderOut[-4].lower(), True, formatspecs)
19441944
HeaderOut.append(fjsoncontent)
19451945
if(fcs != newfcs and not skipchecksum):
19461946
VerbosePrintOut("File Header Checksum Error with file " +
@@ -2115,7 +2115,7 @@ def ReadFileHeaderDataWithContentToArray(fp, listonly=False, contentasfile=True,
21152115
fcs = HeaderOut[-2].lower()
21162116
fccs = HeaderOut[-1].lower()
21172117
newfcs = GetHeaderChecksum(
2118-
HeaderOut[:-2] + [fprejsoncontent], HeaderOut[-4].lower(), True, formatspecs)
2118+
HeaderOut[:-2], HeaderOut[-4].lower(), True, formatspecs)
21192119
if(fcs != newfcs and not skipchecksum):
21202120
VerbosePrintOut("File Header Checksum Error with file " +
21212121
fname + " at offset " + str(fheaderstart))
@@ -2299,7 +2299,7 @@ def ReadFileHeaderDataWithContentToList(fp, listonly=False, contentasfile=False,
22992299
fcs = HeaderOut[-2].lower()
23002300
fccs = HeaderOut[-1].lower()
23012301
newfcs = GetHeaderChecksum(
2302-
HeaderOut[:-2] + [fprejsoncontent], HeaderOut[-4].lower(), True, formatspecs)
2302+
HeaderOut[:-2], HeaderOut[-4].lower(), True, formatspecs)
23032303
if(fcs != newfcs and not skipchecksum):
23042304
VerbosePrintOut("File Header Checksum Error with file " +
23052305
fname + " at offset " + str(fheaderstart))
@@ -2521,7 +2521,7 @@ def ReadFileDataWithContentToArray(fp, seekstart=0, seekend=0, listonly=False, c
25212521
VerbosePrintOut("'" + prefjsonchecksum + "' != " + "'" + prejsonfcs + "'")
25222522
return False
25232523
prenewfcs = GetHeaderChecksum(
2524-
preheaderdata[:-2] + prefprejsoncontent, preheaderdata[-4].lower(), True, formatspecs)
2524+
preheaderdata[:-2], preheaderdata[-4].lower(), True, formatspecs)
25252525
prefcs = preheaderdata[-2]
25262526
if(prefcs != prenewfcs and not skipchecksum):
25272527
VVerbosePrintOut("File Header Checksum Error with file " +
@@ -3310,7 +3310,7 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, fi
33103310
extrasizestr = extrasizestr + \
33113311
AppendNullBytes(extradata, formatspecs['format_delimiter'])
33123312
extrasizelen = format(len(extrasizestr), 'x').lower()
3313-
tmpoutlen = len(filevalues) + len(extradata) + 12
3313+
tmpoutlen = len(filevalues) + len(extradata) + 11
33143314
tmpoutlenhex = format(tmpoutlen, 'x').lower()
33153315
tmpoutlist = filevalues
33163316
fjsontype = "json"
@@ -3329,9 +3329,10 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, fi
33293329
tmpoutlist.append(fjsonsize)
33303330
if(len(jsondata) > 0):
33313331
tmpoutlist.append(checksumtype[2])
3332+
tmpoutlist.append(GetFileChecksum(fjsoncontent, checksumtype[2], True, formatspecs))
33323333
else:
33333334
tmpoutlist.append("none")
3334-
tmpoutlist.append(GetFileChecksum(fjsoncontent, checksumtype[2], True, formatspecs))
3335+
tmpoutlist.append(GetFileChecksum(fjsoncontent, "none", True, formatspecs))
33353336
tmpoutlist.append(extrasizelen)
33363337
tmpoutlist.append(extrafields)
33373338
outfileoutstr = AppendNullBytes(
@@ -3347,7 +3348,7 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, fi
33473348
AppendNullBytes(checksumlist, formatspecs['format_delimiter'])
33483349
nullstrecd = formatspecs['format_delimiter'].encode('UTF-8')
33493350
outfileheadercshex = GetFileChecksum(
3350-
outfileoutstr + fjsoncontent + nullstrecd, checksumtype[0], True, formatspecs)
3351+
outfileoutstr, checksumtype[0], True, formatspecs)
33513352
if(len(filecontent) == 0):
33523353
outfilecontentcshex = GetFileChecksum(
33533354
filecontent, "none", False, formatspecs)
@@ -3361,7 +3362,7 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, fi
33613362
outfileoutstr = AppendNullByte(
33623363
formheaersize, formatspecs['format_delimiter']) + outfileoutstr
33633364
outfileheadercshex = GetFileChecksum(
3364-
outfileoutstr + fjsoncontent + nullstrecd, checksumtype[0], True, formatspecs)
3365+
outfileoutstr, checksumtype[0], True, formatspecs)
33653366
outfileoutstr = outfileoutstr + \
33663367
AppendNullBytes([outfileheadercshex, outfilecontentcshex],
33673368
formatspecs['format_delimiter'])
@@ -6614,7 +6615,7 @@ def ArchiveFileSeekToFileNum(infile, fmttype="auto", seekto=0, listonly=False, c
66146615
prefcs = preheaderdata[-2].lower()
66156616
prenewfcs = preheaderdata[-1].lower()
66166617
prenewfcs = GetHeaderChecksum(
6617-
preheaderdata[:-2] + [prefjoutfprejsoncontent], preheaderdata[-4].lower(), True, formatspecs)
6618+
preheaderdata[:-2], preheaderdata[-4].lower(), True, formatspecs)
66186619
if(prefcs != prenewfcs and not skipchecksum):
66196620
VerbosePrintOut("File Header Checksum Error with file " +
66206621
prefname + " at offset " + str(prefhstart))
@@ -6926,7 +6927,7 @@ def ArchiveFileSeekToFileName(infile, fmttype="auto", seekfile=None, listonly=Fa
69266927
prefcs = preheaderdata[-2].lower()
69276928
prenewfcs = preheaderdata[-1].lower()
69286929
prenewfcs = GetHeaderChecksum(
6929-
preheaderdata[:-2] + [prefjoutfprejsoncontent], preheaderdata[-4].lower(), True, formatspecs)
6930+
preheaderdata[:-2], preheaderdata[-4].lower(), True, formatspecs)
69306931
if(prefcs != prenewfcs and not skipchecksum):
69316932
VerbosePrintOut("File Header Checksum Error with file " +
69326933
prefname + " at offset " + str(prefhstart))
@@ -7248,7 +7249,7 @@ def ArchiveFileValidate(infile, fmttype="auto", formatspecs=__file_format_multi_
72487249
outfcs = inheaderdata[-2].lower()
72497250
outfccs = inheaderdata[-1].lower()
72507251
infcs = GetHeaderChecksum(
7251-
inheaderdata[:-2] + [outfprejsoncontent], inheaderdata[-4].lower(), True, formatspecs)
7252+
inheaderdata[:-2], inheaderdata[-4].lower(), True, formatspecs)
72527253
if(verbose):
72537254
VerbosePrintOut(outfname)
72547255
VerbosePrintOut("Record Number " + str(il) + "; File ID " +
@@ -7582,7 +7583,7 @@ def ArchiveFileToArray(infile, fmttype="auto", seekstart=0, seekend=0, listonly=
75827583
prefcs = preheaderdata[-2].lower()
75837584
prenewfcs = preheaderdata[-1].lower()
75847585
prenewfcs = GetHeaderChecksum(
7585-
preheaderdata[:-2] + [prefjoutfprejsoncontent], preheaderdata[-4].lower(), True, formatspecs)
7586+
preheaderdata[:-2], preheaderdata[-4].lower(), True, formatspecs)
75867587
if(prefcs != prenewfcs and not skipchecksum):
75877588
VerbosePrintOut("File Header Checksum Error with file " +
75887589
prefname + " at offset " + str(prefhstart))
@@ -7741,7 +7742,7 @@ def ArchiveFileToArray(infile, fmttype="auto", seekstart=0, seekend=0, listonly=
77417742
outfcs = inheaderdata[-2].lower()
77427743
outfccs = inheaderdata[-1].lower()
77437744
infcs = GetHeaderChecksum(
7744-
inheaderdata[:-2] + [outfprejsoncontent], inheaderdata[-4].lower(), True, formatspecs)
7745+
inheaderdata[:-2], inheaderdata[-4].lower(), True, formatspecs)
77457746
if(outfcs != infcs and not skipchecksum):
77467747
VerbosePrintOut("File Header Checksum Error with file " +
77477748
outfname + " at offset " + str(outfhstart))

0 commit comments

Comments
 (0)