PyCatFile 0.13.0__tar.gz → 0.13.2__tar.gz

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.13.0
+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.13.0 → 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/12/2024 Ver. 0.13.0 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.13.0 → 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/12/2024 Ver. 0.13.0 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.13.0 → 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/12/2024 Ver. 0.13.0 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;
@@ -192,11 +192,11 @@ __file_format_list__ = [__file_format_name__, __file_format_magic__, __file_form
 __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, 0, "RC 1", 1);
-__version_date_info__ = (2024, 6, 12, "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: 753db505c4ab0700b5092576392dc9d1b344f112 $";
+__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):
@@ -321,6 +321,8 @@ if('zlib' in compressionsupport):
  outextlistwd.append('.zz');
  outextlist.append('zl');
  outextlistwd.append('.zl');
+ outextlist.append('zlib');
+ outextlistwd.append('.zlib');
 
 tarfile_mimetype = "application/tar";
 tarfile_tar_mimetype = tarfile_mimetype;
@@ -344,7 +346,7 @@ archivefile_xz_mimetype = "application/x-"+__file_format_dict__['format_lower']+
 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"];
+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;
@@ -525,7 +527,7 @@ def FormatSpecsListToDict(formatspecs=__file_format_list__):
  return __file_format_dict__;
 
 class ZlibFile:
- def __init__(self, file_path=None, fileobj=None, mode='rb', level=9, encoding=None, errors=None, newline=None):
+ 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:
@@ -535,6 +537,7 @@ class ZlibFile:
   self.fileobj = fileobj;
   self.mode = mode;
   self.level = level;
+  self.wbits = wbits;
   self.encoding = encoding;
   self.errors = errors;
   self.newline = newline;
@@ -548,7 +551,7 @@ class ZlibFile:
 
   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);
+   self._compressor = zlib.compressobj(level, zlib.DEFLATED, wbits);
   elif 'r' in mode:
    if file_path:
     if os.path.exists(file_path):
@@ -567,7 +570,7 @@ class ZlibFile:
   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._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');
 
@@ -601,8 +604,7 @@ class ZlibFile:
   return self._position;
 
  def flush(self):
-  if hasattr(self.file, 'flush'):
-   self.file.flush();
+  self.file.flush();
 
  def fileno(self):
   if hasattr(self.file, 'fileno'):
@@ -738,6 +740,222 @@ class GzipFile:
  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):
@@ -1634,7 +1852,7 @@ def ReadInFileBySizeWithContentToArray(infile, seekstart=0, seekend=0, listonly=
     compresscheck = "lzma";
    elif(fextname==".xz"):
     compresscheck = "xz";
-   elif(fextname==".zz" or fextname==".zl"):
+   elif(fextname==".zz" or fextname==".zl" or fextname==".zlib"):
     compresscheck = "zlib";
    else:
     return False;
@@ -1696,7 +1914,7 @@ def ReadInFileBySizeWithContentToList(infile, seekstart=0, seekend=0, listonly=F
     compresscheck = "lzma";
    elif(fextname==".xz"):
     compresscheck = "xz";
-   elif(fextname==".zz" or fextname==".zl"):
+   elif(fextname==".zz" or fextname==".zl" or fextname==".zlib"):
     compresscheck = "zlib";
    else:
     return False;
@@ -2418,7 +2636,7 @@ 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")):
+ 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;
@@ -2446,22 +2664,18 @@ def UncompressArchiveFile(fp, formatspecs=__file_format_dict__):
  if(compresscheck=="gzip" and compresscheck in compressionsupport):
   catfp = gzip.GzipFile(fileobj=fp, mode="rb");
  elif(compresscheck=="bzip2" and compresscheck in compressionsupport):
-  catfp = BytesIO();
-  catfp.write(bz2.decompress(fp.read()));
+  catfp = bz2.BZ2File(fp);
  elif(compresscheck=="zstd" and compresscheck in compressionsupport):
-  catfp = BytesIO();
-  catfp.write(zstandard.decompress(fp.read()));
+  catfp = zstd.ZstdDecompressor().stream_reader(fp);
  elif(compresscheck=="lz4" and compresscheck in compressionsupport):
-  catfp = BytesIO();
-  catfp.write(lz4.frame.decompress(fp.read()));
+  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()));
  elif((compresscheck=="lzma" or compresscheck=="xz") and compresscheck in compressionsupport):
-  catfp = BytesIO();
-  catfp.write(lzma.decompress(fp.read()));
+  catfp = lzma.LZMAFile(fp);
  elif(compresscheck=="zlib" and compresscheck in compressionsupport):
   catfp = ZlibFile(fileobj=fp, mode="rb");
-  catfp.write(lzo.decompress(fp.read()));
  if(compresscheck=="catfile" or compresscheck==formatspecs['format_lower']):
   catfp = fp;
  if(not compresscheck):
@@ -2537,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):
@@ -2591,7 +2809,7 @@ def CheckCompressionSubType(infile, formatspecs=__file_format_dict__, closefp=Tr
     compresscheck = "lzma";
   elif(fextname==".xz"):
     compresscheck = "xz";
-  elif(fextname==".zz" or fextname==".zl"):
+  elif(fextname==".zz" or fextname==".zl" or fextname==".zlib"):
    compresscheck = "zlib";
   else:
    return False;
@@ -2807,10 +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") and "zlib" in compressionsupport):
+  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):
@@ -4242,7 +4464,7 @@ def ArchiveFileSeekToFileNum(infile, seekto=0, listonly=False, skipchecksum=Fals
     compresscheck = "lzma";
    elif(fextname==".xz"):
     compresscheck = "xz";
-   elif(fextname==".zz" or fextname==".zl"):
+   elif(fextname==".zz" or fextname==".zl" or fextname==".zlib"):
     compresscheck = "zlib";
    else:
     return False;
@@ -4475,7 +4697,7 @@ def ArchiveFileSeekToFileName(infile, seekfile=None, listonly=False, skipchecksu
     compresscheck = "lzma";
    elif(fextname==".xz"):
     compresscheck = "xz";
-   elif(fextname==".zz" or fextname==".zl"):
+   elif(fextname==".zz" or fextname==".zl" or fextname==".zlib"):
     compresscheck = "zlib";
    else:
     return False;
@@ -4720,7 +4942,7 @@ def ArchiveFileValidate(infile, formatspecs=__file_format_dict__, verbose=False,
     compresscheck = "lzma";
    elif(fextname==".xz"):
     compresscheck = "xz";
-   elif(fextname==".zz" or fextname==".zl"):
+   elif(fextname==".zz" or fextname==".zl" or fextname==".zlib"):
     compresscheck = "zlib";
    else:
     return False;
@@ -4964,7 +5186,7 @@ def ArchiveFileToArray(infile, seekstart=0, seekend=0, listonly=False, uncompres
     compresscheck = "lzma";
    elif(fextname==".xz"):
     compresscheck = "xz";
-   elif(fextname==".zz" or fextname==".zl"):
+   elif(fextname==".zz" or fextname==".zl" or fextname==".zlib"):
     compresscheck = "zlib";
    else:
     return False;

{pycatfile-0.13.0 → 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/12/2024 Ver. 0.13.0 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;