PyCatFile 0.9.6__tar.gz → 0.10.0__tar.gz

{pycatfile-0.9.6 → pycatfile-0.10.0}/PKG-INFO

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

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

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

{pycatfile-0.9.6 → pycatfile-0.10.0}/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: 5/1/2024 Ver. 0.9.6 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 5/3/2024 Ver. 0.10.0 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals;
@@ -75,18 +75,18 @@ except ImportError:
  py7zr_support = False;
 
 try:
- from safetar import is_tarfile;
+ from xtarfile import is_tarfile;
 except ImportError:
  try:
-  from xtarfile import is_tarfile;
+  from safetar import is_tarfile;
  except ImportError:
   from tarfile import is_tarfile;
 
 try:
- import safetar as tarfile;
+ import xtarfile as tarfile;
 except ImportError:
  try:
-  import xtarfile as tarfile;
+  import safetar as tarfile;
  except ImportError:
   import tarfile;
 
@@ -174,11 +174,11 @@ __use_alt_inode__ = False;
 __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__];
 __project__ = __program_name__;
 __project_url__ = "https://github.com/GameMaker2k/PyCatFile";
-__version_info__ = (0, 9, 6, "RC 1", 1);
-__version_date_info__ = (2024, 5, 1, "RC 1", 1);
+__version_info__ = (0, 10, 0, "RC 1", 1);
+__version_date_info__ = (2024, 5, 3, "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: 4567eb777c3f1cb3b1adf49788eb5c726205e3a4 $";
+__revision_id__ = "$Id: 315654f0f21d3dcfe5c3339c8c23806a723ff64f $";
 if(__version_info__[4] is not None):
  __version_date_plusrc__ = __version_date__ + "-" + str(__version_date_info__[4]);
 if(__version_info__[4] is None):
@@ -1205,6 +1205,8 @@ def AppendFileHeader(fp, numfiles, checksumtype="crc32", formatspecs=__file_form
   pass;
  except AttributeError:
   pass;
+ except OSError as e:
+  pass;
  return fp;
 
 def MakeEmptyFilePointer(fp, checksumtype="crc32", formatspecs=__file_format_list__):
@@ -1214,7 +1216,10 @@ def MakeEmptyFilePointer(fp, checksumtype="crc32", formatspecs=__file_format_lis
 def MakeEmptyFile(outfile, compression="auto", compressionlevel=None, checksumtype="crc32", formatspecs=__file_format_list__, returnfp=False):
  if(outfile!="-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
   if(os.path.exists(outfile)):
-   os.unlink(outfile);
+   try:
+    os.unlink(outfile);
+   except OSError as e:
+    pass;
  if(outfile=="-"):
   verbose = False;
   catfpfp = BytesIO();
@@ -1228,7 +1233,7 @@ def MakeEmptyFile(outfile, compression="auto", compressionlevel=None, checksumty
   catfp = CompressOpenFile(outfile, compressionlevel);
  catfp = AppendFileHeader(catfp, 0, checksumtype, formatspecs);
  if(outfile=="-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
-  catfp = CompressArchiveFile(catfp, compression, formatspecs);
+  catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
   try:
    catfp.flush();
    os.fsync(catfp.fileno());
@@ -1236,6 +1241,8 @@ def MakeEmptyFile(outfile, compression="auto", compressionlevel=None, checksumty
    pass;
   except AttributeError:
    pass;
+  except OSError as e:
+   pass;
  if(outfile=="-"):
   catfp.seek(0, 0);
   if(hasattr(sys.stdout, "buffer")):
@@ -1243,7 +1250,7 @@ def MakeEmptyFile(outfile, compression="auto", compressionlevel=None, checksumty
   else:
    shutil.copyfileobj(catfp, sys.stdout);
  elif(re.findall(r"^(ftp|ftps|sftp)\:\/\/", str(outfile))):
-  catfp = CompressArchiveFile(catfp, compression, formatspecs);
+  catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
   catfp.seek(0, 0);
   upload_file_to_internet_file(catfp, outfile);
  if(returnfp):
@@ -1287,6 +1294,8 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], filecontent="",
   pass;
  except AttributeError:
   pass;
+ except OSError as e:
+  pass;
  return fp;
 
 def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, filevalues=[], extradata=[], followlink=False, checksumtype="crc32", formatspecs=__file_format_list__, verbose=False):
@@ -1326,7 +1335,6 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, filevalues=[], ext
  fnumfiles = format(numfiles, 'x').lower();
  AppendFileHeader(fp, fnumfiles, checksumtype, formatspecs);
  for curfname in GetDirList:
-  catfhstart = fp.tell();
   if(re.findall("^[.|/]", curfname)):
    fname = curfname;
   else:
@@ -1525,7 +1533,10 @@ def AppendInFileWithContent(infile, fp, dirlistfromtxt=False, filevalues=[], ext
 def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, compression="auto", compressionlevel=None, filevalues=[], extradata=[], followlink=False, checksumtype="crc32", formatspecs=__file_format_list__, verbose=False, returnfp=False):
  if(outfile!="-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
   if(os.path.exists(outfile)):
-   os.unlink(outfile);
+   try:
+    os.unlink(outfile);
+   except OSError as e:
+    pass;
  if(outfile=="-"):
   verbose = False;
   catfpfp = BytesIO();
@@ -1539,7 +1550,7 @@ def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, comp
   catfp = CompressOpenFile(outfile, compressionlevel);
  catfp = AppendFilesWithContent(infiles, catfp, dirlistfromtxt, filevalues, extradata, followlink, checksumtype, formatspecs, verbose);
  if(outfile=="-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
-  catfp = CompressArchiveFile(catfp, compression, formatspecs);
+  catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
   try:
    catfp.flush();
    os.fsync(catfp.fileno());
@@ -1547,6 +1558,8 @@ def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, comp
    pass;
   except AttributeError:
    pass;
+  except OSError as e:
+   pass;
  if(outfile=="-"):
   catfp.seek(0, 0);
   if(hasattr(sys.stdout, "buffer")):
@@ -1554,7 +1567,7 @@ def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, comp
   else:
    shutil.copyfileobj(catfp, sys.stdout);
  elif(re.findall(r"^(ftp|ftps|sftp)\:\/\/", str(outfile))):
-  catfp = CompressArchiveFile(catfp, compression, formatspecs);
+  catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
   catfp.seek(0, 0);
   upload_file_to_internet_file(catfp, outfile);
  if(returnfp):
@@ -1567,7 +1580,10 @@ def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, comp
 def AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt=False, compression="auto", compressionlevel=None, filevalues=[], extradata=[], followlink=False, checksumtype="crc32", formatspecs=__file_format_list__, verbose=False, returnfp=False):
  if(outfile!="-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
   if(os.path.exists(outfile)):
-   os.unlink(outfile);
+   try:
+    os.unlink(outfile);
+   except OSError as e:
+    pass;
  if(outfile=="-"):
   verbose = False;
   catfpfp = BytesIO();
@@ -1581,7 +1597,7 @@ def AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt=False, compr
   catfp = CompressOpenFile(outfile, compressionlevel);
  catfp = AppendListsWithContent(inlist, catfp, dirlistfromtxt, filevalues, extradata, followlink, checksumtype, formatspecs, verbose);
  if(outfile=="-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
-  catfp = CompressArchiveFile(catfp, compression, formatspecs);
+  catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
   try:
    catfp.flush();
    os.fsync(catfp.fileno());
@@ -1589,6 +1605,8 @@ def AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt=False, compr
    pass;
   except AttributeError:
    pass;
+  except OSError as e:
+   pass;
  if(outfile=="-"):
   catfp.seek(0, 0);
   if(hasattr(sys.stdout, "buffer")):
@@ -1596,7 +1614,7 @@ def AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt=False, compr
   else:
    shutil.copyfileobj(catfp, sys.stdout);
  elif(re.findall(r"^(ftp|ftps|sftp)\:\/\/", str(outfile))):
-  catfp = CompressArchiveFile(catfp, compression, formatspecs);
+  catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
   catfp.seek(0, 0);
   upload_file_to_internet_file(catfp, outfile);
  if(returnfp):
@@ -1762,6 +1780,19 @@ def CheckCompressionType(infile, formatspecs=__file_format_list__, 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(is_tarfile(catfp)):
+   filetype = "tarfile";
+ if(not filetype):
+  if(is_tarfile(catfp)):
+   filetype = "tarfile";
+  elif(zipfile.is_zipfile(catfp)):
+   filetype = "zipfile";
+  elif(rarfile.is_rarfile(catfp) or rarfile.is_rarfile_sfx(catfp)):
+   filetype = "rarile";
+  else:
+   filetype = False;
+ catfp.seek(0, 0);
  if(closefp):
   catfp.close();
  return filetype;
@@ -2002,7 +2033,18 @@ def CheckCompressionSubType(infile, formatspecs=__file_format_list__, closefp=Tr
    compresscheck = "lzma";
   else:
    return False;
+ if(compresscheck=="gzip" or compresscheck=="bzip2" or compresscheck=="lzma" or compresscheck=="zstd" or compresscheck=="lz4"):
+  if(is_tarfile(infile)):
+   filetype = "tarfile";
  if(not compresscheck):
+  if(is_tarfile(infile)):
+   return "tarfile";
+  elif(zipfile.is_zipfile(infile)):
+   return "zipfile";
+  elif(rarfile.is_rarfile(infile) or rarfile.is_rarfile_sfx(infile)):
+   return "rarile";
+  else:
+   return False;
   return False;
  if(compresscheck=="catfile"):
   return "catfile";
@@ -2323,7 +2365,10 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
   logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG);
  if(outfile!="-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
   if(os.path.exists(outfile)):
-   os.unlink(outfile);
+   try:
+    os.unlink(outfile);
+   except OSError as e:
+    pass;
  if(outfile=="-"):
   verbose = False;
   catfp = BytesIO();
@@ -2381,8 +2426,9 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
   pass;
  except AttributeError:
   pass;
+ except OSError as e:
+  pass;
  for curfname in GetDirList:
-  catfhstart = catfp.tell();
   if(re.findall("^[.|/]", curfname)):
    fname = curfname;
   else:
@@ -2536,13 +2582,10 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
   catfileoutstr = AppendNullByte(catheaersize, formatspecs[5]) + catfileoutstr;
   catfileheadercshex = GetFileChecksum(catfileoutstr, checksumtype, True, formatspecs);
   catfileoutstr = catfileoutstr + AppendNullBytes([catfileheadercshex, catfilecontentcshex], formatspecs[5]);
-  catfhend = (catfp.tell() - 1) + len(catfileoutstr);
-  catfcontentstart = catfp.tell() + len(catfileoutstr);
   catfileoutstrecd = catfileoutstr.encode('UTF-8');
   nullstrecd = formatspecs[5].encode('UTF-8');
   fcontents.seek(0, 0);
   catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
-  catfcontentend = (catfp.tell() - 1) + len(catfileout);
   catfp.write(catfileout);
   try:
    catfp.flush();
@@ -2551,10 +2594,12 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
    pass;
   except AttributeError:
    pass;
+  except OSError as e:
+   pass;
  if(numfiles>0):
   catfp.write(AppendNullBytes([0, 0], formatspecs[5]).encode("UTF-8"));
  if(outfile=="-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
-  catfp = CompressArchiveFile(catfp, compression, formatspecs);
+  catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
   try:
    catfp.flush();
    os.fsync(catfp.fileno());
@@ -2562,6 +2607,8 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
    pass;
   except AttributeError:
    pass;
+  except OSError as e:
+   pass;
  if(outfile=="-"):
   catfp.seek(0, 0);
   if(hasattr(sys.stdout, "buffer")):
@@ -2569,7 +2616,7 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
   else:
    shutil.copyfileobj(catfp, sys.stdout);
  elif(re.findall(r"^(ftp|ftps|sftp)\:\/\/", str(outfile))):
-  catfp = CompressArchiveFile(catfp, compression, formatspecs);
+  catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
   catfp.seek(0, 0);
   upload_file_to_internet_file(catfp, outfile);
  if(returnfp):
@@ -2607,7 +2654,10 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compressionl
   logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG);
  if(outfile!="-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
   if(os.path.exists(outfile)):
-   os.unlink(outfile);
+   try:
+    os.unlink(outfile);
+   except OSError as e:
+    pass;
  if(outfile=="-"):
   verbose = False;
   catfp = BytesIO();
@@ -2676,8 +2726,9 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compressionl
   pass;
  except AttributeError:
   pass;
+ except OSError as e:
+  pass;
  for member in sorted(tarfp.getmembers(), key=lambda x: x.name):
-  catfhstart = catfp.tell();
   if(re.findall("^[.|/]", member.name)):
    fname = member.name;
   else:
@@ -2766,8 +2817,6 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compressionl
   if(len(extradata)>0):
    catfileoutstr = catfileoutstr + AppendNullBytes(extradata, formatspecs[5]);
   catfileoutstr = catfileoutstr + AppendNullByte(checksumtype, formatspecs[5]);
-  catfhend = (catfp.tell() - 1) + len(catfileoutstr);
-  catfcontentstart = catfp.tell() + len(catfileoutstr);
   catfileheadercshex = GetFileChecksum(catfileoutstr, checksumtype, True, formatspecs);
   fcontents.seek(0, 0);
   catfilecontentcshex = GetFileChecksum(fcontents.read(), checksumtype, False, formatspecs);
@@ -2780,7 +2829,6 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compressionl
   nullstrecd = formatspecs[5].encode('UTF-8');
   fcontents.seek(0, 0);
   catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
-  catfcontentend = (catfp.tell() - 1) + len(catfileout);
   catfp.write(catfileout);
   try:
    catfp.flush();
@@ -2789,10 +2837,12 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compressionl
    pass;
   except AttributeError:
    pass;
+  except OSError as e:
+   pass;
  if(numfiles>0):
   catfp.write(AppendNullBytes([0, 0], formatspecs[5]).encode("UTF-8"));
  if(outfile=="-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
-  catfp = CompressArchiveFile(catfp, compression, formatspecs);
+  catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
   try:
    catfp.flush();
    os.fsync(catfp.fileno());
@@ -2800,6 +2850,8 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compressionl
    pass;
   except AttributeError:
    pass;
+  except OSError as e:
+   pass;
  if(outfile=="-"):
   catfp.seek(0, 0);
   if(hasattr(sys.stdout, "buffer")):
@@ -2807,7 +2859,7 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compressionl
   else:
    shutil.copyfileobj(catfp, sys.stdout);
  elif(re.findall(r"^(ftp|ftps|sftp)\:\/\/", str(outfile))):
-  catfp = CompressArchiveFile(catfp, compression, formatspecs);
+  catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
   catfp.seek(0, 0);
   upload_file_to_internet_file(catfp, outfile);
  if(returnfp):
@@ -2835,7 +2887,10 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compressionl
   logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG);
  if(outfile!="-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
   if(os.path.exists(outfile)):
-   os.unlink(outfile);
+   try:
+    os.unlink(outfile);
+   except OSError as e:
+    pass;
  if(outfile=="-"):
   verbose = False;
   catfp = BytesIO();
@@ -2899,8 +2954,9 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compressionl
   pass;
  except AttributeError:
   pass;
+ except OSError as e:
+  pass;
  for member in sorted(zipfp.infolist(), key=lambda x: x.filename):
-  catfhstart = catfp.tell();
   if(re.findall("^[.|/]", member.filename)):
    fname = member.filename;
   else:
@@ -3014,8 +3070,6 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compressionl
   if(len(extradata)>0):
    catfileoutstr = catfileoutstr + AppendNullBytes(extradata, formatspecs[5]);
   catfileoutstr = catfileoutstr + AppendNullByte(checksumtype, formatspecs[5]);
-  catfhend = (catfp.tell() - 1) + len(catfileoutstr);
-  catfcontentstart = catfp.tell() + len(catfileoutstr);
   catfileheadercshex = GetFileChecksum(catfileoutstr, checksumtype, True, formatspecs);
   fcontents.seek(0, 0);
   catfilecontentcshex = GetFileChecksum(fcontents.read(), checksumtype, False, formatspecs);
@@ -3028,7 +3082,6 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compressionl
   nullstrecd = formatspecs[5].encode('UTF-8');
   fcontents.seek(0, 0);
   catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
-  catfcontentend = (catfp.tell() - 1) + len(catfileout);
   catfp.write(catfileout);
   try:
    catfp.flush();
@@ -3037,10 +3090,12 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compressionl
    pass;
   except AttributeError:
    pass;
+  except OSError as e:
+   pass;
  if(numfiles>0):
   catfp.write(AppendNullBytes([0, 0], formatspecs[5]).encode("UTF-8"));
  if(outfile=="-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
-  catfp = CompressArchiveFile(catfp, compression, formatspecs);
+  catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
   try:
    catfp.flush();
    os.fsync(catfp.fileno());
@@ -3048,6 +3103,8 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compressionl
    pass;
   except AttributeError:
    pass;
+  except OSError as e:
+   pass;
  if(outfile=="-"):
   catfp.seek(0, 0);
   if(hasattr(sys.stdout, "buffer")):
@@ -3055,7 +3112,7 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compressionl
   else:
    shutil.copyfileobj(catfp, sys.stdout);
  elif(re.findall(r"^(ftp|ftps|sftp)\:\/\/", str(outfile))):
-  catfp = CompressArchiveFile(catfp, compression, formatspecs);
+  catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
   catfp.seek(0, 0);
   upload_file_to_internet_file(catfp, outfile);
  if(returnfp):
@@ -3088,7 +3145,10 @@ if(rarfile_support):
    logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG);
   if(outfile!="-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
    if(os.path.exists(outfile)):
-    os.unlink(outfile);
+    try:
+     os.unlink(outfile);
+    except OSError as e:
+     pass;
   if(outfile=="-"):
    verbose = False;
    catfp = BytesIO();
@@ -3131,6 +3191,8 @@ if(rarfile_support):
    pass;
   except AttributeError:
    pass;
+  except OSError as e:
+   pass;
   for member in sorted(rarfp.infolist(), key=lambda x: x.filename):
    is_unix = False;
    is_windows = False;
@@ -3151,7 +3213,6 @@ if(rarfile_support):
    else:
     is_unix = False;
     is_windows = False;
-   catfhstart = catfp.tell();
    if(re.findall("^[.|/]", member.filename)):
     fname = member.filename;
    else:
@@ -3280,8 +3341,6 @@ if(rarfile_support):
    if(len(extradata)>0):
     catfileoutstr = catfileoutstr + AppendNullBytes(extradata, formatspecs[5]);
    catfileoutstr = catfileoutstr + AppendNullByte(checksumtype, formatspecs[5]);
-   catfhend = (catfp.tell() - 1) + len(catfileoutstr);
-   catfcontentstart = catfp.tell() + len(catfileoutstr);
    catfileheadercshex = GetFileChecksum(catfileoutstr, checksumtype, True, formatspecs);
    fcontents.seek(0, 0);
    catfilecontentcshex = GetFileChecksum(fcontents.read(), checksumtype, False, formatspecs);
@@ -3294,26 +3353,29 @@ if(rarfile_support):
    nullstrecd = formatspecs[5].encode('UTF-8');
    fcontents.seek(0, 0);
    catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
-   catfcontentend = (catfp.tell() - 1) + len(catfileout);
    catfp.write(catfileout);
    try:
     catfp.flush();
     os.fsync(catfp.fileno());
    except io.UnsupportedOperation:
-    pass
+    pass;
    except AttributeError:
-    pass
+    pass;
+   except OSError as e:
+    pass;
   if(numfiles>0):
    catfp.write(AppendNullBytes([0, 0], formatspecs[5]).encode("UTF-8"));
   if(outfile=="-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
-   catfp = CompressArchiveFile(catfp, compression, formatspecs)
+   catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs)
    try:
     catfp.flush();
     os.fsync(catfp.fileno());
    except io.UnsupportedOperation:
-    pass
+    pass;
    except AttributeError:
-    pass
+    pass;
+   except OSError as e:
+    pass;
   if(outfile=="-"):
    catfp.seek(0, 0)
    if(hasattr(sys.stdout, "buffer")):
@@ -3321,7 +3383,7 @@ if(rarfile_support):
    else:
     shutil.copyfileobj(catfp, sys.stdout);
   elif(re.findall(r"^(ftp|ftps|sftp)\:\/\/", str(outfile))):
-   catfp = CompressArchiveFile(catfp, compression, formatspecs);
+   catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
    catfp.seek(0, 0);
    upload_file_to_internet_file(catfp, outfile);
   if(returnfp):
@@ -3354,7 +3416,10 @@ if(py7zr_support):
    logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG);
   if(outfile!="-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
    if(os.path.exists(outfile)):
-    os.unlink(outfile);
+    try:
+     os.unlink(outfile);
+    except OSError as e:
+     pass;
   if(outfile=="-"):
    verbose = False;
    catfp = BytesIO();
@@ -3397,8 +3462,9 @@ if(py7zr_support):
    pass;
   except AttributeError:
    pass;
+  except OSError as e:
+   pass;
   for member in sorted(szpfp.list(), key=lambda x: x.filename):
-   catfhstart = catfp.tell();
    if(re.findall("^[.|/]", member.filename)):
     fname = member.filename;
    else:
@@ -3493,8 +3559,6 @@ if(py7zr_support):
    if(len(extradata)>0):
     catfileoutstr = catfileoutstr + AppendNullBytes(extradata, formatspecs[5]);
    catfileoutstr = catfileoutstr + AppendNullByte(checksumtype, formatspecs[5]);
-   catfhend = (catfp.tell() - 1) + len(catfileoutstr);
-   catfcontentstart = catfp.tell() + len(catfileoutstr);
    catfileheadercshex = GetFileChecksum(catfileoutstr, checksumtype, True, formatspecs);
    fcontents.seek(0, 0);
    catfilecontentcshex = GetFileChecksum(fcontents.read(), checksumtype, False, formatspecs);
@@ -3507,26 +3571,29 @@ if(py7zr_support):
    nullstrecd = formatspecs[5].encode('UTF-8');
    fcontents.seek(0, 0);
    catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
-   catfcontentend = (catfp.tell() - 1) + len(catfileout);
    catfp.write(catfileout);
    try:
     catfp.flush();
     os.fsync(catfp.fileno());
    except io.UnsupportedOperation:
-    pass
+    pass;
    except AttributeError:
-    pass
+    pass;
+   except OSError as e:
+    pass;
   if(numfiles>0):
    catfp.write(AppendNullBytes([0, 0], formatspecs[5]).encode("UTF-8"));
   if(outfile=="-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
-   catfp = CompressArchiveFile(catfp, compression, formatspecs)
+   catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs)
    try:
     catfp.flush();
     os.fsync(catfp.fileno());
    except io.UnsupportedOperation:
-    pass
+    pass;
    except AttributeError:
-    pass
+    pass;
+   except OSError as e:
+    pass;
   if(outfile=="-"):
    catfp.seek(0, 0);
    if(hasattr(sys.stdout, "buffer")):
@@ -3534,7 +3601,7 @@ if(py7zr_support):
    else:
     shutil.copyfileobj(catfp, sys.stdout);
   elif(re.findall(r"^(ftp|ftps|sftp)\:\/\/", str(outfile))):
-   catfp = CompressArchiveFile(catfp, compression, formatspecs);
+   catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
    catfp.seek(0, 0);
    upload_file_to_internet_file(catfp, outfile);
   if(returnfp):
@@ -5906,7 +5973,10 @@ def RePackArchiveFile(infile, outfile, compression="auto", compressionlevel=None
   logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG);
  if(outfile!="-" and not hasattr(outfile, "read") and not hasattr(outfile, "write")):
   if(os.path.exists(outfile)):
-   os.unlink(outfile);
+   try:
+    os.unlink(outfile);
+   except OSError as e:
+    pass;
  if(not listcatfiles):
   return False;
  if(outfile=="-"):
@@ -5940,6 +6010,8 @@ def RePackArchiveFile(infile, outfile, compression="auto", compressionlevel=None
   pass;
  except AttributeError:
   pass;
+ except OSError as e:
+  pass;
  lenlist = len(listcatfiles['ffilelist']);
  fnumfiles = int(listcatfiles['fnumfiles']);
  lcfi = 0;
@@ -5955,7 +6027,6 @@ def RePackArchiveFile(infile, outfile, compression="auto", compressionlevel=None
  filetoinode = {};
  reallcfi = 0;
  while(lcfi < lcfx):
-  catfhstart = catfp.tell();
   if(re.findall("^[.|/]", listcatfiles['ffilelist'][reallcfi]['fname'])):
    fname = listcatfiles['ffilelist'][reallcfi]['fname'];
   else:
@@ -6059,8 +6130,6 @@ def RePackArchiveFile(infile, outfile, compression="auto", compressionlevel=None
     exi = exi + 1;
    catfileoutstr += AppendNullBytes([extrafieldslist], formatspecs[5]);
   catfileoutstr += AppendNullBytes([checksumtype], formatspecs[5]);
-  catfhend = (catfp.tell() - 1) + len(catfileoutstr);
-  catfcontentstart = catfp.tell() + len(catfileoutstr);
   catfileheadercshex = GetFileChecksum(catfileoutstr, checksumtype, True, formatspecs);
   fcontents.seek(0, 0);
   catfilecontentcshex = GetFileChecksum(fcontents.read(), checksumtype, False, formatspecs);
@@ -6073,7 +6142,6 @@ def RePackArchiveFile(infile, outfile, compression="auto", compressionlevel=None
   nullstrecd = formatspecs[5].encode('UTF-8');
   fcontents.seek(0, 0);
   catfileout = catfileoutstrecd + fcontents.read() + nullstrecd;
-  catfcontentend = (catfp.tell() - 1) + len(catfileout);
   catfp.write(catfileout);
   try:
    catfp.flush();
@@ -6082,12 +6150,14 @@ def RePackArchiveFile(infile, outfile, compression="auto", compressionlevel=None
    pass;
   except AttributeError:
    pass;
+  except OSError as e:
+   pass;
   lcfi = lcfi + 1;
   reallcfi = reallcfi + 1;
  if(lcfx>0):
   catfp.write(AppendNullBytes([0, 0], formatspecs[5]).encode("UTF-8"));
  if(outfile=="-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
-  catfp = CompressArchiveFile(catfp, compression, formatspecs);
+  catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
   try:
    catfp.flush();
    os.fsync(catfp.fileno());
@@ -6095,6 +6165,8 @@ def RePackArchiveFile(infile, outfile, compression="auto", compressionlevel=None
    pass;
   except AttributeError:
    pass;
+  except OSError as e:
+   pass;
  if(outfile=="-"):
   catfp.seek(0, 0);
   if(hasattr(sys.stdout, "buffer")):
@@ -6102,7 +6174,7 @@ def RePackArchiveFile(infile, outfile, compression="auto", compressionlevel=None
   else:
    shutil.copyfileobj(catfp, sys.stdout);
  elif(re.findall(r"^(ftp|ftps|sftp)\:\/\/", str(outfile))):
-  catfp = CompressArchiveFile(catfp, compression, formatspecs);
+  catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
   catfp.seek(0, 0);
   upload_file_to_internet_file(catfp, outfile);
  if(returnfp):
@@ -6186,9 +6258,11 @@ def UnPackArchiveFile(infile, outdir=None, followlink=False, seekstart=0, seeken
      fpc.flush();
      os.fsync(fpc.fileno());
     except io.UnsupportedOperation:
-     pass
+     pass;
     except AttributeError:
-     pass
+     pass;
+    except OSError as e:
+     pass;
    if(hasattr(os, "chown") and funame==listcatfiles['ffilelist'][lcfi]['funame'] and fgname==listcatfiles['ffilelist'][lcfi]['fgname'] and preservepermissions):
     os.chown(PrependPath(outdir, listcatfiles['ffilelist'][lcfi]['fname']), listcatfiles['ffilelist'][lcfi]['fuid'], listcatfiles['ffilelist'][lcfi]['fgid']);
    if(preservepermissions):
@@ -6228,9 +6302,11 @@ def UnPackArchiveFile(infile, outdir=None, followlink=False, seekstart=0, seeken
        fpc.flush();
        os.fsync(fpc.fileno());
       except io.UnsupportedOperation:
-       pass
+       pass;
       except AttributeError:
-       pass
+       pass;
+      except OSError as e:
+       pass;
      if(hasattr(os, "chown") and funame==flinkinfo['funame'] and fgname==flinkinfo['fgname'] and preservepermissions):
       os.chown(PrependPath(outdir, listcatfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid']);
      if(preservepermissions):
@@ -6289,9 +6365,11 @@ def UnPackArchiveFile(infile, outdir=None, followlink=False, seekstart=0, seeken
        fpc.flush();
        os.fsync(fpc.fileno());
       except io.UnsupportedOperation:
-       pass
+       pass;
       except AttributeError:
-       pass
+       pass;
+      except OSError as e:
+       pass;
      if(hasattr(os, "chown") and funame==flinkinfo['funame'] and fgname==flinkinfo['fgname'] and preservepermissions):
       os.chown(PrependPath(outdir, listcatfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid']);
      if(preservepermissions):
@@ -7377,7 +7455,7 @@ def upload_file_to_internet_file(ifp, url):
  return False;
 
 def upload_file_to_internet_compress_file(ifp, url, formatspecs=__file_format_list__):
- catfp = CompressArchiveFile(catfp, compression, formatspecs);
+ catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
  if(not catfileout):
   return False;
  catfp.seek(0, 0);
@@ -7400,7 +7478,7 @@ def upload_file_to_internet_string(ifp, url):
  return False;
  
 def upload_file_to_internet_compress_string(ifp, url, formatspecs=__file_format_list__):
- catfp = CompressArchiveFile(BytesIO(ifp), compression, formatspecs);
+ catfp = CompressArchiveFile(BytesIO(ifp), compression, compressionlevel, formatspecs);
  if(not catfileout):
   return False;
  catfp.seek(0, 0);

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