PyCatFile 0.12.8__tar.gz → 0.13.2__tar.gz

{pycatfile-0.12.8 → pycatfile-0.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.12.8
+Version: 0.13.2
 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.12.8 → pycatfile-0.13.2}/PyCatFile.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.12.8
+Version: 0.13.2
 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.12.8 → pycatfile-0.13.2}/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/5/2024 Ver. 0.12.8 RC 1 - Author: cooldude2k $
+    $FileInfo: catfile.py - Last Update: 6/14/2024 Ver. 0.13.2 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals;

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

{pycatfile-0.12.8 → pycatfile-0.13.2}/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/5/2024 Ver. 0.12.8 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 6/14/2024 Ver. 0.13.2 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals;
@@ -157,43 +157,46 @@ except ImportError:
   from StringIO import StringIO as BytesIO;
 
 __use_pysftp__ = False;
+__use_alt_format__ = False;
 if(not havepysftp):
  __use_pysftp__ = False;
-__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";
-'''
-__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, 12, 8, "RC 1", 1);
-__version_date_info__ = (2024, 6, 5, "RC 1", 1);
+__version_info__ = (0, 13, 2, "RC 1", 1);
+__version_date_info__ = (2024, 6, 14, "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: 6f80dae1c52e24c0763ebc1df2264c188bd8fe52 $";
+__revision_id__ = "$Id: 4fa12ed6c9a98672ea7ca68f9bff7b0f13f625d1 $";
 if(__version_info__[4] is not None):
  __version_date_plusrc__ = __version_date__ + "-" + str(__version_date_info__[4]);
 if(__version_info__[4] is None):
@@ -265,6 +268,7 @@ except ImportError:
   compressionsupport.append("xz");
  except ImportError:
   pass;
+compressionsupport.append("zlib");
 
 compressionlist = ['auto'];
 compressionlistalt = [];
@@ -310,6 +314,15 @@ if('xz' in compressionsupport):
  compressionlistalt.append('xz');
  outextlist.append('xz');
  outextlistwd.append('.xz');
+if('zlib' in compressionsupport):
+ compressionlist.append('zlib');
+ compressionlistalt.append('zlib');
+ outextlist.append('zz');
+ outextlistwd.append('.zz');
+ outextlist.append('zl');
+ outextlistwd.append('.zl');
+ outextlist.append('zlib');
+ outextlistwd.append('.zlib');
 
 tarfile_mimetype = "application/tar";
 tarfile_tar_mimetype = tarfile_mimetype;
@@ -330,7 +343,10 @@ archivefile_zstandard_mimetype = "application/x-"+__file_format_dict__['format_l
 archivefile_zstd_mimetype = archivefile_zstandard_mimetype;
 archivefile_lzma_mimetype = "application/x-"+__file_format_dict__['format_lower']+"+lzma";
 archivefile_xz_mimetype = "application/x-"+__file_format_dict__['format_lower']+"+xz";
-archivefile_extensions = [__file_format_extension__, __file_format_extension__+".gz", __file_format_extension__+".bz2", __file_format_extension__+".zst", __file_format_extension__+".lz4", __file_format_extension__+".lzo", __file_format_extension__+".lzop", __file_format_extension__+".lzma", __file_format_extension__+".xz"];
+archivefile_zlib_mimetype = "application/x-"+__file_format_dict__['format_lower']+"+zlib";
+archivefile_zz_mimetype = archivefile_zlib_mimetype;
+archivefile_zl_mimetype = archivefile_zlib_mimetype;
+archivefile_extensions = [__file_format_extension__, __file_format_extension__+".gz", __file_format_extension__+".bz2", __file_format_extension__+".zst", __file_format_extension__+".lz4", __file_format_extension__+".lzo", __file_format_extension__+".lzop", __file_format_extension__+".lzma", __file_format_extension__+".xz", __file_format_extension__+".zz", __file_format_extension__+".zl", __file_format_extension__+".zlib"];
 
 if __name__ == "__main__":
  import subprocess;
@@ -510,6 +526,436 @@ def FormatSpecsListToDict(formatspecs=__file_format_list__):
   return __file_format_dict__;
  return __file_format_dict__;
 
+class ZlibFile:
+ def __init__(self, file_path=None, fileobj=None, mode='rb', level=9, wbits=15, encoding=None, errors=None, newline=None):
+  if file_path is None and fileobj is None:
+   raise ValueError("Either file_path or fileobj must be provided");
+  if file_path is not None and fileobj is not None:
+   raise ValueError("Only one of file_path or fileobj should be provided");
+
+  self.file_path = file_path;
+  self.fileobj = fileobj;
+  self.mode = mode;
+  self.level = level;
+  self.wbits = wbits;
+  self.encoding = encoding;
+  self.errors = errors;
+  self.newline = newline;
+  self._compressed_data = b'';
+  self._decompressed_data = b'';
+  self._position = 0;
+  self._text_mode = 't' in mode;
+
+  # Force binary mode for internal handling
+  internal_mode = mode.replace('t', 'b');
+
+  if 'w' in mode or 'a' in mode or 'x' in mode:
+   self.file = open(file_path, internal_mode) if file_path else fileobj;
+   self._compressor = zlib.compressobj(level, zlib.DEFLATED, wbits);
+  elif 'r' in mode:
+   if file_path:
+    if os.path.exists(file_path):
+     self.file = open(file_path, internal_mode);
+     self._load_file();
+    else:
+     raise FileNotFoundError("No such file: '{}'".format(file_path));
+   elif fileobj:
+    self.file = fileobj;
+    self._load_file();
+  else:
+   raise ValueError("Mode should be 'rb' or 'wb'");
+
+ def _load_file(self):
+  self.file.seek(0);
+  self._compressed_data = self.file.read();
+  if not self._compressed_data.startswith((b'\x78\x01', b'\x78\x5E', b'\x78\x9C', b'\x78\xDA')):
+   raise ValueError("Invalid zlib file header");
+  self._decompressed_data = zlib.decompress(self._compressed_data, self.wbits);
+  if self._text_mode:
+   self._decompressed_data = self._decompressed_data.decode(self.encoding or 'utf-8', self.errors or 'strict');
+
+ def write(self, data):
+  if self._text_mode:
+   data = data.encode(self.encoding or 'utf-8', self.errors or 'strict');
+  compressed_data = self._compressor.compress(data) + self._compressor.flush(zlib.Z_SYNC_FLUSH);
+  self.file.write(compressed_data);
+
+ def read(self, size=-1):
+  if size == -1:
+   size = len(self._decompressed_data) - self._position;
+  data = self._decompressed_data[self._position:self._position + size];
+  self._position += size;
+  return data;
+
+ def seek(self, offset, whence=0):
+  if whence == 0:  # absolute file positioning
+   self._position = offset;
+  elif whence == 1:  # seek relative to the current position
+   self._position += offset;
+  elif whence == 2:  # seek relative to the file's end
+   self._position = len(self._decompressed_data) + offset;
+  else:
+   raise ValueError("Invalid value for whence");
+
+  # Ensure the position is within bounds
+  self._position = max(0, min(self._position, len(self._decompressed_data)));
+
+ def tell(self):
+  return self._position;
+
+ def flush(self):
+  self.file.flush();
+
+ def fileno(self):
+  if hasattr(self.file, 'fileno'):
+   return self.file.fileno();
+  raise OSError("The underlying file object does not support fileno()");
+
+ def isatty(self):
+  if hasattr(self.file, 'isatty'):
+   return self.file.isatty();
+  return False;
+
+ def truncate(self, size=None):
+  if hasattr(self.file, 'truncate'):
+   return self.file.truncate(size);
+  raise OSError("The underlying file object does not support truncate()");
+
+ def close(self):
+  if 'w' in self.mode or 'a' in self.mode or 'x' in self.mode:
+   self.file.write(self._compressor.flush(zlib.Z_FINISH));
+  if self.file_path:
+   self.file.close();
+
+ def __enter__(self):
+  return self;
+
+ def __exit__(self, exc_type, exc_value, traceback):
+  self.close();
+
+class GzipFile:
+ def __init__(self, file_path=None, fileobj=None, mode='rb', compresslevel=9, encoding=None, errors=None, newline=None):
+  if file_path is None and fileobj is None:
+   raise ValueError("Either file_path or fileobj must be provided");
+  if file_path is not None and fileobj is not None:
+   raise ValueError("Only one of file_path or fileobj should be provided");
+
+  self.file_path = file_path;
+  self.fileobj = fileobj;
+  self.mode = mode;
+  self.compresslevel = compresslevel;
+  self.encoding = encoding;
+  self.errors = errors;
+  self.newline = newline;
+  self._compressed_data = b'';
+  self._decompressed_data = b'';
+  self._position = 0;
+  self._text_mode = 't' in mode;
+
+  # Force binary mode for internal handling
+  internal_mode = mode.replace('t', 'b');
+
+  if 'w' in mode or 'a' in mode or 'x' in mode:
+   self.file = gzip.open(file_path, internal_mode, compresslevel=compresslevel) if file_path else gzip.GzipFile(fileobj=fileobj, mode=internal_mode, compresslevel=compresslevel);
+   self._compressor = gzip.GzipFile(fileobj=self.file, mode=internal_mode, compresslevel=compresslevel);
+  elif 'r' in mode:
+   if file_path:
+    if os.path.exists(file_path):
+     self.file = gzip.open(file_path, internal_mode);
+     self._load_file();
+    else:
+     raise FileNotFoundError("No such file: '{}'".format(file_path));
+   elif fileobj:
+    self.file = gzip.GzipFile(fileobj=fileobj, mode=internal_mode);
+    self._load_file();
+  else:
+   raise ValueError("Mode should be 'rb' or 'wb'");
+
+ def _load_file(self):
+  self.file.seek(0);
+  self._compressed_data = self.file.read();
+  if not self._compressed_data.startswith(b'\x1f\x8b'):
+   raise ValueError("Invalid gzip file header");
+  self._decompressed_data = gzip.decompress(self._compressed_data);
+  if self._text_mode:
+   self._decompressed_data = self._decompressed_data.decode(self.encoding or 'utf-8', self.errors or 'strict');
+
+ def write(self, data):
+  if self._text_mode:
+   data = data.encode(self.encoding or 'utf-8', self.errors or 'strict');
+  compressed_data = self._compressor.compress(data);
+  self.file.write(compressed_data);
+  self.file.flush();
+
+ def read(self, size=-1):
+  if size == -1:
+   size = len(self._decompressed_data) - self._position;
+  data = self._decompressed_data[self._position:self._position + size];
+  self._position += size;
+  return data;
+
+ def seek(self, offset, whence=0):
+  if whence == 0:  # absolute file positioning
+   self._position = offset;
+  elif whence == 1:  # seek relative to the current position
+   self._position += offset;
+  elif whence == 2:  # seek relative to the file's end
+   self._position = len(self._decompressed_data) + offset;
+  else:
+   raise ValueError("Invalid value for whence");
+
+  # Ensure the position is within bounds
+  self._position = max(0, min(self._position, len(self._decompressed_data)));
+
+ def tell(self):
+  return self._position;
+
+ def flush(self):
+  self.file.flush();
+
+ def fileno(self):
+  if hasattr(self.file, 'fileno'):
+   return self.file.fileno();
+  raise OSError("The underlying file object does not support fileno()");
+
+ def isatty(self):
+  if hasattr(self.file, 'isatty'):
+   return self.file.isatty();
+  return False;
+
+ def truncate(self, size=None):
+  if hasattr(self.file, 'truncate'):
+   return self.file.truncate(size);
+  raise OSError("The underlying file object does not support truncate()");
+
+ def close(self):
+  if 'w' in self.mode or 'a' in self.mode or 'x' in self.mode:
+   self.file.write(self._compressor.flush());
+  if self.file_path:
+   self.file.close();
+
+ def __enter__(self):
+  return self;
+
+ def __exit__(self, exc_type, exc_value, traceback):
+  self.close();
+
+'''
+class BloscFile:
+ def __init__(self, file_path=None, fileobj=None, mode='rb', level=9, encoding=None, errors=None, newline=None):
+  if file_path is None and fileobj is None:
+   raise ValueError("Either file_path or fileobj must be provided");
+  if file_path is not None and fileobj is not None:
+   raise ValueError("Only one of file_path or fileobj should be provided");
+
+  self.file_path = file_path;
+  self.fileobj = fileobj;
+  self.mode = mode;
+  self.level = level;
+  self.encoding = encoding;
+  self.errors = errors;
+  self.newline = newline;
+  self._compressed_data = b'';
+  self._decompressed_data = b'';
+  self._position = 0;
+  self._text_mode = 't' in mode;
+
+  # Force binary mode for internal handling
+  internal_mode = mode.replace('t', 'b');
+
+  if 'w' in mode or 'a' in mode or 'x' in mode:
+   self.file = open(file_path, internal_mode) if file_path else fileobj;
+   self._compressor = blosc.Blosc(level);
+  elif 'r' in mode:
+   if file_path:
+    if os.path.exists(file_path):
+     self.file = open(file_path, internal_mode);
+     self._load_file();
+    else:
+     raise FileNotFoundError("No such file: '{}'".format(file_path));
+   elif fileobj:
+    self.file = fileobj;
+    self._load_file();
+  else:
+   raise ValueError("Mode should be 'rb' or 'wb'");
+
+ def _load_file(self):
+  self.file.seek(0);
+  self._compressed_data = self.file.read();
+  if not self._compressed_data:
+   raise ValueError("Invalid blosc file header");
+  self._decompressed_data = blosc.decompress(self._compressed_data);
+  if self._text_mode:
+   self._decompressed_data = self._decompressed_data.decode(self.encoding or 'utf-8', self.errors or 'strict');
+
+ def write(self, data):
+  if self._text_mode:
+   data = data.encode(self.encoding or 'utf-8', self.errors or 'strict');
+  compressed_data = blosc.compress(data, cname='blosclz', clevel=self.level);
+  self.file.write(compressed_data);
+  self.file.flush();
+
+ def read(self, size=-1):
+  if size == -1:
+   size = len(self._decompressed_data) - self._position;
+  data = self._decompressed_data[self._position:self._position + size];
+  self._position += size;
+  return data;
+
+ def seek(self, offset, whence=0):
+  if whence == 0:  # absolute file positioning
+   self._position = offset;
+  elif whence == 1:  # seek relative to the current position
+   self._position += offset;
+  elif whence == 2:  # seek relative to the file's end
+   self._position = len(self._decompressed_data) + offset;
+  else:
+   raise ValueError("Invalid value for whence");
+
+  # Ensure the position is within bounds
+  self._position = max(0, min(self._position, len(self._decompressed_data)));
+
+ def tell(self):
+  return self._position;
+
+ def flush(self):
+  self.file.flush();
+
+ def fileno(self):
+  if hasattr(self.file, 'fileno'):
+   return self.file.fileno();
+  raise OSError("The underlying file object does not support fileno()");
+
+ def isatty(self):
+  if hasattr(self.file, 'isatty'):
+   return self.file.isatty();
+  return False;
+
+ def truncate(self, size=None):
+  if hasattr(self.file, 'truncate'):
+   return self.file.truncate(size);
+  raise OSError("The underlying file object does not support truncate()");
+
+ def close(self):
+  if 'w' in self.mode or 'a' in self.mode or 'x' in self.mode:
+   self.file.write(blosc.compress(self._compressor.flush(), cname='blosclz', clevel=self.level));
+  if self.file_path:
+   self.file.close();
+
+ def __enter__(self):
+  return self;
+
+ def __exit__(self, exc_type, exc_value, traceback):
+  self.close();
+
+class BrotliFile:
+ def __init__(self, file_path=None, fileobj=None, mode='rb', level=11, encoding=None, errors=None, newline=None):
+  if file_path is None and fileobj is None:
+   raise ValueError("Either file_path or fileobj must be provided");
+  if file_path is not None and fileobj is not None:
+   raise ValueError("Only one of file_path or fileobj should be provided");
+
+  self.file_path = file_path;
+  self.fileobj = fileobj;
+  self.mode = mode;
+  self.level = level;
+  self.encoding = encoding;
+  self.errors = errors;
+  self.newline = newline;
+  self._compressed_data = b'';
+  self._decompressed_data = b'';
+  self._position = 0;
+  self._text_mode = 't' in mode;
+
+  # Force binary mode for internal handling
+  internal_mode = mode.replace('t', 'b');
+
+  if 'w' in mode or 'a' in mode or 'x' in mode:
+   self.file = open(file_path, internal_mode) if file_path else fileobj;
+   self._compressor = brotli.Compressor(quality=self.level);
+  elif 'r' in mode:
+   if file_path:
+    if os.path.exists(file_path):
+     self.file = open(file_path, internal_mode);
+     self._load_file();
+    else:
+     raise FileNotFoundError("No such file: '{}'".format(file_path));
+   elif fileobj:
+    self.file = fileobj;
+    self._load_file();
+  else:
+   raise ValueError("Mode should be 'rb' or 'wb'");
+
+ def _load_file(self):
+  self.file.seek(0);
+  self._compressed_data = self.file.read();
+  if not self._compressed_data:
+   raise ValueError("Invalid brotli file header");
+  self._decompressed_data = brotli.decompress(self._compressed_data);
+  if self._text_mode:
+   self._decompressed_data = self._decompressed_data.decode(self.encoding or 'utf-8', self.errors or 'strict');
+
+ def write(self, data):
+  if self._text_mode:
+   data = data.encode(self.encoding or 'utf-8', self.errors or 'strict');
+  compressed_data = self._compressor.process(data);
+  self.file.write(compressed_data);
+  self.file.flush();
+
+ def read(self, size=-1):
+  if size == -1:
+   size = len(self._decompressed_data) - self._position;
+  data = self._decompressed_data[self._position:self._position + size];
+  self._position += size;
+  return data;
+
+ def seek(self, offset, whence=0):
+  if whence == 0:  # absolute file positioning
+   self._position = offset;
+  elif whence == 1:  # seek relative to the current position
+   self._position += offset;
+  elif whence == 2:  # seek relative to the file's end
+   self._position = len(self._decompressed_data) + offset;
+  else:
+   raise ValueError("Invalid value for whence");
+
+  # Ensure the position is within bounds
+  self._position = max(0, min(self._position, len(self._decompressed_data)));
+
+ def tell(self):
+  return self._position;
+
+ def flush(self):
+  self.file.flush();
+
+ def fileno(self):
+  if hasattr(self.file, 'fileno'):
+   return self.file.fileno();
+  raise OSError("The underlying file object does not support fileno()");
+
+ def isatty(self):
+  if hasattr(self.file, 'isatty'):
+   return self.file.isatty();
+  return False;
+
+ def truncate(self, size=None):
+  if hasattr(self.file, 'truncate'):
+   return self.file.truncate(size);
+  raise OSError("The underlying file object does not support truncate()");
+
+ def close(self):
+  if 'w' in self.mode or 'a' in self.mode or 'x' in self.mode:
+   self.file.write(self._compressor.finish());
+  if self.file_path:
+   self.file.close();
+
+ def __enter__(self):
+  return self;
+
+ def __exit__(self, exc_type, exc_value, traceback):
+  self.close();
+'''
+
 def TarFileCheck(infile):
  try:
   if is_tarfile(infile):
@@ -1402,8 +1848,12 @@ def ReadInFileBySizeWithContentToArray(infile, seekstart=0, seekend=0, listonly=
     compresscheck = "lz4";
    elif(fextname==".lzo" or fextname==".lzop"):
     compresscheck = "lzo";
-   elif(fextname==".lzma" or fextname==".xz"):
+   elif(fextname==".lzma"):
     compresscheck = "lzma";
+   elif(fextname==".xz"):
+    compresscheck = "xz";
+   elif(fextname==".zz" or fextname==".zl" or fextname==".zlib"):
+    compresscheck = "zlib";
    else:
     return False;
   if(not compresscheck):
@@ -1460,8 +1910,12 @@ def ReadInFileBySizeWithContentToList(infile, seekstart=0, seekend=0, listonly=F
     compresscheck = "lz4";
    elif(fextname==".lzo" or fextname==".lzop"):
     compresscheck = "lzo";
-   elif(fextname==".lzma" or fextname==".xz"):
+   elif(fextname==".lzma"):
     compresscheck = "lzma";
+   elif(fextname==".xz"):
+    compresscheck = "xz";
+   elif(fextname==".zz" or fextname==".zl" or fextname==".zlib"):
+    compresscheck = "zlib";
    else:
     return False;
   if(not compresscheck):
@@ -2092,11 +2546,19 @@ def CheckCompressionType(infile, formatspecs=__file_format_dict__, closefp=True)
    catfp = open(infile, "rb");
   except FileNotFoundError:
    return False;
+ filetype = False;
  catfp.seek(0, 0);
  prefp = catfp.read(2);
- filetype = False;
  if(prefp==binascii.unhexlify("1f8b")):
   filetype = "gzip";
+ if(prefp==binascii.unhexlify("7801")):
+  filetype = "zlib";
+ if(prefp==binascii.unhexlify("785e")):
+  filetype = "zlib";
+ if(prefp==binascii.unhexlify("789c")):
+  filetype = "zlib";
+ if(prefp==binascii.unhexlify("78da")):
+  filetype = "zlib";
  catfp.seek(0, 0);
  prefp = catfp.read(3);
  if(prefp==binascii.unhexlify("425a68")):
@@ -2144,7 +2606,7 @@ def CheckCompressionType(infile, formatspecs=__file_format_dict__, closefp=True)
  if(prefp==binascii.unhexlify("7061785f676c6f62616c")):
   filetype = "tarfile";
  catfp.seek(0, 0);
- if(filetype=="gzip" or filetype=="bzip2" or filetype=="lzma" or filetype=="zstd" or filetype=="lz4"):
+ if(filetype=="gzip" or filetype=="bzip2" or filetype=="lzma" or filetype=="zstd" or filetype=="lz4" or filetype=="zlib"):
   if(TarFileCheck(catfp)):
    filetype = "tarfile";
  if(not filetype):
@@ -2174,6 +2636,8 @@ def GetCompressionMimeType(infile, formatspecs=__file_format_dict__):
  compresscheck = CheckCompressionType(fp, formatspecs, False);
  if(compresscheck=="gzip" or compresscheck=="gz"):
   return archivefile_gzip_mimetype;
+ if(compresscheck=="zlib" or (compresscheck=="zz" or compresscheck=="zl" or compresscheck=="zlib")):
+  return archivefile_zlib_mimetype;
  if(compresscheck=="bzip2" or compresscheck=="bz2"):
   return archivefile_bzip2_mimetype;
  if(compresscheck=="zstd" or compresscheck=="zstandard"):
@@ -2199,21 +2663,19 @@ def UncompressArchiveFile(fp, formatspecs=__file_format_dict__):
  compresscheck = CheckCompressionType(fp, formatspecs, False);
  if(compresscheck=="gzip" and compresscheck in compressionsupport):
   catfp = gzip.GzipFile(fileobj=fp, mode="rb");
- if(compresscheck=="bzip2" and compresscheck in compressionsupport):
-  catfp = BytesIO();
-  catfp.write(bz2.decompress(fp.read()));
- if(compresscheck=="zstd" and compresscheck in compressionsupport):
-  catfp = BytesIO();
-  catfp.write(zstandard.decompress(fp.read()));
- if(compresscheck=="lz4" and compresscheck in compressionsupport):
-  catfp = BytesIO();
-  catfp.write(lz4.frame.decompress(fp.read()));
- if((compresscheck=="lzo" or compresscheck=="lzop") and compresscheck in compressionsupport):
+ elif(compresscheck=="bzip2" and compresscheck in compressionsupport):
+  catfp = bz2.BZ2File(fp);
+ elif(compresscheck=="zstd" and compresscheck in compressionsupport):
+  catfp = zstd.ZstdDecompressor().stream_reader(fp);
+ elif(compresscheck=="lz4" and compresscheck in compressionsupport):
+  catfp = lz4.frame.open_fp(fp, mode='rb');
+ elif((compresscheck=="lzo" or compresscheck=="lzop") and compresscheck in compressionsupport):
   catfp = BytesIO();
   catfp.write(lzo.decompress(fp.read()));
- if((compresscheck=="lzma" or compresscheck=="xz") and compresscheck in compressionsupport):
-  catfp = BytesIO();
-  catfp.write(lzma.decompress(fp.read()));
+ elif((compresscheck=="lzma" or compresscheck=="xz") and compresscheck in compressionsupport):
+  catfp = lzma.LZMAFile(fp);
+ elif(compresscheck=="zlib" and compresscheck in compressionsupport):
+  catfp = ZlibFile(fileobj=fp, mode="rb");
  if(compresscheck=="catfile" or compresscheck==formatspecs['format_lower']):
   catfp = fp;
  if(not compresscheck):
@@ -2275,6 +2737,8 @@ def UncompressFile(infile, formatspecs=__file_format_dict__, mode="rb"):
     filefp = lzma.open(infile, mode, encoding="UTF-8");
    except (ValueError, TypeError) as e:
     filefp = lzma.open(infile, mode);
+  if(compresscheck=="zlib" and compresscheck in compressionsupport):
+   filefp = ZlibFile(infile, mode=mode);
   if(compresscheck=="catfile" or compresscheck==formatspecs['format_lower']):
    try:
     filefp = open(infile, mode, encoding="UTF-8");
@@ -2287,6 +2751,10 @@ def UncompressFile(infile, formatspecs=__file_format_dict__, mode="rb"):
     filefp = open(infile, mode);
  except FileNotFoundError:
   return False;
+ try:
+  filefp.write_through = True;
+ except AttributeError:
+  pass;
  return filefp;
 
 def UncompressString(infile):
@@ -2307,6 +2775,8 @@ def UncompressString(infile):
   fileuz = lzo.decompress(infile);
  if((compresscheck=="lzma" or compresscheck=="xz") and compresscheck in compressionsupport):
   fileuz = lzma.decompress(infile);
+ if(compresscheck=="zlib" and compresscheck in compressionsupport):
+  fileuz = zlib.decompress(infile);
  if(not compresscheck):
   fileuz = infile;
  if(hasattr(fileuz, 'decode')):
@@ -2335,11 +2805,15 @@ def CheckCompressionSubType(infile, formatspecs=__file_format_dict__, closefp=Tr
    compresscheck = "lz4";
   elif(fextname==".lzo" or fextname==".lzop"):
    compresscheck = "lzo";
-  elif(fextname==".lzma" or fextname==".xz"):
-   compresscheck = "lzma";
+  elif(fextname==".lzma"):
+    compresscheck = "lzma";
+  elif(fextname==".xz"):
+    compresscheck = "xz";
+  elif(fextname==".zz" or fextname==".zl" or fextname==".zlib"):
+   compresscheck = "zlib";
   else:
    return False;
- if(compresscheck=="gzip" or compresscheck=="bzip2" or compresscheck=="lzma" or compresscheck=="zstd" or compresscheck=="lz4"):
+ if(compresscheck=="gzip" or compresscheck=="bzip2" or compresscheck=="lzma" or compresscheck=="zstd" or compresscheck=="lz4" or compresscheck=="zlib"):
   if(TarFileCheck(infile)):
    filetype = "tarfile";
  if(not compresscheck):
@@ -2370,16 +2844,20 @@ def CheckCompressionSubType(infile, formatspecs=__file_format_dict__, closefp=Tr
   try:
    if(compresscheck=="gzip" and compresscheck in compressionsupport):
     catfp = gzip.GzipFile(infile, "rb");
-   if(compresscheck=="bzip2" and compresscheck in compressionsupport):
+   elif(compresscheck=="bzip2" and compresscheck in compressionsupport):
     catfp = bz2.BZ2File(infile, "rb");
-   if(compresscheck=="lz4" and compresscheck in compressionsupport):
+   elif(compresscheck=="lz4" and compresscheck in compressionsupport):
     catfp = lz4.frame.open(infile, "rb");
-   if(compresscheck=="zstd" and compresscheck in compressionsupport):
+   elif(compresscheck=="zstd" and compresscheck in compressionsupport):
     catfp = zstandard.open(infile, "rb");
-   if((compresscheck=="lzo" or compresscheck=="lzop") and compresscheck in compressionsupport):
+   elif((compresscheck=="lzo" or compresscheck=="lzop") and compresscheck in compressionsupport):
     catfp = lzo.open(infile, "rb");
-   if((compresscheck=="lzma" or compresscheck=="xz") and compresscheck in compressionsupport):
+   elif((compresscheck=="lzma" or compresscheck=="xz") and compresscheck in compressionsupport):
     catfp = lzma.open(infile, "rb");
+   elif(compresscheck=="zlib" and compresscheck in compressionsupport):
+    catfp = ZlibFile(infile, mode="rb");
+   else:
+    catfp = open(infile, "rb");
   except FileNotFoundError:
    return False;
  filetype = False;
@@ -2477,6 +2955,13 @@ def CompressArchiveFile(fp, compression="auto", compressionlevel=None, formatspe
   else:
    compressionlevel = int(compressionlevel);
   catfp.write(lzma.compress(fp.read(), format=lzma.FORMAT_XZ, filters=[{"id": lzma.FILTER_LZMA2, "preset": compressionlevel}]));
+ if(compression=="zlib" and compression in compressionsupport):
+  catfp = BytesIO();
+  if(compressionlevel is None):
+   compressionlevel = 9;
+  else:
+   compressionlevel = int(compressionlevel);
+  catfp.write(lzma.compress(fp.read(), level=compressionlevel));
  if(compression=="auto" or compression is None):
   catfp = fp;
  catfp.seek(0, 0);
@@ -2540,8 +3025,14 @@ def CompressOpenFile(outfile, compressionenable=True, compressionlevel=None):
     outfp = lzma.open(outfile, mode, format=lzma.FORMAT_ALONE, filters=[{"id": lzma.FILTER_LZMA1, "preset": compressionlevel}], encoding="UTF-8");
    except (ValueError, TypeError) as e:
     outfp = lzma.open(outfile, mode, format=lzma.FORMAT_ALONE, filters=[{"id": lzma.FILTER_LZMA1, "preset": compressionlevel}]);
+  elif((fextname==".zz" or fextname==".zl" or fextname==".zlib") and "zlib" in compressionsupport):
+   outfp = ZlibFile(outfile, mode=mode, level=compressionlevel);
  except FileNotFoundError:
   return False;
+ try:
+  outfp.write_through = True;
+ except AttributeError:
+  pass;
  return outfp;
 
 def GetDevMajorMinor(fdev):
@@ -2985,8 +3476,6 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compresswhol
   except AttributeError:
    if(not TarFileCheck(infile)):
     return False;
- else:
-  return False;
  try:
   if(hasattr(infile, "read") or hasattr(infile, "write")):
    tarfp = tarfile.open(fileobj=infile, mode="r");
@@ -3209,8 +3698,6 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compresswhol
   infile.seek(0, 0);
  elif(not os.path.exists(infile) or not os.path.isfile(infile)):
   return False;
- else:
-  return False;
  if(not zipfile.is_zipfile(infile)):
   return False;
  try:
@@ -3262,17 +3749,17 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compresswhol
    fwinattributes = format(int(zipinfo.external_attr), 'x').lower();
    if(not member.is_dir()):
     fmode = format(int(stat.S_IFREG + 438), 'x').lower();
-    fchmode = stat.S_IMODE(fmode);
-    ftypemod = stat.S_IFMT(fmode);
+    fchmode = stat.S_IMODE(int(stat.S_IFREG + 438));
+    ftypemod = stat.S_IFMT(int(stat.S_IFREG + 438));
    elif(member.is_dir()):
     fmode = format(int(stat.S_IFDIR + 511), 'x').lower();
-    fchmode = stat.S_IMODE(fmode);
-    ftypemod = stat.S_IFMT(fmode);
+    fchmode = stat.S_IMODE(int(stat.S_IFDIR + 511));
+    ftypemod = stat.S_IFMT(int(stat.S_IFDIR + 511));
   elif(zipinfo.create_system==3):
    fwinattributes = format(int(0), 'x').lower();
    fmode = format(int(zipinfo.external_attr), 'x').lower();
-   fchmode = stat.S_IMODE(fmode);
-   ftypemod = stat.S_IFMT(fmode);
+   fchmode = stat.S_IMODE(int(zipinfo.external_attr));
+   ftypemod = stat.S_IFMT(int(zipinfo.external_attr));
   else:
    fwinattributes = format(int(0), 'x').lower();
    if(not member.is_dir()):
@@ -3973,8 +4460,12 @@ def ArchiveFileSeekToFileNum(infile, seekto=0, listonly=False, skipchecksum=Fals
     compresscheck = "lz4";
    elif(fextname==".lzo" or fextname==".lzop"):
     compresscheck = "lzo";
-   elif(fextname==".lzma" or fextname==".xz"):
+   elif(fextname==".lzma"):
     compresscheck = "lzma";
+   elif(fextname==".xz"):
+    compresscheck = "xz";
+   elif(fextname==".zz" or fextname==".zl" or fextname==".zlib"):
+    compresscheck = "zlib";
    else:
     return False;
   if(not compresscheck):
@@ -4202,8 +4693,12 @@ def ArchiveFileSeekToFileName(infile, seekfile=None, listonly=False, skipchecksu
     compresscheck = "lz4";
    elif(fextname==".lzo" or fextname==".lzop"):
     compresscheck = "lzo";
-   elif(fextname==".lzma" or fextname==".xz"):
+   elif(fextname==".lzma"):
     compresscheck = "lzma";
+   elif(fextname==".xz"):
+    compresscheck = "xz";
+   elif(fextname==".zz" or fextname==".zl" or fextname==".zlib"):
+    compresscheck = "zlib";
    else:
     return False;
   if(not compresscheck):
@@ -4443,8 +4938,12 @@ def ArchiveFileValidate(infile, formatspecs=__file_format_dict__, verbose=False,
     compresscheck = "lz4";
    elif(fextname==".lzo" or fextname==".lzop"):
     compresscheck = "lzo";
-   elif(fextname==".lzma" or fextname==".xz"):
+   elif(fextname==".lzma"):
     compresscheck = "lzma";
+   elif(fextname==".xz"):
+    compresscheck = "xz";
+   elif(fextname==".zz" or fextname==".zl" or fextname==".zlib"):
+    compresscheck = "zlib";
    else:
     return False;
   if(not compresscheck):
@@ -4683,8 +5182,12 @@ def ArchiveFileToArray(infile, seekstart=0, seekend=0, listonly=False, uncompres
     compresscheck = "lz4";
    elif(fextname==".lzo" or fextname==".lzop"):
     compresscheck = "lzo";
-   elif(fextname==".lzma" or fextname==".xz"):
+   elif(fextname==".lzma"):
     compresscheck = "lzma";
+   elif(fextname==".xz"):
+    compresscheck = "xz";
+   elif(fextname==".zz" or fextname==".zl" or fextname==".zlib"):
+    compresscheck = "zlib";
    else:
     return False;
   if(not compresscheck):
@@ -5257,8 +5760,6 @@ def TarFileToArrayAlt(infile, listonly=False, checksumtype="crc32", extradata=[]
   except AttributeError:
    if(not TarFileCheck(infile)):
     return False;
- else:
-  return False;
  try:
   if(hasattr(infile, "read") or hasattr(infile, "write")):
    tarfp = tarfile.open(fileobj=infile, mode="r");
@@ -5438,8 +5939,6 @@ def ZipFileToArrayAlt(infile, listonly=False, checksumtype="crc32", extradata=[]
   infile.seek(0, 0);
  elif(not os.path.exists(infile) or not os.path.isfile(infile)):
   return False;
- else:
-  return False;
  if(not zipfile.is_zipfile(infile)):
   return False;
  try:
@@ -6641,8 +7140,6 @@ def TarFileListFiles(infile, verbose=False, returnfp=False):
   except AttributeError:
    if(not TarFileCheck(infile)):
     return False;
- else:
-  return False;
  try:
   if(hasattr(infile, "read") or hasattr(infile, "write")):
    tarfp = tarfile.open(fileobj=infile, mode="r");
@@ -6727,14 +7224,12 @@ def ZipFileListFiles(infile, verbose=False, returnfp=False):
   infile.seek(0, 0);
  elif(not os.path.exists(infile) or not os.path.isfile(infile)):
   return False;
- else:
-  return False;
  if(not zipfile.is_zipfile(infile)):
   return False;
  try:
   zipfp = zipfile.ZipFile(infile, "r", allowZip64=True);
  except FileNotFoundError:
-  return False;
+  print(6);return False;
  lcfi = 0;
  returnval = {};
  ziptest = zipfp.testzip();
@@ -6831,9 +7326,7 @@ def ZipFileListFiles(infile, verbose=False, returnfp=False):
 
 if(not rarfile_support):
  def RarFileListFiles(infile, verbose=False, returnfp=False):
-  logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG);
-  if(not os.path.exists(infile) or not os.path.isfile(infile)):
-   return False;
+  return False;
 
 if(rarfile_support):
  def RarFileListFiles(infile, verbose=False, returnfp=False):
@@ -6966,9 +7459,7 @@ if(rarfile_support):
 
 if(not py7zr_support):
  def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
-  logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG);
-  if(not os.path.exists(infile) or not os.path.isfile(infile)):
-   return False;
+  return False;
 
 if(py7zr_support):
  def SevenZipFileListFiles(infile, verbose=False, returnfp=False):

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