Merge pull request 'update develop' (#4) from Hay1tsme/artemis:develop into develop

Reviewed-on: https://gitea.tendokyu.moe/SoulGateKey/artemis/pulls/4

core/allnet.py

@@ -349,12 +349,22 @@ class AllnetServlet:
             not self.config.allnet.allow_online_updates
             or not self.config.allnet.update_cfg_folder
         ):
-            return PlainTextResponse(urllib.parse.unquote(urllib.parse.urlencode(vars(resp))) + "\n")
+            resp = urllib.parse.unquote(urllib.parse.urlencode(vars(resp))) + "\n"
+            if is_dfi:
+                return PlainTextResponse(
+                    self.to_dfi(resp) + b"\r\n", headers={ "Pragma": "DFI" }
+                )
+            return PlainTextResponse(resp)
 
         else:
             machine = await self.data.arcade.get_machine(req.serial)
             if not machine or not machine['ota_enable'] or not machine['is_cab'] or machine['is_blacklisted']:
-                return PlainTextResponse(urllib.parse.unquote(urllib.parse.urlencode(vars(resp))) + "\n")
+                resp = urllib.parse.unquote(urllib.parse.urlencode(vars(resp))) + "\n"
+                if is_dfi:
+                    return PlainTextResponse(
+                        self.to_dfi(resp) + b"\r\n", headers={ "Pragma": "DFI" }
+                    )
+                return PlainTextResponse(resp)
 
             if path.exists(
                 f"{self.config.allnet.update_cfg_folder}/{req.game_id}-{req.ver.replace('.', '')}-app.ini"
@@ -744,7 +754,7 @@ class AllnetDownloadOrderRequest:
         self.encode = req.get("encode", "")
 
 class AllnetDownloadOrderResponse:
-    def __init__(self, stat: int = 1, serial: str = "", uri: str = "") -> None:
+    def __init__(self, stat: int = 1, serial: str = "", uri: str = "null") -> None:
         self.stat = stat
         self.serial = serial
         self.uri = uri

titles/chuni/schema/score.py

@@ -179,7 +179,14 @@ class ChuniRomVersion():
         # sort it by version number for easy iteration
         ChuniRomVersion.Versions = dict(sorted(all_versions.items()))
 
-    def __init__(self, rom_version: str) -> None:
+    def __init__(self, rom_version: Optional[str] = None) -> None:
+        if rom_version is None:
+            self.major = 0
+            self.minor = 0
+            self.maint = 0
+            self.version = "0.00.00"
+            return
+        
         (major, minor, maint) = rom_version.split('.')
         self.major = int(major)
         self.minor = int(minor)
@@ -343,6 +350,10 @@ class ChuniScoreData(BaseData):
         # for each romVersion recorded, check if it maps back the current version we are operating on
         matching_rom_versions = []
         for v in record_versions:
+            # Do this to prevent null romVersion from causing an error in ChuniRomVersion.__init__()
+            if v[0] is None:
+                continue
+            
             if ChuniRomVersion(v[0]).get_int_version() == version:
                 matching_rom_versions += [v[0]]