PyCatFile 0.28.2__tar.gz → 0.28.4__tar.gz

{pycatfile-0.28.2 → pycatfile-0.28.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyCatFile
-Version: 0.28.2
+Version: 0.28.4
 Summary: A tar like file format name archivefile.
 Home-page: https://github.com/GameMaker2k/PyCatFile
 Download-URL: https://github.com/GameMaker2k/PyCatFile/archive/master.tar.gz

{pycatfile-0.28.2 → pycatfile-0.28.4}/PyCatFile.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyCatFile
-Version: 0.28.2
+Version: 0.28.4
 Summary: A tar like file format name archivefile.
 Home-page: https://github.com/GameMaker2k/PyCatFile
 Download-URL: https://github.com/GameMaker2k/PyCatFile/archive/master.tar.gz

{pycatfile-0.28.2 → pycatfile-0.28.4}/catfile.py

@@ -14,7 +14,7 @@
     Copyright 2018-2026 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2026 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: catfile.py - Last Update: 2/4/2026 Ver. 0.28.2 RC 1  - Author: cooldude2k $
+    $FileInfo: catfile.py - Last Update: 2/6/2026 Ver. 0.28.4 RC 1  - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes

{pycatfile-0.28.2 → pycatfile-0.28.4}/catfile_py3.py

@@ -13,7 +13,7 @@
     Copyright 2018-2026 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2026 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: catfile_py3.py - Last Update: 2/4/2026 Ver. 0.28.2 RC 1 - Author: cooldude2k $
+    $FileInfo: catfile_py3.py - Last Update: 2/6/2026 Ver. 0.28.4 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import annotations

{pycatfile-0.28.2 → pycatfile-0.28.4}/pycatfile.py

@@ -14,7 +14,7 @@
     Copyright 2018-2026 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2026 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: pycatfile.py - Last Update: 2/4/2026 Ver. 0.28.2 RC 1  - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 2/6/2026 Ver. 0.28.4 RC 1  - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -661,12 +661,12 @@ __project__ = __program_name__
 __program_alt_name__ = __program_name__
 __project_url__ = "https://github.com/GameMaker2k/PyCatFile"
 __project_release_url__ = __project_url__+"/releases/latest"
-__version_info__ = (0, 28, 2, "RC 1", 1)
-__version_date_info__ = (2026, 2, 4, "RC 1", 1)
+__version_info__ = (0, 28, 4, "RC 1", 1)
+__version_date_info__ = (2026, 2, 6, "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: 0b462ea867ddeffa504f4cde09368c3c9e5af310 $"
+__revision_id__ = "$Id: a87c7aadb79d3eebf05d8e955d7294c74e99a96e $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-" + str(__version_date_info__[4])
@@ -4646,7 +4646,7 @@ def ReadFileHeaderDataWoSize(fp, delimiter=_default_delim(None)):
     return first_two + headerdata
 
 
-def ReadFileHeaderDataWithContent(fp, listonly=False, uncompress=True, skipchecksum=False, formatspecs=__file_format_dict__, saltkey=None):
+def ReadFileHeaderDataWithContent(fp, listonly=False, contentasfile=False, uncompress=True, skipchecksum=False, formatspecs=__file_format_dict__, saltkey=None):
     if(not hasattr(fp, "read")):
         return False
     delimiter = formatspecs['format_delimiter']
@@ -4663,15 +4663,41 @@ def ReadFileHeaderDataWithContent(fp, listonly=False, uncompress=True, skipcheck
     fcs = HeaderOut[-2].lower()
     fccs = HeaderOut[-1].lower()
     fsize = int(HeaderOut[7], 16)
-    fcompression = HeaderOut[14]
-    fcsize = int(HeaderOut[15], 16)
-    fseeknextfile = HeaderOut[26]
-    fjsontype = HeaderOut[27]
-    fjsonlen = int(HeaderOut[28], 16)
-    fjsonsize = int(HeaderOut[29], 16)
-    fjsonchecksumtype = HeaderOut[30]
-    fjsonchecksum = HeaderOut[31]
-    fjsoncontent = {}
+    fcompression = HeaderOut[17]
+    fcsize = int(HeaderOut[18], 16)
+    fseeknextfile = HeaderOut[28]
+    fjsontype = HeaderOut[29]
+    fjsonlen = int(HeaderOut[30], 16)
+    fjsonsize = int(HeaderOut[31], 16)
+    fjsonchecksumtype = HeaderOut[32]
+    fjsonchecksum = HeaderOut[33]
+    fextrasize = int(HeaderOut[34], 16)
+    fextrafields = int(HeaderOut[35], 16)
+    fextrafieldslist = []
+    extrastart = 36
+    extraend = extrastart + fextrafields
+    while(extrastart < extraend):
+        fextrafieldslist.append(HeaderOut[extrastart])
+        extrastart = extrastart + 1
+    fvendorfieldslist = []
+    fvendorfields = 0;
+    if((len(HeaderOut) - 4)>extraend):
+        extrastart = extraend
+        extraend = len(HeaderOut) - 4
+        while(extrastart < extraend):
+            fvendorfieldslist.append(HeaderOut[extrastart])
+            extrastart = extrastart + 1
+            fvendorfields = fvendorfields + 1
+    if(fextrafields==1):
+        try:
+            fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
+            fextrafields = len(fextrafieldslist)
+        except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+            try:
+                fextrafieldslist = json.loads(fextrafieldslist[0])
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                pass
+    fjstart = fp.tell()
     if(fjsontype=="json"):
         fjsoncontent = {}
         fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
@@ -4738,31 +4764,37 @@ def ReadFileHeaderDataWithContent(fp, listonly=False, uncompress=True, skipcheck
                 except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
                     pass
     fp.seek(len(delimiter), 1)
+    fjend = fp.tell() - 1
     jsonfcs = GetFileChecksum(fprejsoncontent, fjsonchecksumtype, True, formatspecs, saltkey)
     if(not CheckChecksums(fjsonchecksum, jsonfcs) and not skipchecksum):
         VerbosePrintOut("File JSON Data Checksum Error with file " +
                         fname + " at offset " + str(fheaderstart))
         VerbosePrintOut("'" + fjsonchecksum + "' != " + "'" + jsonfcs + "'")
         return False
-    fp.seek(len(delimiter), 1)
+    fcs = HeaderOut[-2].lower()
+    fccs = HeaderOut[-1].lower()
     newfcs = GetHeaderChecksum(HeaderOut[:-2], HeaderOut[-4].lower(), True, formatspecs, saltkey)
-    HeaderOut.append(fjsoncontent)
     if(fcs != newfcs and not skipchecksum):
         VerbosePrintOut("File Header Checksum Error with file " +
                         fname + " at offset " + str(fheaderstart))
         VerbosePrintOut("'" + fcs + "' != " + "'" + newfcs + "'")
         return False
+    fhend = fp.tell() - 1
+    fcontentstart = fp.tell()
     fcontents = MkTempFile()
+    pyhascontents = False
     if(fsize > 0 and not listonly):
         if(fcompression == "none" or fcompression == "" or fcompression == "auto"):
             fcontents.write(fp.read(fsize))
         else:
             fcontents.write(fp.read(fcsize))
+        pyhascontents = True
     elif(fsize > 0 and listonly):
         if(fcompression == "none" or fcompression == "" or fcompression == "auto"):
             fp.seek(fsize, 1)
         else:
             fp.seek(fcsize, 1)
+        pyhascontents = False
     fcontents.seek(0, 0)
     newfccs = GetFileChecksum(fcontents, HeaderOut[-3].lower(), False, formatspecs, saltkey)
     fcontents.seek(0, 0)
@@ -4776,12 +4808,15 @@ def ReadFileHeaderDataWithContent(fp, listonly=False, uncompress=True, skipcheck
     else:
         fcontents.seek(0, 0)
         if(uncompress):
-            cfcontents = UncompressFileAlt(fcontents, formatspecs)
+            cfcontents = UncompressFileAlt(
+                fcontents, formatspecs)
             cfcontents.seek(0, 0)
             fcontents = MkTempFile()
             shutil.copyfileobj(cfcontents, fcontents, length=__filebuff_size__)
             cfcontents.close()
             fcontents.seek(0, 0)
+            fccs = GetFileChecksum(fcontents, HeaderOut[-3].lower(), False, formatspecs, saltkey)
+    fcontentend = fp.tell()
     if(re.findall("^\\+([0-9]+)", fseeknextfile)):
         fseeknextasnum = int(fseeknextfile.replace("+", ""))
         if(abs(fseeknextasnum) == 0):
@@ -4799,6 +4834,9 @@ def ReadFileHeaderDataWithContent(fp, listonly=False, uncompress=True, skipcheck
         fp.seek(fseeknextasnum, 0)
     else:
         return False
+    fcontents.seek(0, 0)
+    if(not contentasfile):
+        fcontents = fcontents.read()
     HeaderOut.append(fcontents)
     return HeaderOut
 
@@ -5247,7 +5285,7 @@ def ReadFileHeaderDataWithContentToList(fp, listonly=False, contentasfile=False,
     return outlist
 
 
-def ReadFileDataWithContent(fp, filestart=0, listonly=False, uncompress=True, skipchecksum=False, formatspecs=__file_format_dict__, saltkey=None):
+def ReadFileDataWithContent(fp, filestart=0, listonly=False, contentasfile=False, uncompress=True, skipchecksum=False, formatspecs=__file_format_dict__, saltkey=None):
     if(not hasattr(fp, "read")):
         return False
     delimiter = formatspecs['format_delimiter']
@@ -5285,8 +5323,8 @@ def ReadFileDataWithContent(fp, filestart=0, listonly=False, uncompress=True, sk
                         "'" + newfcs + "'")
         return False
     fnumfiles = int(inheader[8], 16)
-    outfseeknextfile = inheaderdata[9]
-    fjsonsize = int(inheaderdata[12], 16)
+    outfseeknextfile = inheader[9]
+    fjsonsize = int(inheader[12], 16)
     fjsonchecksumtype = inheader[13]
     fjsonchecksum = inheader[14]
     fp.read(fjsonsize)
@@ -5311,7 +5349,7 @@ def ReadFileDataWithContent(fp, filestart=0, listonly=False, uncompress=True, sk
     countnum = 0
     flist = []
     while(countnum < fnumfiles):
-        HeaderOut = ReadFileHeaderDataWithContent(fp, listonly, uncompress, skipchecksum, formatspecs, saltkey)
+        HeaderOut = ReadFileHeaderDataWithContent(fp, listonly, contentasfile, uncompress, skipchecksum, formatspecs, saltkey)
         if(len(HeaderOut) == 0):
             break
         flist.append(HeaderOut)