Skip to content

Commit f692436

Browse files
YuukaNekoUwUYuukaNekoUwU
committed
Small bug fix
1 parent 13af645 commit f692436

2 files changed

Lines changed: 10 additions & 12 deletions

File tree

‎archivefile.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def handler(signum, frame):
154154
checkcompressfile = pyarchivefile.CheckCompressionSubType(
155155
input_file, fnamedict, 0, True)
156156
if((pyarchivefile.IsNestedDict(fnamedict) and checkcompressfile in fnamedict) or (pyarchivefile.IsSingleDict(fnamedict) and checkcompressfile==fnamedict['format_magic'])):
157-
tmpout = pyarchivefile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, False, 0, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.secretkey, getargs.verbose, False)
157+
tmpout = pyarchivefile.RePackArchiveFile(input_file, getargs.output, "auto", getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, False, 0, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.secretkey, getargs.verbose, False)
158158
else:
159159
tmpout = pyarchivefile.PackArchiveFileFromInFile(
160160
input_file, getargs.output, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.secretkey, getargs.verbose, False)
@@ -167,22 +167,22 @@ def handler(signum, frame):
167167
checkcompressfile = pyarchivefile.CheckCompressionSubType(
168168
input_file, fnamedict, 0, True)
169169
if((pyarchivefile.IsNestedDict(fnamedict) and checkcompressfile in fnamedict) or (pyarchivefile.IsSingleDict(fnamedict) and checkcompressfile==fnamedict['format_magic'])):
170-
pyarchivefile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt,
170+
pyarchivefile.RePackArchiveFile(input_file, getargs.output, "auto", getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt,
171171
False, 0, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.secretkey, getargs.verbose, False)
172172
else:
173173
pyarchivefile.PackArchiveFileFromInFile(input_file, getargs.output, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.secretkey, getargs.verbose, False)
174174
if(not tmpout):
175175
sys.exit(1)
176176
else:
177-
pyarchivefile.RePackArchiveFile(input_file, getargs.output, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt,
177+
pyarchivefile.RePackArchiveFile(input_file, getargs.output, "auto", getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt,
178178
False, getargs.filestart, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.secretkey, getargs.verbose, False)
179179
elif active_action == 'extract':
180180
if getargs.convert:
181181
checkcompressfile = pyarchivefile.CheckCompressionSubType(
182182
input_file, fnamedict, 0, True)
183183
tempout = BytesIO()
184184
if((pyarchivefile.IsNestedDict(fnamedict) and checkcompressfile in fnamedict) or (pyarchivefile.IsSingleDict(fnamedict) and checkcompressfile==fnamedict['format_magic'])):
185-
tmpout = pyarchivefile.RePackArchiveFile(input_file, tempout, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, False, 0, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.secretkey, False, False)
185+
tmpout = pyarchivefile.RePackArchiveFile(input_file, tempout, "auto", getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, False, 0, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.secretkey, False, False)
186186
else:
187187
tmpout = pyarchivefile.PackArchiveFileFromInFile(
188188
input_file, tempout, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.secretkey, False, False)
@@ -209,7 +209,7 @@ def handler(signum, frame):
209209
input_file, fnamedict, 0, True)
210210
tempout = BytesIO()
211211
if((pyarchivefile.IsNestedDict(fnamedict) and checkcompressfile in fnamedict) or (pyarchivefile.IsSingleDict(fnamedict) and checkcompressfile==fnamedict['format_magic'])):
212-
tmpout = pyarchivefile.RePackArchiveFile(input_file, tempout, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, False, 0, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.secretkey, False, False, False)
212+
tmpout = pyarchivefile.RePackArchiveFile(input_file, tempout, "auto", getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, False, 0, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.secretkey, False, False, False)
213213
else:
214214
tmpout = pyarchivefile.PackArchiveFileFromInFile(
215215
input_file, tempout, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.secretkey, False, False)

‎pyarchivefile.py‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ def _get(section_dict, key, default=None):
650650
__version_date__ = str(__version_date_info__[0]) + "." + str(
651651
__version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
652652
__revision__ = __version_info__[3]
653-
__revision_id__ = "$Id: 739a621c8fd9c555929ae2f1fc90ad67d86b4f14 $"
653+
__revision_id__ = "$Id$"
654654
if(__version_info__[4] is not None):
655655
__version_date_plusrc__ = __version_date__ + \
656656
"-" + str(__version_date_info__[4])
@@ -10244,7 +10244,7 @@ def RePackArchiveFile(infile, outfile, fmttype="auto", compression="auto", compr
1024410244
infile = RemoveWindowsPath(infile)
1024510245
listarrayfileslist = ArchiveFileToArray(
1024610246
infile, "auto", filestart, seekstart, seekend,
10247-
False, True, True, skipchecksum, formatspecs, seektoend, False
10247+
False, True, True, skipchecksum, formatspecs, saltkey, seektoend, False
1024810248
)
1024910249

1025010250
# ---------- Format specs selection ----------
@@ -10377,8 +10377,7 @@ def RePackArchiveFile(infile, outfile, fmttype="auto", compression="auto", compr
1037710377
fcompression = cur_entry['fcompression']
1037810378
fcsize = format(int(cur_entry['fcsize']), 'x').lower()
1037910379
fdev = format(int(cur_entry['fdev']), 'x').lower()
10380-
fdev_minor = format(int(cur_entry['fminor']), 'x').lower()
10381-
fdev_major = format(int(cur_entry['fmajor']), 'x').lower()
10380+
frdev = format(int(cur_entry['frdev']), 'x').lower()
1038210381
fseeknextfile = cur_entry['fseeknextfile']
1038310382

1038410383
# extra fields sizing
@@ -10486,8 +10485,7 @@ def RePackArchiveFile(infile, outfile, fmttype="auto", compression="auto", compr
1048610485
fcompression = flinkinfo['fcompression']
1048710486
fcsize = format(int(flinkinfo['fcsize']), 'x').lower()
1048810487
fdev = format(int(flinkinfo['fdev']), 'x').lower()
10489-
fdev_minor = format(int(flinkinfo['fminor']), 'x').lower()
10490-
fdev_major = format(int(flinkinfo['fmajor']), 'x').lower()
10488+
frdev = format(int(flinkinfo['frdev']), 'x').lower()
1049110489
fseeknextfile = flinkinfo['fseeknextfile']
1049210490
if (len(flinkinfo['fextradata']) > flinkinfo['fextrafields']
1049310491
and len(flinkinfo['fextradata']) > 0):
@@ -10530,7 +10528,7 @@ def RePackArchiveFile(infile, outfile, fmttype="auto", compression="auto", compr
1053010528
tmpoutlist = [
1053110529
ftypehex, fencoding, fcencoding, fname, flinkname, fsize, fblksize, fblocks, fflags, fatime, fmtime,
1053210530
fctime, fbtime, fmode, fwinattributes, fcompression, fcsize, fuid, funame,
10533-
fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, fdev_minor, fdev_major, fseeknextfile
10531+
fgid, fgname, fcurfid, fcurinode, flinkcount, fdev, frdev, fseeknextfile
1053410532
]
1053510533

1053610534
if(fvendorfields>0 and len(ffvendorfieldslist)>0):

0 commit comments

Comments
 (0)