3
2
forked from Dniel97/artemis

sao: remove hostname/port config, fix allnet uri

This commit is contained in:
Hay1tsme 2023-11-09 11:55:49 -05:00
parent 580a9faae8
commit 8560c05928
3 changed files with 10 additions and 18 deletions

View File

@ -1,6 +1,9 @@
server:
hostname: "localhost"
enable: True
loglevel: "info"
port: 9000
auto_register: True
crypt:
enable: False
key: ""
iv: ""

View File

@ -5,12 +5,6 @@ class SaoServerConfig:
def __init__(self, parent_config: "SaoConfig"):
self.__config = parent_config
@property
def hostname(self) -> str:
return CoreConfig.get_config_field(
self.__config, "sao", "server", "hostname", default="localhost"
)
@property
def enable(self) -> bool:
return CoreConfig.get_config_field(
@ -25,12 +19,6 @@ class SaoServerConfig:
)
)
@property
def port(self) -> int:
return CoreConfig.get_config_field(
self.__config, "sao", "server", "port", default=9000
)
@property
def auto_register(self) -> bool:
"""

View File

@ -52,7 +52,7 @@ class SaoServlet(BaseServlet):
def get_endpoint_matchers(self) -> Tuple[List[Tuple[str, str, Dict]], List[Tuple[str, str, Dict]]]:
return (
[],
[("render_POST", "/dev/proto/if/{category}/{endpoint}", {})]
[("render_POST", "/{datecode}/proto/if/{category}/{endpoint}", {})]
)
@classmethod
@ -70,9 +70,10 @@ class SaoServlet(BaseServlet):
return True
def get_allnet_info(self, game_code: str, game_ver: int, keychip: str) -> Tuple[str, str]:
tport = Utils.get_title_port(self.core_cfg)
return (
f"http://{self.game_cfg.server.hostname}:{self.game_cfg.server.port}/",
f"{self.game_cfg.server.hostname}/",
f"http://{self.core_cfg.title.hostname}:{tport}/",
f"{self.core_cfg.title.hostname}/",
)
def get_mucha_info(self, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str]: