PyCatFile 0.13.12__tar.gz → 0.13.14__tar.gz

{pycatfile-0.13.12 → pycatfile-0.13.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.13.12
+Version: 0.13.14
 Summary: A tar like file format name catfile after unix cat command (concatenate files) .
 Home-page: https://github.com/GameMaker2k/PyCatFile
 Download-URL: https://github.com/GameMaker2k/PyCatFile/archive/master.tar.gz

{pycatfile-0.13.12 → pycatfile-0.13.14}/PyCatFile.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.13.12
+Version: 0.13.14
 Summary: A tar like file format name catfile after unix cat command (concatenate files) .
 Home-page: https://github.com/GameMaker2k/PyCatFile
 Download-URL: https://github.com/GameMaker2k/PyCatFile/archive/master.tar.gz

{pycatfile-0.13.12 → pycatfile-0.13.14}/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: 6/26/2024 Ver. 0.13.12 RC 1 - Author: cooldude2k $
+    $FileInfo: catfile.py - Last Update: 7/10/2024 Ver. 0.13.12 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals;

{pycatfile-0.13.12 → pycatfile-0.13.14}/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: 6/26/2024 Ver. 0.13.12 RC 1 - Author: cooldude2k $
+    $FileInfo: neocatfile.py - Last Update: 7/10/2024 Ver. 0.13.12 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals

{pycatfile-0.13.12 → pycatfile-0.13.14}/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: 6/26/2024 Ver. 0.13.12 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 7/10/2024 Ver. 0.13.12 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals;
@@ -36,6 +36,11 @@ try:
 except ImportError:
  import json;
 
+try:
+ import configparser;
+except ImportError:
+ import ConfigParser as configparser;
+
 try:
  basestring;
 except NameError:
@@ -173,6 +178,8 @@ except ImportError:
 
 __use_pysftp__ = False;
 __use_alt_format__ = False;
+__config_file__ = 'catfile.ini'
+__use_ini_file__ = True;
 if(not havepysftp):
  __use_pysftp__ = False;
 __use_http_lib__ = "httpx";
@@ -182,43 +189,62 @@ if(__use_http_lib__=="requests" and havehttpx and not haverequests):
  __use_http_lib__ = "httpx";
 if((__use_http_lib__=="httpx" or __use_http_lib__=="requests") and not havehttpx and not haverequests):
  __use_http_lib__ = "urllib";
-if(not __use_alt_format__):
- ''' Format Info by Kazuki Przyborowski '''
- __file_format_name__ = "CatFile";
- __program_name__ = "Py"+__file_format_name__;
- __file_format_lower__ = __file_format_name__.lower();
- __file_format_magic__ = __file_format_name__;
- __file_format_len__ = len(__file_format_magic__);
- __file_format_hex__ = binascii.hexlify(__file_format_magic__.encode("UTF-8")).decode("UTF-8");
- __file_format_delimiter__ = "\x00";
- __file_format_ver__ = "001";
- __use_new_style__ = True;
- __use_advanced_list__ = True;
- __use_alt_inode__ = False;
- __file_format_extension__ = ".cat";
+if os.path.exists(__config_file__) and __use_ini_file__:
+ # Create a ConfigParser object
+ config = configparser.ConfigParser();
+ # Read the configuration file
+ config.read(__config_file__);
+ # Accessing values from the config file
+ __file_format_name__ = config['main']['name'];
+ __program_name__ = config['main']['proname'];
+ __file_format_lower__ = config['main']['lower'];
+ __file_format_magic__ = config['main']['magic'];
+ __file_format_len__ = int(config['main']['len']);
+ __file_format_hex__ = config['main']['hex'];
+ __file_format_delimiter__ = config['main']['delimiter'];
+ __file_format_ver__ = config['main']['ver'];
+ __use_new_style__ = config.getboolean('main', 'newstyle');
+ __use_advanced_list__ = config.getboolean('main', 'advancedlist');
+ __use_alt_inode__ = config.getboolean('main', 'altinode');
+ __file_format_extension__ = config['main']['extension'];
 else:
- ''' Format Info Generated by ChatGPT '''
- __file_format_name__ = "FastArchive";
- __program_name__ = "Py" + __file_format_name__;
- __file_format_lower__ = __file_format_name__.lower();
- __file_format_magic__ = "FstArch";
- __file_format_len__ = len(__file_format_magic__);
- __file_format_hex__ = binascii.hexlify(__file_format_magic__.encode("UTF-8")).decode("UTF-8");
- __file_format_delimiter__ = "\x1F";  # Using a non-printable ASCII character as delimiter
- __file_format_ver__ = "001";
- __use_new_style__ = True;
- __use_advanced_list__ = False;
- __use_alt_inode__ = False;
- __file_format_extension__ = ".fast";
+ if not __use_alt_format__:
+  # Format Info by Kazuki Przyborowski
+  __file_format_name__ = "CatFile";
+  __program_name__ = "Py" + __file_format_name__;
+  __file_format_lower__ = __file_format_name__.lower();
+  __file_format_magic__ = __file_format_name__;
+  __file_format_len__ = len(__file_format_magic__);
+  __file_format_hex__ = binascii.hexlify(__file_format_magic__.encode("UTF-8")).decode("UTF-8");
+  __file_format_delimiter__ = "\x00";
+  __file_format_ver__ = "001";
+  __use_new_style__ = True;
+  __use_advanced_list__ = True;
+  __use_alt_inode__ = False;
+  __file_format_extension__ = ".cat";
+ else:
+  # Format Info Generated by ChatGPT
+  __file_format_name__ = "FastArchive";
+  __program_name__ = "Py" + __file_format_name__;
+  __file_format_lower__ = __file_format_name__.lower();
+  __file_format_magic__ = "FstArch";
+  __file_format_len__ = len(__file_format_magic__);
+  __file_format_hex__ = binascii.hexlify(__file_format_magic__.encode("UTF-8")).decode("UTF-8");
+  __file_format_delimiter__ = "\x1F";  # Using a non-printable ASCII character as delimiter
+  __file_format_ver__ = "001";
+  __use_new_style__ = True;
+  __use_advanced_list__ = False;
+  __use_alt_inode__ = False;
+  __file_format_extension__ = ".fast";
 __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__];
 __file_format_dict__ = {'format_name': __file_format_name__, 'format_magic': __file_format_magic__, 'format_lower': __file_format_lower__, 'format_len': __file_format_len__, 'format_hex': __file_format_hex__, 'format_delimiter': __file_format_delimiter__, 'format_ver': __file_format_ver__, 'new_style': __use_new_style__, 'use_advanced_list': __use_advanced_list__, 'use_alt_inode': __use_alt_inode__};
 __project__ = __program_name__;
 __project_url__ = "https://github.com/GameMaker2k/PyCatFile";
