Tendokyu/artemis
1
0
Fork 0
mirror of synced 2025-02-15 18:02:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-on: https://gitea.tendokyu.moe/SoulGateKey/artemis/pulls/4
This commit is contained in:
SoulGateKey 2024-12-08 00:12:03 +00:00
commit d797e5f6b7
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/allnet.py
View File

@ -349,12 +349,22 @@ class AllnetServlet:
not self.config.allnet.allow_online_updates not self.config.allnet.allow_online_updates
or not self.config.allnet.update_cfg_folder 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: else:
machine = await self.data.arcade.get_machine(req.serial) 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']: 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( if path.exists(
f"{self.config.allnet.update_cfg_folder}/{req.game_id}-{req.ver.replace('.', '')}-app.ini" 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", "") self.encode = req.get("encode", "")
class AllnetDownloadOrderResponse: 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.stat = stat
self.serial = serial self.serial = serial
self.uri = uri self.uri = uri

13
titles/chuni/schema/score.py
View File

@ -179,7 +179,14 @@ class ChuniRomVersion():
# sort it by version number for easy iteration # sort it by version number for easy iteration
ChuniRomVersion.Versions = dict(sorted(all_versions.items())) 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('.') (major, minor, maint) = rom_version.split('.')
self.major = int(major) self.major = int(major)
self.minor = int(minor) 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 # for each romVersion recorded, check if it maps back the current version we are operating on
matching_rom_versions = [] matching_rom_versions = []
for v in record_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: if ChuniRomVersion(v[0]).get_int_version() == version:
matching_rom_versions += [v[0]] matching_rom_versions += [v[0]]