Merge branch 'develop' of https://gitea.tendokyu.moe/Hay1tsme/artemis into develop

This commit is contained in:
Midorica 2023-11-09 00:06:24 -05:00
commit eaf64dbd50
2 changed files with 7 additions and 3 deletions

View File

@ -1,5 +1,6 @@
import struct
from core.utils import Utils
from .base import IDZHandlerBase
from core.config import CoreConfig
from ..config import IDZConfig
@ -21,8 +22,10 @@ class IDZHandlerLoadServerInfo(IDZHandlerBase):
if self.version >= IDZConstants.VER_IDZ_210:
offset = 2
news_str = f"http://{self.core_config.title.hostname}:{self.core_config.title.port}/SDDF/230/news/news80**.txt"
err_str = f"http://{self.core_config.title.hostname}:{self.core_config.title.port}/SDDF/230/error"
t_port = Utils.get_title_port(self.core_config)
news_str = f"http://{self.core_config.title.hostname}:{t_port}/idz/news/news80**.txt"
err_str = f"http://{self.core_config.title.hostname}:{t_port}/idz/error"
len_hostname = len(self.core_config.title.hostname)
len_news = len(news_str)

View File

@ -85,7 +85,8 @@ class IDZServlet(BaseServlet):
def get_endpoint_matchers(self) -> Tuple[List[Tuple[str, str, Dict]], List[Tuple[str, str, Dict]]]:
return[
[("render_GET", "/{game}/{version}/{endpoint:.*?}", {'game': R'S...'})], # TODO: Slim this down to only the news stuff
[("render_GET", "/idz/news/{endpoint:.*?}", {}),
("render_GET", "/idz/error", {})],
[]
]