Update pycatfile.py

GameMaker2k · Feb 6, 2025 · 5106536 · 5106536
1 parent 310c964
commit 5106536
Showing 1 changed file with 32 additions and 8 deletions.
diff --git a/pycatfile.py b/pycatfile.py
@@ -2225,7 +2225,10 @@ def ReadFileHeaderDataWithContentToArray(fp, listonly=False, contentasfile=True,
             fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
             fextrafields = len(fextrafieldslist)
         except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
-            pass
+            try:
+                fextrafieldslist = json.loads(fextrafieldslist[0])
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                pass
     fjsoncontent = {}
     fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
     if(len(fjsoncontent) > 0):
@@ -2364,7 +2367,10 @@ def ReadFileHeaderDataWithContentToList(fp, listonly=False, contentasfile=False,
             fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
             fextrafields = len(fextrafieldslist)
         except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
-            pass
+            try:
+                fextrafieldslist = json.loads(fextrafieldslist[0])
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                pass
     fjsoncontent = {}
     fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
     if(len(fjsoncontent) > 0):
@@ -2543,7 +2549,10 @@ def ReadFileDataWithContentToArray(fp, seekstart=0, seekend=0, listonly=False, c
             fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
             fnumextrafields = len(fextrafieldslist)
         except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
-            pass
+            try:
+                fextrafieldslist = json.loads(fextrafieldslist[0])
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                pass
     if(curloc > 0):
         fp.seek(curloc, 0)
     formversion = re.findall("([\\d]+)", formstring)
@@ -2684,7 +2693,10 @@ def ReadFileDataWithContentToList(fp, seekstart=0, seekend=0, listonly=False, co
             fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
             fnumextrafields = len(fextrafieldslist)
         except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
-            pass
+            try:
+                fextrafieldslist = json.loads(fextrafieldslist[0])
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                pass
     if(curloc > 0):
         fp.seek(curloc, 0)
     formversion = re.findall("([\\d]+)", formstring)
@@ -6555,7 +6567,10 @@ def CatFileSeekToFileNum(infile, fmttype="auto", seekto=0, listonly=False, conte
             fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
             fnumextrafields = len(fextrafieldslist)
         except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
-            pass
+            try:
+                fextrafieldslist = json.loads(fextrafieldslist[0])
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                pass
     if(curloc > 0):
         fp.seek(curloc, 0)
     formversion = re.findall("([\\d]+)", formstring)
@@ -6852,7 +6867,10 @@ def CatFileSeekToFileName(infile, fmttype="auto", seekfile=None, listonly=False,
             fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
             fnumextrafields = len(fextrafieldslist)
         except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
-            pass
+            try:
+                fextrafieldslist = json.loads(fextrafieldslist[0])
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                pass
     if(curloc > 0):
         fp.seek(curloc, 0)
     formversion = re.findall("([\\d]+)", formstring)
@@ -7482,7 +7500,10 @@ def CatFileToArray(infile, fmttype="auto", seekstart=0, seekend=0, listonly=Fals
             fextrafieldslist = json.loads(base64.b64decode(fextrafieldslist[0]).decode("UTF-8"))
             fnumextrafields = len(fextrafieldslist)
         except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
-            pass
+            try:
+                fextrafieldslist = json.loads(fextrafieldslist[0])
+            except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                pass
     if(curloc > 0):
         fp.seek(curloc, 0)
     formversion = re.findall("([\\d]+)", formstring)
@@ -7646,7 +7667,10 @@ def CatFileToArray(infile, fmttype="auto", seekstart=0, seekend=0, listonly=Fals
                 extrafieldslist = json.loads(base64.b64decode(extrafieldslist[0]).decode("UTF-8"))
                 outfextrafields = len(extrafieldslist)
             except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
-                pass
+                try:
+                    fextrafieldslist = json.loads(fextrafieldslist[0])
+                except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                    pass
         outfcs = inheaderdata[-2].lower()
         outfccs = inheaderdata[-1].lower()
         infcs = GetHeaderChecksum(