-__version_info__ = (0, 13, 12, "RC 1", 1);
-__version_date_info__ = (2024, 6, 26, "RC 1", 1);
+__version_info__ = (0, 13, 14, "RC 1", 1);
+__version_date_info__ = (2024, 7, 10, "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];
-__revision_id__ = "$Id: 08421f3d82901583005f4ce8695097e5ed1c2e11 $";
+__revision_id__ = "$Id: 07817c123c2d804a582cf92b14210256929bb667 $";
 if(__version_info__[4] is not None):
  __version_date_plusrc__ = __version_date__ + "-" + str(__version_date_info__[4]);
 if(__version_info__[4] is None):
@@ -2652,6 +2678,50 @@ def PrintPermissionStringAlt(fchmode, ftype):
   permissionoutstr = permissionstr;
  return permissionoutstr;
 
+def GzipCompressData(data, compresslevel=9):
+ try:
+  # Try using modern gzip.compress if available
+  compressed_data = gzip.compress(data, compresslevel=compresslevel);
+ except AttributeError:
+  # Fallback to older method for Python 2.x and older 3.x versions
+  out = BytesIO();
+  with gzip.GzipFile(fileobj=out, mode="wb", compresslevel=compresslevel) as f:
+   f.write(data);
+  compressed_data = out.getvalue();
+ return compressed_data;
+
+def GzipDecompressData(compressed_data):
+ try:
+  # Try using modern gzip.decompress if available
+  decompressed_data = gzip.decompress(compressed_data);
+ except AttributeError:
+  # Fallback to older method for Python 2.x and older 3.x versions
+  inp = BytesIO(compressed_data);
+  with gzip.GzipFile(fileobj=inp, mode="rb") as f:
+   decompressed_data = f.read();
+ return decompressed_data;
+
+def BzipCompressData(data, compresslevel=9):
+ try:
+  # Try using modern bz2.compress if available
+  compressed_data = bz2.compress(data, compresslevel=compresslevel);
+ except AttributeError:
+  # Fallback to older method for Python 2.x and older 3.x versions
+  compressor = bz2.BZ2Compressor(compresslevel);
+  compressed_data = compressor.compress(data);
+  compressed_data += compressor.flush();
+ return compressed_data;
+
+def BzipDecompressData(compressed_data):
+ try:
+  # Try using modern bz2.decompress if available
+  decompressed_data = bz2.decompress(compressed_data);
+ except AttributeError:
+  # Fallback to older method for Python 2.x and older 3.x versions
+  decompressor = bz2.BZ2Decompressor();
+  decompressed_data = decompressor.decompress(compressed_data);
+ return decompressed_data;
+
 def CheckCompressionType(infile, formatspecs=__file_format_dict__, closefp=True):
  formatspecs = FormatSpecsListToDict(formatspecs);
  if(hasattr(infile, "read") or hasattr(infile, "write")):
@@ -2877,9 +2947,9 @@ def UncompressFile(infile, formatspecs=__file_format_dict__, mode="rb"):
 def UncompressString(infile):
  compresscheck = CheckCompressionTypeFromString(infile, formatspecs, False);
  if(compresscheck=="gzip" and compresscheck in compressionsupport):
-  fileuz = gzip.decompress(infile);
+  fileuz = GzipDecompressData(infile);
  if(compresscheck=="bzip2" and compresscheck in compressionsupport):
-  fileuz = bz2.decompress(infile);
+  fileuz = BzipDecompressData(infile);
  if(compresscheck=="zstd" and compresscheck in compressionsupport):
   try:
    import zstandard;
@@ -3031,14 +3101,14 @@ def CompressArchiveFile(fp, compression="auto", compressionlevel=None, formatspe
    compressionlevel = 9;
   else:
    compressionlevel = int(compressionlevel);
-  catfp.write(gzip.compress(fp.read(), compresslevel=compressionlevel));
+  catfp.write(GzipCompressData(fp.read(), compresslevel=compressionlevel));
  if(compression=="bzip2" and compression in compressionsupport):
   catfp = BytesIO();
   if(compressionlevel is None):
    compressionlevel = 9;
   else:
    compressionlevel = int(compressionlevel);
-  catfp.write(bz2.compress(fp.read(), compresslevel=compressionlevel));
+  catfp.write(BzipCompressData(fp.read(), compresslevel=compressionlevel));
  if(compression=="lz4" and compression in compressionsupport):
   catfp = BytesIO();
   if(compressionlevel is None):
@@ -3080,7 +3150,7 @@ def CompressArchiveFile(fp, compression="auto", compressionlevel=None, formatspe
    compressionlevel = 9;
   else:
    compressionlevel = int(compressionlevel);
-  catfp.write(zlib.compress(fp.read(), level=compressionlevel));
+  catfp.write(zlib.compress(fp.read(), compressionlevel));
  if(compression=="auto" or compression is None):
   catfp = fp;
  catfp.seek(0, 0);

{pycatfile-0.13.12 → pycatfile-0.13.14}/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: 6/26/2024 Ver. 0.13.12 RC 1 - Author: cooldude2k $
+    $FileInfo: setup.py - Last Update: 7/10/2024 Ver. 0.13.12 RC 1 - Author: cooldude2k $
 '''
 
 import os, re, sys, pkg_resources;