PyCatFile 0.13.2__tar.gz → 0.13.4__tar.gz

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.13.2
+Version: 0.13.4
 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.2 → pycatfile-0.13.4}/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/14/2024 Ver. 0.13.2 RC 1 - Author: cooldude2k $
+    $FileInfo: catfile.py - Last Update: 6/18/2024 Ver. 0.13.4 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals;
@@ -161,9 +161,9 @@ if active_action:
    checkcompressfile = pycatfile.CheckCompressionSubType(getargs.input, fnamedict, True);
    tempout = BytesIO();
    if(checkcompressfile=="catfile"):
-    tmpout = pycatfile.RePackArchiveFile(getargs.input, tempout, getargs.compression, getargs.wholefile, getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamedict, getargs.verbose, False);
+    tmpout = pycatfile.RePackArchiveFile(getargs.input, tempout, getargs.compression, getargs.wholefile, getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamedict, False, False);
    else:
-    tmpout = pycatfile.PackArchiveFileFromInFile(getargs.input, tempout, getargs.compression, getargs.wholefile, getargs.level, getargs.checksum, [], fnamedict, getargs.verbose, False);
+    tmpout = pycatfile.PackArchiveFileFromInFile(getargs.input, tempout, getargs.compression, getargs.wholefile, getargs.level, getargs.checksum, [], fnamedict, False, False);
    if(not tmpout):
     sys.exit(1);
    getargs.input = tempout;
@@ -184,9 +184,9 @@ if active_action:
    checkcompressfile = pycatfile.CheckCompressionSubType(getargs.input, fnamedict, True);
    tempout = BytesIO();
    if(checkcompressfile=="catfile"):
-    tmpout = pycatfile.RePackArchiveFile(getargs.input, tempout, getargs.compression, getargs.wholefile, getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamedict, getargs.verbose, False);
+    tmpout = pycatfile.RePackArchiveFile(getargs.input, tempout, getargs.compression, getargs.wholefile, getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamedict, False, False);
    else:
-    tmpout = pycatfile.PackArchiveFileFromInFile(getargs.input, tempout, getargs.compression, getargs.wholefile, getargs.level, getargs.checksum, [], fnamedict, getargs.verbose, False);
+    tmpout = pycatfile.PackArchiveFileFromInFile(getargs.input, tempout, getargs.compression, getargs.wholefile, getargs.level, getargs.checksum, [], fnamedict, False, False);
    getargs.input = tempout;
    if(not tmpout):
     sys.exit(1);

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

{pycatfile-0.13.2 → pycatfile-0.13.4}/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/14/2024 Ver. 0.13.2 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 6/18/2024 Ver. 0.13.4 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals;
@@ -36,6 +36,11 @@ try:
 except ImportError:
  import json;
 
+try:
+ basestring;
+except NameError:
+ basestring = str;
+
 # URL Parsing
 try:
  from urllib.parse import urlparse, urlunparse;
@@ -137,6 +142,15 @@ try:
 except ImportError:
  pass;
 
+# HTTPX support
+havehttpx = False;
+try:
+ import httpx;
+ havehttpx = True;
+ logging.getLogger("httpx").setLevel(logging.WARNING);
+except ImportError:
+ pass;
+
 # HTTP and URL parsing
 try:
  from urllib.request import Request, build_opener, HTTPBasicAuthHandler;
@@ -160,6 +174,13 @@ __use_pysftp__ = False;
 __use_alt_format__ = False;
 if(not havepysftp):
  __use_pysftp__ = False;
