Update pyarchivefile.py

GameMaker2k · Feb 13, 2025 · 8a211bb · 8a211bb
1 parent af322f9
commit 8a211bb
Showing 1 changed file with 28 additions and 26 deletions.
diff --git a/pyarchivefile.py b/pyarchivefile.py
@@ -2225,20 +2225,21 @@ def ReadFileHeaderDataWithContentToArray(fp, listonly=False, contentasfile=True,
                 fextrafieldslist = json.loads(fextrafieldslist[0])
             except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
                 pass
-    fjsoncontent = {}
-    fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
-    if(fjsonsize > 0):
-        try:
-            fjsoncontent = json.loads(base64.b64decode(fprejsoncontent).decode("UTF-8"))
-        except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+    if(fjsontype=="json"):
+        fjsoncontent = {}
+        fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+        if(fjsonsize > 0):
             try:
-                fjsoncontent = json.loads(fprejsoncontent.decode("UTF-8"))
+                fjsoncontent = json.loads(base64.b64decode(fprejsoncontent).decode("UTF-8"))
             except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
-                fprejsoncontent = ""
-                fjsoncontent = {}
-    else:
-        fprejsoncontent = ""
-        fjsoncontent = {}
+                try:
+                    fjsoncontent = json.loads(fprejsoncontent.decode("UTF-8"))
+                except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                    fprejsoncontent = ""
+                    fjsoncontent = {}
+        else:
+            fprejsoncontent = ""
+            fjsoncontent = {}
     fp.seek(len(delimiter), 1)
     fcs = HeaderOut[-2].lower()
     fccs = HeaderOut[-1].lower()
@@ -2377,20 +2378,21 @@ def ReadFileHeaderDataWithContentToList(fp, listonly=False, contentasfile=False,
                 fextrafieldslist = json.loads(fextrafieldslist[0])
             except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
                 pass
-    fjsoncontent = {}
-    fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
-    if(fjsonsize > 0):
-        try:
-            fjsoncontent = json.loads(base64.b64decode(fprejsoncontent).decode("UTF-8"))
-        except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+    if(fjsontype=="json"):
+        fjsoncontent = {}
+        fprejsoncontent = fp.read(fjsonsize).decode("UTF-8")
+        if(fjsonsize > 0):
             try:
-                fjsoncontent = json.loads(fprejsoncontent.decode("UTF-8"))
+                fjsoncontent = json.loads(base64.b64decode(fprejsoncontent).decode("UTF-8"))
             except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
-                fprejsoncontent = ""
-                fjsoncontent = ""
-    else:
-        fprejsoncontent = ""
-        fjsoncontent = ""
+                try:
+                    fjsoncontent = json.loads(fprejsoncontent.decode("UTF-8"))
+                except (binascii.Error, json.decoder.JSONDecodeError, UnicodeDecodeError):
+                    fprejsoncontent = ""
+                    fjsoncontent = {}
+        else:
+            fprejsoncontent = ""
+            fjsoncontent = {}
     fp.seek(len(delimiter), 1)
     fcs = HeaderOut[-2].lower()
     fccs = HeaderOut[-1].lower()
@@ -6973,7 +6975,7 @@ def ArchiveFileSeekToFileName(infile, fmttype="auto", seekfile=None, listonly=Fa
             prefjsonsize = int(preheaderdata[29], 16)
             prefjoutfprejsoncontent = fp.read(prefjsonsize).decode("UTF-8")
             if(prefjsonsize <= 0):
-                prefjoutfprejsoncontent = "".encode()
+                prefjoutfprejsoncontent = ""
             fp.seek(len(formatspecs['format_delimiter']), 1)
             prefextrasize = int(preheaderdata[30], 16)
             prefextrafields = int(preheaderdata[31], 16)
@@ -7615,7 +7617,7 @@ def ArchiveFileToArray(infile, fmttype="auto", seekstart=0, seekend=0, listonly=
             prefjsonsize = int(preheaderdata[29], 16)
             prefjoutfprejsoncontent = fp.read(prefjsonsize).decode("UTF-8")
             if(prefjsonsize <= 0):
-                prefjoutfprejsoncontent = "".encode()
+                prefjoutfprejsoncontent = ""
             fp.seek(len(formatspecs['format_delimiter']), 1)
             prefextrasize = int(preheaderdata[30], 16)
             prefextrafields = int(preheaderdata[31], 16)