PyCatFile 0.10.0__tar.gz → 0.10.2__tar.gz

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

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

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

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

{pycatfile-0.10.0 → pycatfile-0.10.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: 5/3/2024 Ver. 0.10.0 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 5/5/2024 Ver. 0.10.2 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals;
@@ -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, 10, 0, "RC 1", 1);
-__version_date_info__ = (2024, 5, 3, "RC 1", 1);
+__version_info__ = (0, 10, 2, "RC 1", 1);
+__version_date_info__ = (2024, 5, 5, "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: 315654f0f21d3dcfe5c3339c8c23806a723ff64f $";
+__revision_id__ = "$Id: fc3f579a8dd909abc9786722184c4750a68cb94d $";
 if(__version_info__[4] is not None):
  __version_date_plusrc__ = __version_date__ + "-" + str(__version_date_info__[4]);
 if(__version_info__[4] is None):
@@ -624,6 +624,7 @@ def ReadFileHeaderDataBySizeWithContent(fp, listonly=False, skipchecksum=False,
  newfcs = GetHeaderChecksum(HeaderOut[:-2], HeaderOut[-3].lower(), True, formatspecs);
  if(fcs!=newfcs and not skipchecksum):
   VerbosePrintOut("File Header Checksum Error with file " + fname + " at offset " + str(fheaderstart));
+  VerbosePrintOut("'" + str(fcs) + "' != " + "'" + str(newfcs) + "'");
   return False;
  fhend = fp.tell() - 1;
  fcontentstart = fp.tell();
@@ -636,6 +637,7 @@ def ReadFileHeaderDataBySizeWithContent(fp, listonly=False, skipchecksum=False,
  newfccs = GetFileChecksum(fcontents.read(), HeaderOut[-3].lower(), False, formatspecs);
  if(fccs!=newfccs and not skipchecksum and not listonly):
   VerbosePrintOut("File Content Checksum Error with file " + fname + " at offset " + str(fcontentstart));
+  VerbosePrintOut("'" + str(fccs) + "' != " + "'" + str(newfccs) + "'");
   return False;
  fp.seek(1, 1);
  fcontentend = fp.tell() - 1;
@@ -695,6 +697,7 @@ def ReadFileHeaderDataBySizeWithContentToArray(fp, listonly=False, skipchecksum=
  newfcs = GetHeaderChecksum(HeaderOut[:-2], HeaderOut[-3].lower(), True, formatspecs);
  if(fcs!=newfcs and not skipchecksum):
   VerbosePrintOut("File Header Checksum Error with file " + fname + " at offset " + str(fheaderstart));
+  VerbosePrintOut("'" + str(fcs) + "' != " + "'" + str(newfcs) + "'");
   return False;
  fhend = fp.tell() - 1;
  fcontentstart = fp.tell();
@@ -710,6 +713,7 @@ def ReadFileHeaderDataBySizeWithContentToArray(fp, listonly=False, skipchecksum=
  newfccs = GetFileChecksum(fcontents.read(), HeaderOut[-3].lower(), False, formatspecs);
  if(fccs!=newfccs and not skipchecksum and not listonly):
   VerbosePrintOut("File Content Checksum Error with file " + fname + " at offset " + str(fcontentstart));
+  VerbosePrintOut("'" + str(fccs) + "' != " + "'" + str(newfccs) + "'");
   return False;
  fp.seek(1, 1);
  fcontentend = fp.tell() - 1;
@@ -770,6 +774,7 @@ def ReadFileHeaderDataBySizeWithContentToList(fp, listonly=False, skipchecksum=F
  newfcs = GetHeaderChecksum(HeaderOut[:-2], HeaderOut[-3].lower(), True, formatspecs);
  if(fcs!=newfcs and not skipchecksum):
   VerbosePrintOut("File Header Checksum Error with file " + fname + " at offset " + str(fheaderstart));
+  VerbosePrintOut("'" + str(fcs) + "' != " + "'" + str(newfcs) + "'");
   return False;
  fhend = fp.tell() - 1;
  fcontentstart = fp.tell();
@@ -785,6 +790,7 @@ def ReadFileHeaderDataBySizeWithContentToList(fp, listonly=False, skipchecksum=F
  newfccs = GetFileChecksum(fcontents.read(), HeaderOut[-3].lower(), False, formatspecs);
  if(fccs!=newfccs and not skipchecksum and not listonly):
   VerbosePrintOut("File Content Checksum Error with file " + fname + " at offset " + str(fcontentstart));
+  VerbosePrintOut("'" + str(fccs) + "' != " + "'" + str(newfccs) + "'");
   return False;
  fp.seek(1, 1);
  fcontentend = fp.tell() - 1;
@@ -800,8 +806,10 @@ def ReadFileDataBySizeWithContent(fp, listonly=False, skipchecksum=False, format
  if(curloc>0):
   fp.seek(curloc, 0);
  headercheck = ValidateHeaderChecksum(catheader[:-1], catheader[2], catheader[3], formatspecs);
+ newfcs = GetHeaderChecksum(catheader[:-2], catheader[2], True, formatspecs);
  if(not headercheck and not skipchecksum):
   VerbosePrintOut("File Header Checksum Error with file at offset " + str(0));
+  VerbosePrintOut("'" + str(newfcs) + "' != " + "'" + str(catheader[3]) + "'");
   return False;
  fnumfiles = int(catheader[1], 16);
  countnum = 0;
@@ -823,8 +831,10 @@ def ReadFileDataBySizeWithContentToArray(fp, seekstart=0, seekend=0, listonly=Fa
  if(curloc>0):
   fp.seek(curloc, 0);
  headercheck = ValidateHeaderChecksum(catheader[:-1], catheader[2], catheader[3], formatspecs);
+ newfcs = GetHeaderChecksum(catheader[:-2], catheader[2], True, formatspecs);
  if(not headercheck and not skipchecksum):
   VerbosePrintOut("File Header Checksum Error with file at offset " + str(0));
+  VerbosePrintOut("'" + str(newfcs) + "' != " + "'" + str(catheader[3]) + "'");
   return False;
  catstring = catheader[0];
  catversion = re.findall(r"([\d]+)$", catstring);
@@ -851,7 +861,8 @@ def ReadFileDataBySizeWithContentToArray(fp, seekstart=0, seekend=0, listonly=Fa
    prenewfcs = GetHeaderChecksum(preheaderdata[:-2], preheaderdata[-3].lower(), True, formatspecs);
    prefcs = preheaderdata[-2];
    if(prefcs!=prenewfcs and not skipchecksum):
-    VerbosePrintOut("File Header Checksum Error with file " + prefname + " at offset " + str(prefhstart));
+    VVerbosePrintOut("File Header Checksum Error with file " + prefname + " at offset " + str(prefhstart));
+    VerbosePrintOut("'" + str(prefcs) + "' != " + "'" + str(prenewfcs) + "'");
     return False;
     valid_archive = False;
     invalid_archive = True;
@@ -867,6 +878,7 @@ def ReadFileDataBySizeWithContentToArray(fp, seekstart=0, seekend=0, listonly=Fa
     pyhascontents = True;
     if(prefccs!=prenewfccs and not skipchecksum):
      VerbosePrintOut("File Content Checksum Error with file " + prefname + " at offset " + str(prefcontentstart));
+     VerbosePrintOut("'" + str(prefccs) + "' != " + "'" + str(prenewfccs) + "'");
      return False;
    fp.seek(1, 1);
    il = il + 1;
@@ -947,8 +959,10 @@ def ReadFileDataBySizeWithContentToList(fp, seekstart=0, seekend=0, listonly=Fal
  if(curloc>0):
   fp.seek(curloc, 0);
  headercheck = ValidateHeaderChecksum(catheader[:-1], catheader[2], catheader[3], formatspecs);
+ newfcs = GetHeaderChecksum(catheader[:-2], catheader[2], True, formatspecs);
  if(not headercheck and not skipchecksum):
   VerbosePrintOut("File Header Checksum Error with file at offset " + str(0));
+  VerbosePrintOut("'" + str(newfcs) + "' != " + "'" + str(catheader[3]) + "'");
   return False;
  catstring = catheader[0];
  catversion = re.findall(r"([\d]+)$", catstring);
@@ -976,6 +990,7 @@ def ReadFileDataBySizeWithContentToList(fp, seekstart=0, seekend=0, listonly=Fal
    prefcs = preheaderdata[-2];
    if(prefcs!=prenewfcs and not skipchecksum):
     VerbosePrintOut("File Header Checksum Error with file " + prefname + " at offset " + str(prefhstart));
+    VerbosePrintOut("'" + str(prefcs) + "' != " + "'" + str(prenewfcs) + "'");
     return False;
     valid_archive = False;
     invalid_archive = True;
@@ -990,6 +1005,7 @@ def ReadFileDataBySizeWithContentToList(fp, seekstart=0, seekend=0, listonly=Fal
     pyhascontents = True;
     if(prefccs!=prenewfccs and not skipchecksum):
      VerbosePrintOut("File Content Checksum Error with file " + prefname + " at offset " + str(prefcontentstart));
+     VerbosePrintOut("'" + str(prefccs) + "' != " + "'" + str(prenewfccs) + "'");
      return False;
    fp.seek(1, 1);
    il = il + 1;
@@ -1230,7 +1246,7 @@ def MakeEmptyFile(outfile, compression="auto", compressionlevel=None, checksumty
  else:
   fbasename = os.path.splitext(outfile)[0];
   fextname = os.path.splitext(outfile)[1];
-  catfp = CompressOpenFile(outfile, compressionlevel);
+  catfp = CompressOpenFile(outfile, True, compressionlevel);
  catfp = AppendFileHeader(catfp, 0, checksumtype, formatspecs);
  if(outfile=="-" or hasattr(outfile, "read") or hasattr(outfile, "write")):
   catfp = CompressArchiveFile(catfp, compression, compressionlevel, formatspecs);
@@ -1547,7 +1563,7 @@ def AppendFilesWithContentToOutFile(infiles, outfile, dirlistfromtxt=False, comp
  else:
   fbasename = os.path.splitext(outfile)[0];
   fextname = os.path.splitext(outfile)[1];
-  catfp = CompressOpenFile(outfile, compressionlevel);
+  catfp = CompressOpenFile(outfile, True, 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, compressionlevel, formatspecs);
@@ -1594,7 +1610,7 @@ def AppendListsWithContentToOutFile(inlist, outfile, dirlistfromtxt=False, compr
  else:
   fbasename = os.path.splitext(outfile)[0];
   fextname = os.path.splitext(outfile)[1];
-  catfp = CompressOpenFile(outfile, compressionlevel);
+  catfp = CompressOpenFile(outfile, True, 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, compressionlevel, formatspecs);
@@ -1884,6 +1900,8 @@ def UncompressArchiveFile(fp, formatspecs=__file_format_list__):
     catfp.write(lzma.decompress(fp.read()));
    except lzma.LZMAError:
     return False;
+  if(compresscheck!="catfile" or compresscheck!=formatspecs[2]):
+   fp.close();
  return catfp;
 
 create_alias_function("Uncompress", __file_format_name__, "", UncompressArchiveFile);
@@ -2137,8 +2155,8 @@ def CompressArchiveFile(fp, compression="auto", compressionlevel=None, formatspe
  if(not hasattr(fp, "read") and not hasattr(fp, "write")):
   return False;
  fp.seek(0, 0);
- if(not compression or compression or compression=="catfile" or compression==formatspecs[2]):
-  compression = None;
+ if(not compression or compression=="catfile" or compression==formatspecs[2]):
+  compression = "auto";
  if(compression not in compressionlist and compression is None):
   compression = "auto";
  if(compression=="gzip"):
@@ -2225,7 +2243,7 @@ def CompressArchiveFile(fp, compression="auto", compressionlevel=None, formatspe
 
 create_alias_function("Compress", __file_format_name__, "", CompressArchiveFile);
 
-def CompressOpenFile(outfile, compressionlevel=None):
+def CompressOpenFile(outfile, compressionenable=True, compressionlevel=None):
  if(outfile is None):
   return False;
  fbasename = os.path.splitext(outfile)[0];
@@ -2241,7 +2259,7 @@ def CompressOpenFile(outfile, compressionlevel=None):
  else:
   mode = "wb";
  try:
-  if(fextname not in outextlistwd):
+  if(fextname not in outextlistwd or not compressionenable):
    try:
     outfp = open(outfile, "wb", encoding="UTF-8");
    except (ValueError, TypeError) as e:
@@ -2357,8 +2375,8 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
   checksumtype="crc32";
  if(checksumtype=="none"):
   checksumtype = "";
- if(not compression or compression or compression=="catfile" or compression==formatspecs[2]):
-  compression = None;
+ if(not compression or compression=="catfile" or compression==formatspecs[2]):
+  compression = "auto";
  if(compression not in compressionlist and compression is None):
   compression = "auto";
  if(verbose):
@@ -2379,7 +2397,7 @@ def PackArchiveFile(infiles, outfile, dirlistfromtxt=False, compression="auto",
  else:
   fbasename = os.path.splitext(outfile)[0];
   fextname = os.path.splitext(outfile)[1];
-  catfp = CompressOpenFile(outfile, compressionlevel);
+  catfp = CompressOpenFile(outfile, True, compressionlevel);
  catver = formatspecs[6];
  fileheaderver = str(int(catver.replace(".", "")));
  fileheader = AppendNullByte(formatspecs[1] + fileheaderver, formatspecs[5]);
@@ -2646,8 +2664,8 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compressionl
   checksumtype="crc32";
  if(checksumtype=="none"):
   checksumtype = "";
- if(not compression or compression or compression=="catfile" or compression==formatspecs[2]):
-  compression = None;
+ if(not compression or compression=="catfile" or compression==formatspecs[2]):
+  compression = "auto";
  if(compression not in compressionlist and compression is None):
   compression = "auto";
  if(verbose):
@@ -2668,7 +2686,7 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compressionl
  else:
   fbasename = os.path.splitext(outfile)[0];
   fextname = os.path.splitext(outfile)[1];
-  catfp = CompressOpenFile(outfile, compressionlevel);
+  catfp = CompressOpenFile(outfile, True, compressionlevel);
  catver = formatspecs[6];
  fileheaderver = str(int(catver.replace(".", "")));
  fileheader = AppendNullByte(formatspecs[1] + fileheaderver, formatspecs[5]);
@@ -2879,8 +2897,8 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compressionl
   checksumtype="crc32";
  if(checksumtype=="none"):
   checksumtype = "";
- if(not compression or compression or compression=="catfile" or compression==formatspecs[2]):
-  compression = None;
+ if(not compression or compression=="catfile" or compression==formatspecs[2]):
+  compression = "auto";
  if(compression not in compressionlist and compression is None):
   compression = "auto";
  if(verbose):
@@ -2901,7 +2919,7 @@ def PackArchiveFileFromZipFile(infile, outfile, compression="auto", compressionl
  else:
   fbasename = os.path.splitext(outfile)[0];
   fextname = os.path.splitext(outfile)[1];
-  catfp = CompressOpenFile(outfile, compressionlevel);
+  catfp = CompressOpenFile(outfile, True, compressionlevel);
  catver = formatspecs[6];
  fileheaderver = str(int(catver.replace(".", "")));
  fileheader = AppendNullByte(formatspecs[1] + fileheaderver, formatspecs[5]);
@@ -3137,8 +3155,8 @@ if(rarfile_support):
    checksumtype="crc32";
   if(checksumtype=="none"):
    checksumtype = "";
-  if(not compression or compression or compression=="catfile" or compression==formatspecs[2]):
-   compression = None;
+  if(not compression or compression=="catfile" or compression==formatspecs[2]):
+   compression = "auto";
   if(compression not in compressionlist and compression is None):
    compression = "auto";
   if(verbose):
@@ -3159,7 +3177,7 @@ if(rarfile_support):
   else:
    fbasename = os.path.splitext(outfile)[0];
    fextname = os.path.splitext(outfile)[1];
-   catfp = CompressOpenFile(outfile, compressionlevel);
+   catfp = CompressOpenFile(outfile, True, compressionlevel);
   catver = formatspecs[6];
   fileheaderver = str(int(catver.replace(".", "")));
   fileheader = AppendNullByte(formatspecs[1] + fileheaderver, formatspecs[5]);
@@ -3408,8 +3426,8 @@ if(py7zr_support):
    checksumtype="crc32";
   if(checksumtype=="none"):
    checksumtype = "";
-  if(not compression or compression or compression=="catfile" or compression==formatspecs[2]):
-   compression = None;
+  if(not compression or compression=="catfile" or compression==formatspecs[2]):
+   compression = "auto";
   if(compression not in compressionlist and compression is None):
    compression = "auto";
   if(verbose):
@@ -3430,7 +3448,7 @@ if(py7zr_support):
   else:
    fbasename = os.path.splitext(outfile)[0];
    fextname = os.path.splitext(outfile)[1];
-   catfp = CompressOpenFile(outfile, compressionlevel);
+   catfp = CompressOpenFile(outfile, True, compressionlevel);
   catver = formatspecs[6];
   fileheaderver = str(int(catver.replace(".", "")));
   fileheader = AppendNullByte(formatspecs[1] + fileheaderver, formatspecs[5]);
@@ -3739,6 +3757,7 @@ def ArchiveFileSeekToFileNum(infile, seekto=0, listonly=False, skipchecksum=Fals
  fheadtell = len(fileheader);
  if(fprechecksum!=catfileheadercshex and not skipchecksum):
   VerbosePrintOut("File Header Checksum Error with file " + infile + " at offset " + str(0));
+  VerbosePrintOut("'" + str(fprechecksum) + "' != " + "'" + str(catfileheadercshex) + "'");
   return False;
  catversions = re.search(r'(.*?)(\d+)$', catstring).groups();
  catlist = {'fnumfiles': fnumfiles, 'fformat': catversions[0], 'fversion': catversions[1], 'fformatspecs': formatspecs, 'fchecksumtype': fprechecksumtype, 'fheaderchecksum': fprechecksum, 'ffilelist': {}};
@@ -3806,6 +3825,7 @@ def ArchiveFileSeekToFileNum(infile, seekto=0, listonly=False, skipchecksum=Fals
    prenewfcs = GetFileChecksum(hout, preheaderdata[-3].lower(), True, formatspecs);
    if(prefcs!=prenewfcs and not skipchecksum):
     VerbosePrintOut("File Header Checksum Error with file " + prefname + " at offset " + str(prefhstart));
+    VerbosePrintOut("'" + str(prefcs) + "' != " + "'" + str(prenewfcs) + "'");
     return False;
     valid_archive = False;
     invalid_archive = True;
@@ -3819,6 +3839,7 @@ def ArchiveFileSeekToFileNum(infile, seekto=0, listonly=False, skipchecksum=Fals
     pyhascontents = True;
     if(prefccs!=prenewfccs and not skipchecksum):
      VerbosePrintOut("File Content Checksum Error with file " + prefname + " at offset " + str(prefcontentstart));
+     VerbosePrintOut("'" + str(prefccs) + "' != " + "'" + str(prenewfccs) + "'");
      return False;
    catfp.seek(1, 1);
    il = il + 1;
@@ -3949,6 +3970,7 @@ def ArchiveFileSeekToFileName(infile, seekfile=None, listonly=False, skipchecksu
  fheadtell = len(fileheader);
  if(fprechecksum!=catfileheadercshex and not skipchecksum):
   VerbosePrintOut("File Header Checksum Error with file " + infile + " at offset " + str(0));
+  VerbosePrintOut("'" + str(fprechecksum) + "' != " + "'" + str(catfileheadercshex) + "'");
   return False;
  catversions = re.search(r'(.*?)(\d+)$', catstring).groups();
  catlist = {'fnumfiles': fnumfiles, 'fformat': catversions[0], 'fversion': catversions[1], 'fformatspecs': formatspecs, 'fchecksumtype': fprechecksumtype, 'fheaderchecksum': fprechecksum, 'ffilelist': {}};
@@ -4014,6 +4036,7 @@ def ArchiveFileSeekToFileName(infile, seekfile=None, listonly=False, skipchecksu
    prenewfcs = GetFileChecksum(hout, preheaderdata[-3].lower(), True, formatspecs);
    if(prefcs!=prenewfcs and not skipchecksum):
     VerbosePrintOut("File Header Checksum Error with file " + prefname + " at offset " + str(prefhstart));
+    VerbosePrintOut("'" + str(prefcs) + "' != " + "'" + str(prenewfcs) + "'");
     return False;
     valid_archive = False;
     invalid_archive = True;
@@ -4027,6 +4050,7 @@ def ArchiveFileSeekToFileName(infile, seekfile=None, listonly=False, skipchecksu
     pyhascontents = True;
     if(prefccs!=prenewfccs and not skipchecksum):
      VerbosePrintOut("File Content Checksum Error with file " + prefname + " at offset " + str(prefcontentstart));
+     VerbosePrintOut("'" + str(prefccs) + "' != " + "'" + str(prenewfccs) + "'");
      return False;
    catfp.seek(1, 1);
    il = il + 1;
@@ -4177,9 +4201,11 @@ def ArchiveFileValidate(infile, formatspecs=__file_format_list__, verbose=False,
  if(fprechecksum==catfileheadercshex):
   if(verbose):
    VerbosePrintOut("File Header Checksum Passed at offset " + str(0));
+   VerbosePrintOut("'" + str(fprechecksum) + "' == " + "'" + str(catfileheadercshex) + "'");
  else:
   if(verbose):
    VerbosePrintOut("File Header Checksum Failed at offset " + str(0));
+   VerbosePrintOut("'" + str(fprechecksum) + "' != " + "'" + str(catfileheadercshex) + "'");
    valid_archive = False;
    invalid_archive = True;
  if(verbose):
@@ -4246,9 +4272,11 @@ def ArchiveFileValidate(infile, formatspecs=__file_format_list__, verbose=False,
   if(catfcs==catnewfcs):
    if(verbose):
     VerbosePrintOut("File Header Checksum Passed at offset " + str(catfhstart));
+    VerbosePrintOut("'" + str(catfcs) + "' == " + "'" + str(catnewfcs) + "'");
   else:
    if(verbose):
     VerbosePrintOut("File Header Checksum Failed at offset " + str(catfhstart));
+    VerbosePrintOut("'" + str(catfcs) + "' != " + "'" + str(catnewfcs) + "'");
    valid_archive = False;
    invalid_archive = True;
   catfhend = catfp.tell() - 1;
@@ -4262,9 +4290,11 @@ def ArchiveFileValidate(infile, formatspecs=__file_format_list__, verbose=False,
    if(catfccs==catnewfccs):
     if(verbose):
      VerbosePrintOut("File Content Checksum Passed at offset " + str(catfcontentstart));
+     VerbosePrintOut("'" + str(catfccs) + "' == " + "'" + str(catnewfccs) + "'");
    else:
     if(verbose):
      VerbosePrintOut("File Content Checksum Failed at offset " + str(catfcontentstart));
+     VerbosePrintOut("'" + str(catfccs) + "' != " + "'" + str(catnewfccs) + "'");
     valid_archive = False;
     invalid_archive = True;
   if(verbose):
@@ -4388,7 +4418,8 @@ def ArchiveFileToArray(infile, seekstart=0, seekend=0, listonly=False, skipcheck
  fileheader = fileheader + AppendNullByte(catfileheadercshex, formatspecs[5]);
  fheadtell = len(fileheader);
  if(fprechecksum!=catfileheadercshex and not skipchecksum):
-  VerbosePrintOut("File Header Checksum Error with file " + infile + " at offset " + str(0));
+  VerbosePrintOut("File Header Checksum Error with file at offset " + str(0));
+  VerbosePrintOut("'" + str(fprechecksum) + "' != " + "'" + str(catfileheadercshex) + "'");
   return False;
  catversions = re.search(r'(.*?)(\d+)$', catstring).groups();
  catlist = {'fnumfiles': fnumfiles, 'fformat': catversions[0], 'fversion': catversions[1], 'fformatspecs': formatspecs, 'fchecksumtype': fprechecksumtype, 'fheaderchecksum': fprechecksum, 'ffilelist': {}};
@@ -4436,6 +4467,7 @@ def ArchiveFileToArray(infile, seekstart=0, seekend=0, listonly=False, skipcheck
    prenewfcs = GetFileChecksum(hout, preheaderdata[-3].lower(), True, formatspecs);
    if(prefcs!=prenewfcs and not skipchecksum):
     VerbosePrintOut("File Header Checksum Error with file " + prefname + " at offset " + str(prefhstart));
+    VerbosePrintOut("'" + str(prefcs) + "' != " + "'" + str(prenewfcs) + "'");
     return False;
     valid_archive = False;
     invalid_archive = True;
@@ -4449,6 +4481,7 @@ def ArchiveFileToArray(infile, seekstart=0, seekend=0, listonly=False, skipcheck
     pyhascontents = True;
     if(prefccs!=prenewfccs and not skipchecksum):
      VerbosePrintOut("File Content Checksum Error with file " + prefname + " at offset " + str(prefcontentstart));
+     VerbosePrintOut("'" + str(prefccs) + "' != " + "'" + str(prenewfccs) + "'");
      return False;
    catfp.seek(1, 1);
    il = il + 1;
@@ -4512,6 +4545,7 @@ def ArchiveFileToArray(infile, seekstart=0, seekend=0, listonly=False, skipcheck
   catnewfcs = GetFileChecksum(hout, catheaderdata[-3].lower(), True, formatspecs);
   if(catfcs!=catnewfcs and not skipchecksum):
    VerbosePrintOut("File Header Checksum Error with file " + catfname + " at offset " + str(catfhstart));
+   VerbosePrintOut("'" + str(catfcs) + "' != " + "'" + str(catnewfcs) + "'");
    return False;
   catfhend = catfp.tell() - 1;
   catfcontentstart = catfp.tell();
@@ -4524,6 +4558,7 @@ def ArchiveFileToArray(infile, seekstart=0, seekend=0, listonly=False, skipcheck
    pyhascontents = True;
    if(catfccs!=catnewfccs and skipchecksum):
     VerbosePrintOut("File Content Checksum Error with file " + catfname + " at offset " + str(catfcontentstart));
+    VerbosePrintOut("'" + str(catfccs) + "' != " + "'" + str(catnewfccs) + "'");
     return False;
   if(catfsize>0 and listonly):
    catfp.seek(catfsize, 1);
@@ -5965,8 +6000,8 @@ def RePackArchiveFile(infile, outfile, compression="auto", compressionlevel=None
   checksumtype="crc32";
  if(checksumtype=="none"):
   checksumtype = "";
- if(not compression or compression or compression=="catfile" or compression==formatspecs[2]):
-  compression = None;
+ if(not compression or compression=="catfile" or compression==formatspecs[2]):
+  compression = "auto";
  if(compression not in compressionlist and compression is None):
   compression = "auto";
  if(verbose):
@@ -5989,7 +6024,7 @@ def RePackArchiveFile(infile, outfile, compression="auto", compressionlevel=None
  else:
   fbasename = os.path.splitext(outfile)[0];
   fextname = os.path.splitext(outfile)[1];
-  catfp = CompressOpenFile(outfile, compressionlevel);
+  catfp = CompressOpenFile(outfile, True, compressionlevel);
  catver = formatspecs[6];
  fileheaderver = str(int(catver.replace(".", "")));
  fileheader = AppendNullByte(formatspecs[1] + fileheaderver, formatspecs[5]);

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