Add files via upload

Author: HimariKitsune

pycatfile.py

@@ -652,7 +652,7 @@ def _get(section_dict, key, default=None):
 __version_date__ = str(__version_date_info__[0]) + "." + str(
     __version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
 __revision__ = __version_info__[3]
-__revision_id__ = "$Id$"
+__revision_id__ = "$Id: 7d760a9824804341c14f119457713afbe95764bc $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-" + str(__version_date_info__[4])
@@ -10431,15 +10431,19 @@ def RePackCatFile(infile, outfile, fmttype="auto", compression="auto", compressw
                         fcontents.seek(0, 0)
                         cfcontents.seek(0, 0)
                         cfcontents = CompressOpenFileAlt(
-                            cfcontents, compressionuselist[ilmin], compressionlevel, compressionuselist, formatspecs
+                            cfcontents,
+                            compressionuselist[ilmin],
+                            compressionlevel,
+                            compressionuselist,
+                            formatspecs
                         )
                         if cfcontents:
                             cfcontents.seek(0, 2)
                             ilcsize.append(cfcontents.tell())
                             cfcontents.close()
                         else:
                             ilcsize.append(float("inf"))
-                        ilmin += 1
+                        ilmin = ilmin + 1
                     ilcmin = ilcsize.index(min(ilcsize))
                     curcompression = compressionuselist[ilcmin]
 
@@ -10448,16 +10452,24 @@ def RePackCatFile(infile, outfile, fmttype="auto", compression="auto", compressw
                 shutil.copyfileobj(fcontents, cfcontents, length=__filebuff_size__)
                 cfcontents.seek(0, 0)
                 cfcontents = CompressOpenFileAlt(
-                    cfcontents, curcompression, compressionlevel, compressionuselist, formatspecs
+                    cfcontents,
+                    curcompression,
+                    compressionlevel,
+                    compressionuselist,
+                    formatspecs
                 )
                 cfcontents.seek(0, 2)
-                cfsize_val = cfcontents.tell()
-                if ucfsize > cfsize_val:
-                    fcsize = format(int(cfsize_val), 'x').lower()
+                cfsize = cfcontents.tell()
+                if ucfsize > cfsize:
+                    fcsize = format(int(cfsize), 'x').lower()
                     fcompression = curcompression
                     fcontents.close()
                     fcontents = cfcontents
 
+            if fcompression == "none":
+                fcompression = ""
+            fcontents.seek(0, 0)
+
             # link following (fixed: use listarrayfiles, not prelistarrayfiles)
             if followlink:
                 if (cur_entry['ftype'] == 1 or cur_entry['ftype'] == 2):