Add files via upload

GameMaker2k · May 2, 2024 · f548ef0 · f548ef0
1 parent f8e1adb
commit f548ef0
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 31 deletions.
diff --git a/catfile.py b/catfile.py
@@ -14,7 +14,7 @@
     Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: catfile.py - Last Update: 5/1/2024 Ver. 0.9.4 RC 1 - Author: cooldude2k $
+    $FileInfo: catfile.py - Last Update: 5/1/2024 Ver. 0.9.6 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals;

diff --git a/checksum.py b/checksum.py
@@ -14,7 +14,7 @@
     Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: checksum.py - Last Update: 5/1/2024 Ver. 0.9.4 RC 1 - Author: cooldude2k $
+    $FileInfo: checksum.py - Last Update: 5/1/2024 Ver. 0.9.6 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals;

diff --git a/compression.py b/compression.py
@@ -14,7 +14,7 @@
     Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: compression.py - Last Update: 5/1/2024 Ver. 0.9.4 RC 1 - Author: cooldude2k $
+    $FileInfo: compression.py - Last Update: 5/1/2024 Ver. 0.9.6 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals;

diff --git a/mkcatfilebundle.py b/mkcatfilebundle.py
@@ -14,7 +14,7 @@
     Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: mkbundle.py - Last Update: 5/1/2024 Ver. 0.9.4 RC 1 - Author: cooldude2k $
