Skip to content

Commit 5532d51

Browse files
Add files via upload
1 parent f29d089 commit 5532d51

1 file changed

Lines changed: 19 additions & 7 deletions

File tree

pyfoxfile.py

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ def _get(section_dict, key, default=None):
653653
__version_date__ = str(__version_date_info__[0]) + "." + str(
654654
__version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
655655
__revision__ = __version_info__[3]
656-
__revision_id__ = "$Id$"
656+
__revision_id__ = "$Id: 11e7590033db3bbeb4ed0f9e6b57b184b58f36d9 $"
657657
if(__version_info__[4] is not None):
658658
__version_date_plusrc__ = __version_date__ + \
659659
"-" + str(__version_date_info__[4])
@@ -10432,15 +10432,19 @@ def RePackFoxFile(infile, outfile, fmttype="auto", compression="auto", compressw
1043210432
fcontents.seek(0, 0)
1043310433
cfcontents.seek(0, 0)
1043410434
cfcontents = CompressOpenFileAlt(
10435-
cfcontents, compressionuselist[ilmin], compressionlevel, compressionuselist, formatspecs
10435+
cfcontents,
10436+
compressionuselist[ilmin],
10437+
compressionlevel,
10438+
compressionuselist,
10439+
formatspecs
1043610440
)
1043710441
if cfcontents:
1043810442
cfcontents.seek(0, 2)
1043910443
ilcsize.append(cfcontents.tell())
1044010444
cfcontents.close()
1044110445
else:
1044210446
ilcsize.append(float("inf"))
10443-
ilmin += 1
10447+
ilmin = ilmin + 1
1044410448
ilcmin = ilcsize.index(min(ilcsize))
1044510449
curcompression = compressionuselist[ilcmin]
1044610450

@@ -10449,16 +10453,24 @@ def RePackFoxFile(infile, outfile, fmttype="auto", compression="auto", compressw
1044910453
shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
1045010454
cfcontents.seek(0, 0)
1045110455
cfcontents = CompressOpenFileAlt(
10452-
cfcontents, curcompression, compressionlevel, compressionuselist, formatspecs
10456+
cfcontents,
10457+
curcompression,
10458+
compressionlevel,
10459+
compressionuselist,
10460+
formatspecs
1045310461
)
1045410462
cfcontents.seek(0, 2)
10455-
cfsize_val = cfcontents.tell()
10456-
if ucfsize > cfsize_val:
10457-
fcsize = format(int(cfsize_val), 'x').lower()
10463+
cfsize = cfcontents.tell()
10464+
if ucfsize > cfsize:
10465+
fcsize = format(int(cfsize), 'x').lower()
1045810466
fcompression = curcompression
1045910467
fcontents.close()
1046010468
fcontents = cfcontents
1046110469

10470+
if fcompression == "none":
10471+
fcompression = ""
10472+
fcontents.seek(0, 0)
10473+
1046210474
# link following (fixed: use listarrayfiles, not prelistarrayfiles)
1046310475
if followlink:
1046410476
if (cur_entry['ftype'] == 1 or cur_entry['ftype'] == 2):

0 commit comments

Comments
 (0)