+__use_http_lib__ = "httpx";
+if(__use_http_lib__=="httpx" haverequests and not havehttpx):
+ __use_http_lib__ = "requests";
+if(__use_http_lib__=="requests" 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";
@@ -192,11 +213,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, 2, "RC 1", 1);
-__version_date_info__ = (2024, 6, 14, "RC 1", 1);
+__version_info__ = (0, 13, 4, "RC 1", 1);
+__version_date_info__ = (2024, 6, 18, "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: 4fa12ed6c9a98672ea7ca68f9bff7b0f13f625d1 $";
+__revision_id__ = "$Id: 0c3bc3acf2863566af9a19f45254762656cc7ce7 $";
 if(__version_info__[4] is not None):
  __version_date_plusrc__ = __version_date__ + "-" + str(__version_date_info__[4]);
 if(__version_info__[4] is None):
@@ -982,6 +1003,97 @@ def TarFileCheck(infile):
   except tarfile.TarError:
    return False;
 
+def TarFileCheckAlt(infile):
+ try:
+  if is_tarfile(infile):
+   return True;
+ except TypeError:
+  pass;
+ try:
+  # Check if the input is a file-like object
+  if hasattr(infile, 'read'):
+   # Save the current file position
+   current_position = infile.tell();
+   # Attempt to open the file object as a tar file
+   with tarfile.open(fileobj=infile) as tar:
+    pass;
+   # Restore the file position
+   infile.seek(current_position);
+  else:
+   # Assume it's a filename and attempt to open it as a tar file
+   with tarfile.open(name=infile) as tar:
+    pass;
+  return True;
+ except (tarfile.TarError, AttributeError, IOError):
+  return False;
+
+def ZipFileCheck(infile):
+ try:
+  if zipfile.is_zipfile(infile):
+   return True;
+ except TypeError:
+  pass;
+ try:
+  # Check if the input is a file-like object
+  if hasattr(infile, 'read'):
+   # Save the current file position
+   current_position = infile.tell();
+   # Attempt to open the file object as a zip file
+   with zipfile.ZipFile(infile) as zipf:
+    pass;
+   # Restore the file position
+   infile.seek(current_position);
+  else:
+   # Assume it's a filename and attempt to open it as a zip file
+   with zipfile.ZipFile(infile) as zipf:
+    pass;
+  return True;
+ except (zipfile.BadZipFile, AttributeError, IOError):
+  return False;
+
+def RarFileCheck(infile):
+ try:
+  if rarfile.is_rarfile(infile):
+   return True;
+ except TypeError:
+  pass;
+ try:
+  # Check if the input is a file-like object
+  if hasattr(infile, 'read'):
+   # Save the current file position
+   current_position = infile.tell();
+   # Attempt to open the file object as a rar file
+   with rarfile.RarFile(infile) as rarf:
+    pass;
+   # Restore the file position
+   infile.seek(current_position);
+  else:
+   # Assume it's a filename and attempt to open it as a rar file
+   with rarfile.RarFile(infile) as rarf:
+    pass;
+  return True;
+ except (rarfile.Error, AttributeError, IOError):
+  return False;
+
+def SevenZipFileCheck(infile):
+ try:
+  # Check if the input is a file-like object
+  if hasattr(infile, 'read'):
+   # Save the current file position
+   current_position = infile.tell();
+   # Attempt to open the file object as a 7z file
+   with py7zr.SevenZipFile(infile, 'r') as archive:
+    pass;
+   # Restore the file position
+   infile.seek(current_position);
+  else:
+   # Assume it's a filename and attempt to open it as a 7z file
+   with py7zr.SevenZipFile(infile, 'r') as archive:
+    pass;
+  return True;
+ except (py7zr.Bad7zFile, AttributeError, IOError):
+  return False;
+
 # initial_value can be 0xFFFF or 0x0000
 def crc16_ansi(msg, initial_value=0xFFFF):
  # CRC-16-IBM / CRC-16-ANSI polynomial and initial value
@@ -2961,7 +3073,7 @@ def CompressArchiveFile(fp, compression="auto", compressionlevel=None, formatspe
    compressionlevel = 9;
   else:
    compressionlevel = int(compressionlevel);
-  catfp.write(lzma.compress(fp.read(), level=compressionlevel));
+  catfp.write(zlib.compress(fp.read(), level=compressionlevel));
  if(compression=="auto" or compression is None):
   catfp = fp;
  catfp.seek(0, 0);
@@ -4986,7 +5098,13 @@ def ArchiveFileValidate(infile, formatspecs=__file_format_dict__, verbose=False,
  valid_archive = True;
  invalid_archive = False;
  if(verbose):
-  VerbosePrintOut(infile);
+  if(hasattr(infile, "read") or hasattr(infile, "write")):
+   try:
+    VerbosePrintOut(infile.name);
+   except AttributeError:
+    VerbosePrintOut(infile);
+  else:
+   VerbosePrintOut(infile);
   VerbosePrintOut("Number of Records " + str(fnumfiles));
  if(fprechecksum==catfileheadercshex):
   if(verbose):
@@ -7745,34 +7863,46 @@ def upload_file_to_ftp_string(ftpstring, url):
  ftpfileo.close();
  return ftpfile;
 
-def download_file_from_http_file(url, headers=geturls_headers_pycatfile_python_alt):
+def download_file_from_http_file(url, headers=None, usehttp=__use_http_lib__):
+ if headers is None:
+  headers = {};
  # Parse the URL to extract username and password if present
  urlparts = urlparse(url);
  username = urlparts.username;
  password = urlparts.password;
  # Rebuild the URL without the username and password
  netloc = urlparts.hostname;
- if(urlparts.scheme=="sftp"):
-  if(__use_pysftp__):
+ if urlparts.scheme == "sftp":
+  if __use_pysftp__:
    return download_file_from_pysftp_file(url);
   else:
    return download_file_from_sftp_file(url);
- elif(urlparts.scheme=="ftp" or urlparts.scheme=="ftps"):
+ 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();
- if haverequests:
-  # Use the requests library if available
+ if usehttp == 'requests' and haverequests:
+  # Use the requests library if selected and available
   if username and password:
    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:
+   if username and password:
+    response = client.get(rebuilt_url, headers=headers, auth=(username, password), stream=True);
+   else:
+    response = client.get(rebuilt_url, headers=headers, stream=True);
+   for chunk in response.iter_bytes():
+    httpfile.write(chunk);
  else:
+  # Use urllib as a fallback
   # Build a Request object for urllib
   request = Request(rebuilt_url, headers=headers);
   # Create an opener object for handling URLs
@@ -7786,7 +7916,7 @@ def download_file_from_http_file(url, headers=geturls_headers_pycatfile_python_a
    # Build the opener with the authentication handler
    opener = build_opener(auth_handler);
   else:
-      opener = build_opener();
+   opener = build_opener();
   with opener.open(request) as response:
    shutil.copyfileobj(response, httpfile);
  # Reset file pointer to the start

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