PyCatFile 0.13.4__tar.gz → 0.13.8__tar.gz

{pycatfile-0.13.4 → pycatfile-0.13.8}/PKG-INFO

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

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

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

{pycatfile-0.13.4 → pycatfile-0.13.8}/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/18/2024 Ver. 0.13.4 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 6/19/2024 Ver. 0.13.8 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals;
@@ -148,6 +148,7 @@ try:
  import httpx;
  havehttpx = True;
  logging.getLogger("httpx").setLevel(logging.WARNING);
+ logging.getLogger("httpcore").setLevel(logging.WARNING);
 except ImportError:
  pass;
 
@@ -175,9 +176,9 @@ __use_alt_format__ = False;
 if(not havepysftp):
  __use_pysftp__ = False;
 __use_http_lib__ = "httpx";
-if(__use_http_lib__=="httpx" haverequests and not havehttpx):
+if(__use_http_lib__=="httpx" and haverequests and not havehttpx):
  __use_http_lib__ = "requests";
-if(__use_http_lib__=="requests" havehttpx and not haverequests):
+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";
@@ -213,11 +214,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, 4, "RC 1", 1);
-__version_date_info__ = (2024, 6, 18, "RC 1", 1);
+__version_info__ = (0, 13, 8, "RC 1", 1);
+__version_date_info__ = (2024, 6, 19, "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: 0c3bc3acf2863566af9a19f45254762656cc7ce7 $";
+__revision_id__ = "$Id: 851e6a66748b503035c639482ba1cc17441d1e99 $";
 if(__version_info__[4] is not None):
  __version_date_plusrc__ = __version_date__ + "-" + str(__version_date_info__[4]);
 if(__version_info__[4] is None):
@@ -2726,8 +2727,10 @@ def CheckCompressionType(infile, formatspecs=__file_format_dict__, closefp=True)
    filetype = "tarfile";
   elif(zipfile.is_zipfile(catfp)):
    filetype = "zipfile";
-  elif(rarfile.is_rarfile(catfp) or rarfile.is_rarfile_sfx(catfp)):
+  elif(rarfile_support and (rarfile.is_rarfile(catfp) or rarfile.is_rarfile_sfx(catfp))):
    filetype = "rarile";
+  elif(py7zr_support and py7zr.is_7zfile(catfp)):
+   return "7zipfile";
   else:
    filetype = False;
  catfp.seek(0, 0);
@@ -2933,8 +2936,10 @@ def CheckCompressionSubType(infile, formatspecs=__file_format_dict__, closefp=Tr
    return "tarfile";
   elif(zipfile.is_zipfile(infile)):
    return "zipfile";
-  elif(rarfile.is_rarfile(infile) or rarfile.is_rarfile_sfx(infile)):
+  elif(rarfile_support and (rarfile.is_rarfile(infile) or rarfile.is_rarfile_sfx(infile))):
    return "rarile";
+  elif(py7zr_support and py7zr.is_7zfile(infile)):
+   return "7zipfile";
   else:
    return False;
   return False;
@@ -7863,6 +7868,26 @@ def upload_file_to_ftp_string(ftpstring, url):
  ftpfileo.close();
  return ftpfile;
 
+class RawIteratorWrapper:
+ def __init__(self, iterator):
+  self.iterator = iterator;
+  self.buffer = b"";
+  self._iterator_exhausted = False;
+ def read(self, size=-1):
+  if self._iterator_exhausted:
+   return b'';
+  while size < 0 or len(self.buffer) < size:
+   try:
+    chunk = next(self.iterator);
+    self.buffer += chunk;
+   except StopIteration:
+    self._iterator_exhausted = True;
+    break;
+  if size < 0:
+   size = len(self.buffer);
+  result, self.buffer = self.buffer[:size], self.buffer[size:];
+  return result;
+
 def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__):
  if headers is None:
   headers = {};
@@ -7880,7 +7905,7 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__):
  elif urlparts.scheme == "ftp" or urlparts.scheme == "ftps":
   return download_file_from_ftp_file(url);
  if urlparts.port:
-  netloc += ':' + str(urlparts.port)
+  netloc += ':' + str(urlparts.port);
  rebuilt_url = urlunparse((urlparts.scheme, netloc, urlparts.path, urlparts.params, urlparts.query, urlparts.fragment));
  # Create a temporary file object
  httpfile = BytesIO();
@@ -7890,17 +7915,17 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__):
    response = requests.get(rebuilt_url, headers=headers, auth=(username, password), stream=True);
   else:
    response = requests.get(rebuilt_url, headers=headers, stream=True);
-  response.raw.decode_content = True;
+  response.raw.decode_content = True
   shutil.copyfileobj(response.raw, httpfile);
  elif usehttp == 'httpx' and havehttpx:
   # Use httpx if selected and available
-  with httpx.Client() as client:
+  with httpx.Client(follow_redirects=True) as client:
    if username and password:
-    response = client.get(rebuilt_url, headers=headers, auth=(username, password), stream=True);
+    response = client.get(rebuilt_url, headers=headers, auth=(username, password));
    else:
-    response = client.get(rebuilt_url, headers=headers, stream=True);
-   for chunk in response.iter_bytes():
-    httpfile.write(chunk);
+    response = client.get(rebuilt_url, headers=headers);
+   raw_wrapper = RawIteratorWrapper(response.iter_bytes());
+   shutil.copyfileobj(raw_wrapper, httpfile);
  else:
   # Use urllib as a fallback
   # Build a Request object for urllib
@@ -7917,15 +7942,15 @@ def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__):
    opener = build_opener(auth_handler);
   else:
    opener = build_opener();
-  with opener.open(request) as response:
-   shutil.copyfileobj(response, httpfile);
+  response = opener.open(request);
+  shutil.copyfileobj(response, httpfile);
  # Reset file pointer to the start
  httpfile.seek(0, 0);
  # Return the temporary file object
  return httpfile;
 
-def download_file_from_http_string(url, headers=geturls_headers_pycatfile_python_alt):
- httpfile = download_file_from_http_file(url, headers);
+def download_file_from_http_string(url, headers=geturls_headers_pycatfile_python_alt, usehttp=__use_http_lib__):
+ httpfile = download_file_from_http_file(url, headers, usehttp);
  return ftpfile.read();
 
 if(haveparamiko):
@@ -8156,10 +8181,10 @@ else:
  def upload_file_to_pysftp_string(url):
   return False;
 
-def download_file_from_internet_file(url, headers=geturls_headers_pycatfile_python_alt):
+def download_file_from_internet_file(url, headers=geturls_headers_pycatfile_python_alt, usehttp=__use_http_lib__):
  urlparts = urlparse(url);
  if(urlparts.scheme=="http" or urlparts.scheme=="https"):
-  return download_file_from_http_file(url, headers);
+  return download_file_from_http_file(url, headers, usehttp);
  elif(urlparts.scheme=="ftp" or urlparts.scheme=="ftps"):
   return download_file_from_ftp_file(url);
  elif(urlparts.scheme=="sftp"):

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