From f5d78225e3bb13f7ec20dcb30794160459beb55a Mon Sep 17 00:00:00 2001 From: zaphkito Date: Sun, 14 Apr 2024 19:51:59 +0800 Subject: [PATCH] mai2: return game code in uri --- titles/cm/base.py | 2 +- titles/mai2/base.py | 4 ++-- titles/mai2/dx.py | 4 ++-- titles/mai2/index.py | 25 ++++++++++--------------- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/titles/cm/base.py b/titles/cm/base.py index e4fd1cb..4a49832 100644 --- a/titles/cm/base.py +++ b/titles/cm/base.py @@ -51,7 +51,7 @@ class CardMakerBase: { "modelKind": 1, "type": 1, - "titleUri": f"{uri}/{self._parse_int_ver(games_ver['maimai'])}/Maimai2Servlet/", + "titleUri": f"{uri}/SDEZ/{self._parse_int_ver(games_ver['maimai'])}/Maimai2Servlet/", }, # ONGEKI { diff --git a/titles/mai2/base.py b/titles/mai2/base.py index 5a5edb9..69abb59 100644 --- a/titles/mai2/base.py +++ b/titles/mai2/base.py @@ -26,10 +26,10 @@ class Mai2Base: self.date_time_format = "%Y-%m-%d %H:%M:%S" if not self.core_config.server.is_using_proxy and Utils.get_title_port(self.core_config) != 80: - self.old_server = f"http://{self.core_config.server.hostname}:{Utils.get_title_port(cfg)}/197/MaimaiServlet/" + self.old_server = f"http://{self.core_config.server.hostname}:{Utils.get_title_port(cfg)}/SDEY/197/MaimaiServlet/" else: - self.old_server = f"http://{self.core_config.server.hostname}/197/MaimaiServlet/" + self.old_server = f"http://{self.core_config.server.hostname}/SDEY/197/MaimaiServlet/" async def handle_get_game_setting_api_request(self, data: Dict): # if reboot start/end time is not defined use the default behavior of being a few hours ago diff --git a/titles/mai2/dx.py b/titles/mai2/dx.py index ec1bf3c..0d2c874 100644 --- a/titles/mai2/dx.py +++ b/titles/mai2/dx.py @@ -18,10 +18,10 @@ class Mai2DX(Mai2Base): # DX earlier version need a efficient old server uri to work if not self.core_config.server.is_using_proxy and Utils.get_title_port(self.core_config) != 80: - self.old_server = f"http://{self.core_config.server.hostname}:{Utils.get_title_port(cfg)}/197/" + self.old_server = f"http://{self.core_config.server.hostname}:{Utils.get_title_port(cfg)}/SDEY/197/" else: - self.old_server = f"http://{self.core_config.server.hostname}/197/" + self.old_server = f"http://{self.core_config.server.hostname}/SDEY/197/" async def handle_get_game_setting_api_request(self, data: Dict): # if reboot start/end time is not defined use the default behavior of being a few hours ago diff --git a/titles/mai2/index.py b/titles/mai2/index.py index 6599d08..1346ba3 100644 --- a/titles/mai2/index.py +++ b/titles/mai2/index.py @@ -105,31 +105,26 @@ class Mai2Servlet(BaseServlet): def get_routes(self) -> List[Route]: return [ - Route("/{version:int}/MaimaiServlet/api/movie/{endpoint:str}", self.handle_movie, methods=['GET', 'POST']), - Route("/{version:int}/MaimaiServlet/old/{endpoint:str}", self.handle_old_srv), - Route("/{version:int}/MaimaiServlet/old/{endpoint:str}/{placeid:str}/{keychip:str}/{userid:int}", self.handle_old_srv_userdata), - Route("/{version:int}/MaimaiServlet/old/{endpoint:str}/{userid:int}", self.handle_old_srv_userdata), - Route("/{version:int}/MaimaiServlet/old/{endpoint:str}/{userid:int}", self.handle_old_srv_userdata), - Route("/{version:int}/MaimaiServlet/usbdl/{endpoint:str}", self.handle_usbdl), - Route("/{version:int}/MaimaiServlet/deliver/{endpoint:str}", self.handle_deliver), - Route("/{version:int}/MaimaiServlet/{endpoint:str}", self.handle_mai, methods=['POST']), + Route("/{game:str}/{version:int}/MaimaiServlet/api/movie/{endpoint:str}", self.handle_movie, methods=['GET', 'POST']), + Route("/{game:str}/{version:int}/MaimaiServlet/old/{endpoint:str}", self.handle_old_srv), + Route("/{game:str}/{version:int}/MaimaiServlet/old/{endpoint:str}/{placeid:str}/{keychip:str}/{userid:int}", self.handle_old_srv_userdata), + Route("/{game:str}/{version:int}/MaimaiServlet/old/{endpoint:str}/{userid:int}", self.handle_old_srv_userdata), + Route("/{game:str}/{version:int}/MaimaiServlet/old/{endpoint:str}/{userid:int}", self.handle_old_srv_userdata), + Route("/{game:str}/{version:int}/MaimaiServlet/usbdl/{endpoint:str}", self.handle_usbdl), + Route("/{game:str}/{version:int}/MaimaiServlet/deliver/{endpoint:str}", self.handle_deliver), + Route("/{game:str}/{version:int}/MaimaiServlet/{endpoint:str}", self.handle_mai, methods=['POST']), Route("/{game:str}/{version:int}/Maimai2Servlet/{endpoint:str}", self.handle_mai2, methods=['POST']), ] def get_allnet_info(self, game_code: str, game_ver: int, keychip: str) -> Tuple[str, str]: - if game_code in {Mai2Constants.GAME_CODE_DX, Mai2Constants.GAME_CODE_DX_INT}: - path = f"{game_code}/{game_ver}" - else: - path = game_ver - if not self.core_cfg.server.is_using_proxy and Utils.get_title_port(self.core_cfg) != 80: return ( - f"http://{self.core_cfg.server.hostname}:{Utils.get_title_port(self.core_cfg)}/{path}/", + f"http://{self.core_cfg.server.hostname}:{Utils.get_title_port(self.core_cfg)}/{game_code}/{game_ver}/", f"{self.core_cfg.server.hostname}", ) return ( - f"http://{self.core_cfg.server.hostname}/{path}/", + f"http://{self.core_cfg.server.hostname}/{game_code}/{game_ver}/", f"{self.core_cfg.server.hostname}", )