+    $FileInfo: mkbundle.py - Last Update: 5/1/2024 Ver. 0.9.6 RC 1 - Author: cooldude2k $
 '''
 
 import os, sys, shutil, subprocess, tempfile, subprocess, platform;

diff --git a/neocatfile.py b/neocatfile.py
@@ -14,7 +14,7 @@
     Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: neocatfile.py - Last Update: 5/1/2024 Ver. 0.9.4 RC 1 - Author: cooldude2k $
+    $FileInfo: neocatfile.py - Last Update: 5/1/2024 Ver. 0.9.6 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals

diff --git a/phpcatfile.php b/phpcatfile.php
@@ -12,15 +12,15 @@
     Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: phpcatfile.php - Last Update: 5/1/2024 Ver. 0.9.4 RC 1 - Author: cooldude2k $
+    $FileInfo: phpcatfile.php - Last Update: 5/1/2024 Ver. 0.9.6 RC 1 - Author: cooldude2k $
 */
 
 date_default_timezone_set('UTC');
 
 $info['program_name'] = "PHPCatFile";
 $info['project'] = $info['program_name'];
 $info['project_url'] = "https://github.com/GameMaker2k/PyCatFile";
-$info['version_info'] = [0, 9, 4, "RC 1", 1];
+$info['version_info'] = [0, 9, 6, "RC 1", 1];
 $info['version_id'] = "$Id$";
 $info['version_date_info'] = [2024, 5, 1, "RC 1", 1];
 $info['version_date'] = $info['version_date_info'][0].".".str_pad($info['version_date_info'][1], 2, "-=", STR_PAD_LEFT).".".str_pad($info['version_date_info'][2], 2, "-=", STR_PAD_LEFT);

diff --git a/pycatfile.py b/pycatfile.py
@@ -14,7 +14,7 @@
     Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: pycatfile.py - Last Update: 5/1/2024 Ver. 0.9.4 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 5/1/2024 Ver. 0.9.6 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals;
@@ -174,7 +174,7 @@
 __file_format_list__ = [__file_format_name__, __file_format_magic__, __file_format_lower__, __file_format_len__, __file_format_hex__, __file_format_delimiter__, __file_format_ver__, __use_new_style__, __use_advanced_list__, __use_alt_inode__];
 __project__ = __program_name__;
 __project_url__ = "https://github.com/GameMaker2k/PyCatFile";
-__version_info__ = (0, 9, 4, "RC 1", 1);
+__version_info__ = (0, 9, 6, "RC 1", 1);
 __version_date_info__ = (2024, 5, 1, "RC 1", 1);
 __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];
@@ -2540,7 +2540,8 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
   catfcontentstart = catfp.tell() + len(catfileoutstr);
   catfileoutstrecd = catfileoutstr.encode('UTF-8');
   nullstrecd = formatspecs[5].encode('UTF-8');
-  catfileout = catfileoutstrecd + fcontents + nullstrecd;
+  fcontents.seek(0, 0);
+  catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
   catfcontentend = (catfp.tell() - 1) + len(catfileout);
   catfp.write(catfileout);
   try:
@@ -2777,7 +2778,8 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compressionl
   catfileoutstr = catfileoutstr + AppendNullBytes([catfileheadercshex, catfilecontentcshex], formatspecs[5]);
   catfileoutstrecd = catfileoutstr.encode('UTF-8');
   nullstrecd = formatspecs[5].encode('UTF-8');
-  catfileout = catfileoutstrecd + fcontents + nullstrecd;
+  fcontents.seek(0, 0);
+  catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
   catfcontentend = (catfp.tell() - 1) + len(catfileout);
   catfp.write(catfileout);
   try:
@@ -3024,7 +3026,8 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compressionl
   catfileoutstr = catfileoutstr + AppendNullBytes([catfileheadercshex, catfilecontentcshex], formatspecs[5]);
   catfileoutstrecd = catfileoutstr.encode('UTF-8');
   nullstrecd = formatspecs[5].encode('UTF-8');
-  catfileout = catfileoutstrecd + fcontents + nullstrecd;
+  fcontents.seek(0, 0);
+  catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
   catfcontentend = (catfp.tell() - 1) + len(catfileout);
   catfp.write(catfileout);
   try:
@@ -3287,11 +3290,12 @@ def PackArchiveFileFromRarFile(infile, outfile, compression="auto", compressionl
    catfileoutstr = AppendNullByte(catheaersize, formatspecs[5]) + catfileoutstr;
    catfileheadercshex = GetFileChecksum(catfileoutstr, checksumtype, True, formatspecs);
    catfileoutstr = catfileoutstr + AppendNullBytes([catfileheadercshex, catfilecontentcshex], formatspecs[5])
-   catfileoutstrecd = catfileoutstr.encode('UTF-8')
-   nullstrecd = formatspecs[5].encode('UTF-8')
-   catfileout = catfileoutstrecd + fcontents + nullstrecd
-   catfcontentend = (catfp.tell() - 1) + len(catfileout)
-   catfp.write(catfileout)
+   catfileoutstrecd = catfileoutstr.encode('UTF-8');
+   nullstrecd = formatspecs[5].encode('UTF-8');
+   fcontents.seek(0, 0);
+   catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
+   catfcontentend = (catfp.tell() - 1) + len(catfileout);
+   catfp.write(catfileout);
    try:
     catfp.flush();
     os.fsync(catfp.fileno());
@@ -3499,11 +3503,12 @@ def PackArchiveFileFromSevenZipFile(infile, outfile, compression="auto", compres
    catfileoutstr = AppendNullByte(catheaersize, formatspecs[5]) + catfileoutstr;
    catfileheadercshex = GetFileChecksum(catfileoutstr, checksumtype, True, formatspecs);
    catfileoutstr = catfileoutstr + AppendNullBytes([catfileheadercshex, catfilecontentcshex], formatspecs[5])
-   catfileoutstrecd = catfileoutstr.encode('UTF-8')
-   nullstrecd = formatspecs[5].encode('UTF-8')
-   catfileout = catfileoutstrecd + fcontents + nullstrecd
-   catfcontentend = (catfp.tell() - 1) + len(catfileout)
-   catfp.write(catfileout)
+   catfileoutstrecd = catfileoutstr.encode('UTF-8');
+   nullstrecd = formatspecs[5].encode('UTF-8');
+   fcontents.seek(0, 0);
+   catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
+   catfcontentend = (catfp.tell() - 1) + len(catfileout);
+   catfp.write(catfileout);
    try:
     catfp.flush();
     os.fsync(catfp.fileno());
@@ -4736,7 +4741,8 @@ def ListDirToArrayAlt(infiles, dirlistfromtxt=False, followlink=False, listonly=
   nullstrecd = formatspecs[5].encode('UTF-8');
   fheadtell += len(catfileoutstr) + 1;
   catfcontentend = fheadtell - 1;
-  catfileout = catfileoutstrecd + fcontents + nullstrecd;
+  fcontents.seek(0, 0);
+  catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
   pyhascontents = False;
   if(int(fsize)>0 and not listonly):
    pyhascontents = True;
@@ -4909,7 +4915,8 @@ def TarFileToArrayAlt(infiles, listonly=False, checksumtype="crc32", extradata=[
   nullstrecd = formatspecs[5].encode('UTF-8');
   fheadtell += len(catfileoutstr) + 1;
   catfcontentend = fheadtell - 1;
-  catfileout = catfileoutstrecd + fcontents + nullstrecd;
+  fcontents.seek(0, 0);
+  catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
   pyhascontents = False;
   if(int(fsize)>0 and not listonly):
    pyhascontents = True;
@@ -5100,7 +5107,8 @@ def ZipFileToArrayAlt(infiles, listonly=False, checksumtype="crc32", extradata=[
   nullstrecd = formatspecs[5].encode('UTF-8');
   fheadtell += len(catfileoutstr) + 1;
   catfcontentend = fheadtell - 1;
-  catfileout = catfileoutstrecd + fcontents + nullstrecd;
+  fcontents.seek(0, 0);
+  catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
   pyhascontents = False;
   if(int(fsize)>0 and not listonly):
    pyhascontents = True;
@@ -5309,7 +5317,8 @@ def RarFileToArrayAlt(infiles, listonly=False, checksumtype="crc32", extradata=[
    nullstrecd = formatspecs[5].encode('UTF-8');
    fheadtell += len(catfileoutstr) + 1;
    catfcontentend = fheadtell - 1;
-   catfileout = catfileoutstrecd + fcontents + nullstrecd;
+   fcontents.seek(0, 0);
+   catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
    pyhascontents = False;
    if(int(fsize)>0 and not listonly):
     pyhascontents = True;
@@ -5463,7 +5472,8 @@ def SevenZipFileToArrayAlt(infiles, listonly=False, checksumtype="crc32", extrad
    nullstrecd = formatspecs[5].encode('UTF-8');
    fheadtell += len(catfileoutstr) + 1;
    catfcontentend = fheadtell - 1;
-   catfileout = catfileoutstrecd + fcontents + nullstrecd;
+   fcontents.seek(0, 0);
+   catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
    pyhascontents = False;
    if(int(fsize)>0 and not listonly):
     pyhascontents = True;
@@ -6061,7 +6071,8 @@ def RePackArchiveFile(infile, outfile, compression="auto", compressionlevel=None
   catfileoutstr = catfileoutstr + AppendNullBytes([catfileheadercshex, catfilecontentcshex], formatspecs[5]);
   catfileoutstrecd = catfileoutstr.encode('UTF-8');
   nullstrecd = formatspecs[5].encode('UTF-8');
-  catfileout = catfileoutstrecd + fcontents + nullstrecd;
+  fcontents.seek(0, 0);
+  catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
   catfcontentend = (catfp.tell() - 1) + len(catfileout);
   catfp.write(catfileout);
   try:

diff --git a/pyshell-old.py b/pyshell-old.py
@@ -13,7 +13,7 @@
     Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: pyshell-old.py - Last Update: 5/1/2024 Ver. 0.9.4 RC 1 - Author: cooldude2k $
+    $FileInfo: pyshell-old.py - Last Update: 5/1/2024 Ver. 0.9.6 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import print_function

diff --git a/pyshell.py b/pyshell.py
@@ -13,7 +13,7 @@
     Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: pyshell.py - Last Update: 5/1/2024 Ver. 0.9.4 RC 1 - Author: cooldude2k $
+    $FileInfo: pyshell.py - Last Update: 5/1/2024 Ver. 0.9.6 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import division, absolute_import, print_function;

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
     Copyright 2016-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2016-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: setup.py - Last Update: 5/1/2024 Ver. 0.9.4 RC 1 - Author: cooldude2k $
+    $FileInfo: setup.py - Last Update: 5/1/2024 Ver. 0.9.6 RC 1 - Author: cooldude2k $
 '''
 
 import os, re, sys, pkg_resources;