Per-version URI/Host (#66)

Allows setting allnet uri/host response based on things like version, config files, and other factors to accommodate a wider range of potential setups under the same roof. This DOES require all titles to adopt a new structure but it's documented and should hopefully be somewhat intuitive.

Co-authored-by: Hay1tsme <kevin@hay1ts.me>
Reviewed-on: https://gitea.tendokyu.moe/Hay1tsme/artemis/pulls/66
Co-authored-by: Kevin Trocolli <pitok236@gmail.com>
Co-committed-by: Kevin Trocolli <pitok236@gmail.com>

titles/cxb/base.py

@@ -3,13 +3,12 @@ import json
 from decimal import Decimal
 from base64 import b64encode
 from typing import Any, Dict, List
-from hashlib import md5
-from datetime import datetime
+from os import path
 
 from core.config import CoreConfig
-from titles.cxb.config import CxbConfig
-from titles.cxb.const import CxbConstants
-from titles.cxb.database import CxbData
+from .config import CxbConfig
+from .const import CxbConstants
+from .database import CxbData
 
 from threading import Thread
 
@@ -22,6 +21,13 @@ class CxbBase:
         self.logger = logging.getLogger("cxb")
         self.version = CxbConstants.VER_CROSSBEATS_REV
 
+    def _get_data_contents(self, folder: str, filetype: str, encoding: str = None, subfolder: str = "") -> List[str]:
+        if path.exists(f"titles/cxb/data/{folder}/{subfolder}{filetype}.csv"):
+            with open(f"titles/cxb/data/{folder}/{subfolder}{filetype}.csv", encoding=encoding) as f:
+                return f.readlines()
+        
+        return []
+
     def handle_action_rpreq_request(self, data: Dict) -> Dict:
         return {}
 
@@ -192,7 +198,7 @@ class CxbBase:
             ).decode("utf-8")
         )
 
-    def task_generateIndexData(versionindex):
+    def task_generateIndexData(self, versionindex: List[str], uid: int):
         try:
             v_profile = self.data.profile.get_profile_index(0, uid, self.version)
             v_profile_data = v_profile["data"]
@@ -274,7 +280,7 @@ class CxbBase:
             thread_ScoreData.start()
 
         for v in index:
-            thread_IndexData = Thread(target=CxbBase.task_generateIndexData(versionindex))
+            thread_IndexData = Thread(target=CxbBase.task_generateIndexData(self, versionindex, uid))
             thread_IndexData.start()
 
         return {"index": index, "data": data1, "version": versionindex}

titles/cxb/index.py

@@ -1,4 +1,5 @@
 from twisted.web.http import Request
+import traceback
 from twisted.web import resource, server
 from twisted.internet import reactor, endpoints
 import yaml
@@ -7,18 +8,20 @@ import re
 import inflection
 import logging, coloredlogs
 from logging.handlers import TimedRotatingFileHandler
-from typing import Dict, Tuple
+from typing import Dict, Tuple, List
 from os import path
 
 from core.config import CoreConfig
-from titles.cxb.config import CxbConfig
-from titles.cxb.const import CxbConstants
-from titles.cxb.rev import CxbRev
-from titles.cxb.rss1 import CxbRevSunriseS1
-from titles.cxb.rss2 import CxbRevSunriseS2
+from core.title import BaseServlet
+from core.utils import Utils
+from .config import CxbConfig
+from .const import CxbConstants
+from .rev import CxbRev
+from .rss1 import CxbRevSunriseS1
+from .rss2 import CxbRevSunriseS2
 
 
-class CxbServlet(resource.Resource):
+class CxbServlet(BaseServlet):
     def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None:
         self.isLeaf = True
         self.cfg_dir = cfg_dir
@@ -61,9 +64,7 @@ class CxbServlet(resource.Resource):
         ]
 
     @classmethod
-    def get_allnet_info(
-        cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str
-    ) -> Tuple[bool, str, str]:
+    def is_game_enabled(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> bool:
         game_cfg = CxbConfig()
         if path.exists(f"{cfg_dir}/{CxbConstants.CONFIG_NAME}"):
             game_cfg.update(
@@ -71,51 +72,36 @@ class CxbServlet(resource.Resource):
             )
 
         if not game_cfg.server.enable:
-            return (False, "", "")
-
-        if core_cfg.server.is_develop:
+            return False
+        
+        return True
+    
+    def get_allnet_info(self, game_code: str, game_ver: int, keychip: str) -> Tuple[str, str]:
+        if not self.core_cfg.server.is_using_proxy and Utils.get_title_port_ssl(self.core_cfg) != 443:
             return (
-                True,
-                f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/",
+                f"https://{self.core_cfg.title.hostname}:{self.core_cfg.title.port_ssl}",
                 "",
             )
 
-        return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", "")
+        return (f"https://{self.core_cfg.title.hostname}", "")
+    
+    def get_endpoint_matchers(self) -> Tuple[List[Tuple[str, str, Dict]], List[Tuple[str, str, Dict]]]:
+        return (
+            [], 
+            [
+                ("handle_data", "/data", {}),
+                ("handle_action", "/action", {}),
+                ("handle_action", "/v2/action", {}),
+                ("handle_auth", "/auth", {}),
+            ]
+        )
 
-    def setup(self):
-        if self.game_cfg.server.enable:
-            endpoints.serverFromString(
-                reactor,
-                f"tcp:{self.game_cfg.server.port}:interface={self.core_cfg.server.listen_address}",
-            ).listen(server.Site(CxbServlet(self.core_cfg, self.cfg_dir)))
-
-            if self.core_cfg.server.is_develop and self.game_cfg.server.ssl_enable:
-                endpoints.serverFromString(
-                    reactor,
-                    f"ssl:{self.game_cfg.server.port_secure}"
-                    f":interface={self.core_cfg.server.listen_address}:privateKey={self.game_cfg.server.ssl_key}:"
-                    f"certKey={self.game_cfg.server.ssl_cert}",
-                ).listen(server.Site(CxbServlet(self.core_cfg, self.cfg_dir)))
-
-                self.logger.info(
-                    f"Ready on ports {self.game_cfg.server.port} & {self.game_cfg.server.port_secure}"
-                )
-            else:
-                self.logger.info(f"Ready on port {self.game_cfg.server.port}")
-
-    def render_POST(self, request: Request):
-        version = 0
-        internal_ver = 0
-        func_to_find = ""
-        cmd = ""
-        subcmd = ""
-        req_url = request.uri.decode()
-        url_split = req_url.split("/")
+    def preprocess(self, req: Request) -> Dict:
         try:
-            req_bytes = request.content.getvalue()
+            req_bytes = req.content.getvalue()
         except:
-            req_bytes = request.content.read().decode("utf-8")
-
+            req_bytes = req.content.read() # Can we just use this one?
+        
         try:
             req_json: Dict = json.loads(req_bytes)
 
@@ -127,42 +113,49 @@ class CxbServlet(resource.Resource):
 
             except Exception as f:
                 self.logger.warning(
-                    f"Error decoding json: {e} / {f} - {req_url} - {req_bytes}"
+                    f"Error decoding json to /data endpoint: {e} / {f} - {req_bytes}"
                 )
                 return b""
+        
+        return req_json
 
+    def handle_data(self, request: Request, game_code: str, matchers: Dict) -> bytes:
+        req_json = self.preprocess(request)
+        func_to_find = "handle_data_"
+        version_string = "Base"
+        internal_ver = 0
+        
         if req_json == {}:
-            self.logger.warning(f"Empty json request to {req_url}")
+            self.logger.warning(f"Empty json request to /data")
+            return b""
+        
+        if (
+            not type(req_json["dldate"]) is dict
+            or "filetype" not in req_json["dldate"]
+        ):
+            self.logger.warning(f"Malformed dldate request: {req_json}")
             return b""
 
-        cmd = url_split[len(url_split) - 1]
-        subcmd = list(req_json.keys())[0]
+        filetype = req_json["dldate"]["filetype"]
+        filetype_split = filetype.split("/")
 
-        if subcmd == "dldate":
-            if (
-                not type(req_json["dldate"]) is dict
-                or "filetype" not in req_json["dldate"]
-            ):
-                self.logger.warning(f"Malformed dldate request: {req_url} {req_json}")
-                return b""
+        if len(filetype_split) < 2 or not filetype_split[0].isnumeric():
+            self.logger.warning(f"Malformed dldate request: {req_json}")
+            return b""
 
-            filetype = req_json["dldate"]["filetype"]
-            filetype_split = filetype.split("/")
-            version = int(filetype_split[0])
-            filetype_inflect_split = inflection.underscore(filetype).split("/")
+        version = int(filetype_split[0])
+        filename = filetype_split[len(filetype_split) - 1]
 
-            match = re.match(
-                "^([A-Za-z]*)(\d\d\d\d)$", filetype_split[len(filetype_split) - 1]
-            )
-            if match:
-                subcmd = f"{inflection.underscore(match.group(1))}xxxx"
-            else:
-                subcmd = f"{filetype_inflect_split[len(filetype_inflect_split) - 1]}"
+        match = re.match(
+            "^([A-Za-z]*)(\d\d\d\d)$", filetype_split[len(filetype_split) - 1]
+        )
+        if match:
+            func_to_find += f"{inflection.underscore(match.group(1))}xxxx"
         else:
-            filetype = subcmd
-
-        func_to_find = f"handle_{cmd}_{subcmd}_request"
-
+            func_to_find += f"{inflection.underscore(filename)}"
+        
+        func_to_find += "_request"
+        
         if version <= 10102:
             version_string = "Rev"
             internal_ver = CxbConstants.VER_CROSSBEATS_REV
@@ -175,23 +168,81 @@ class CxbServlet(resource.Resource):
             version_string = "Rev SunriseS2"
             internal_ver = CxbConstants.VER_CROSSBEATS_REV_SUNRISE_S2
 
-        else:
-            version_string = "Base"
-
-        self.logger.info(f"{version_string} Request {req_url} -> {filetype}")
+        if not hasattr(self.versions[internal_ver], func_to_find):
+            self.logger.warn(f"{version_string} has no handler for filetype {filetype}")
+            return ""
+        
+        self.logger.info(f"{version_string} request for filetype {filetype}")
         self.logger.debug(req_json)
 
+        handler = getattr(self.versions[internal_ver], func_to_find)
+        
         try:
-            handler = getattr(self.versions[internal_ver], func_to_find)
             resp = handler(req_json)
 
-        except AttributeError as e:
-            self.logger.warning(f"Unhandled {version_string} request {req_url} - {e}")
-            resp = {}
-
         except Exception as e:
-            self.logger.error(f"Error handling {version_string} method {req_url} - {e}")
-            raise
-
+            self.logger.error(f"Error handling request for file {filetype} - {e}")
+            if self.logger.level == logging.DEBUG:
+                traceback.print_exception(e, limit=1)
+                with open("{0}/{1}.log".format(self.core_cfg.server.log_dir, "cxb"), "a") as f:
+                    traceback.print_exception(e, limit=1, file=f)
+            return ""
+        
         self.logger.debug(f"{version_string} Response {resp}")
         return json.dumps(resp, ensure_ascii=False).encode("utf-8")
+
+    def handle_action(self, request: Request, game_code: str, matchers: Dict) -> bytes:
+        req_json = self.preprocess(request)
+        subcmd = list(req_json.keys())[0]
+        func_to_find = f"handle_action_{subcmd}_request"
+        
+        if not hasattr(self.versions[0], func_to_find):
+            self.logger.warn(f"No handler for action {subcmd} request")
+            return ""
+        
+        self.logger.info(f"Action {subcmd} Request")
+        self.logger.debug(req_json)
+
+        handler = getattr(self.versions[0], func_to_find)
+        
+        try:
+            resp = handler(req_json)
+
+        except Exception as e:
+            self.logger.error(f"Error handling action {subcmd} request - {e}")
+            if self.logger.level == logging.DEBUG:
+                traceback.print_exception(e, limit=1)
+                with open("{0}/{1}.log".format(self.core_cfg.server.log_dir, "cxb"), "a") as f:
+                    traceback.print_exception(e, limit=1, file=f)
+            return ""
+        
+        self.logger.debug(f"Response {resp}")
+        return json.dumps(resp, ensure_ascii=False).encode("utf-8")
+
+    def handle_auth(self, request: Request, game_code: str, matchers: Dict) -> bytes:
+        req_json = self.preprocess(request)
+        subcmd = list(req_json.keys())[0]
+        func_to_find = f"handle_auth_{subcmd}_request"
+        
+        if not hasattr(self.versions[0], func_to_find):
+            self.logger.warn(f"No handler for auth {subcmd} request")
+            return ""
+        
+        self.logger.info(f"Action {subcmd} Request")
+        self.logger.debug(req_json)
+
+        handler = getattr(self.versions[0], func_to_find)
+        
+        try:
+            resp = handler(req_json)
+
+        except Exception as e:
+            self.logger.error(f"Error handling auth {subcmd} request - {e}")
+            if self.logger.level == logging.DEBUG:
+                traceback.print_exception(e, limit=1)
+                with open("{0}/{1}.log".format(self.core_cfg.server.log_dir, "cxb"), "a") as f:
+                    traceback.print_exception(e, limit=1, file=f)
+            return ""
+        
+        self.logger.debug(f"Response {resp}")
+        return json.dumps(resp, ensure_ascii=False).encode("utf-8")

titles/cxb/rev.py

@@ -7,9 +7,9 @@ from datetime import datetime
 
 from core.config import CoreConfig
 from core.data import Data, cached
-from titles.cxb.config import CxbConfig
-from titles.cxb.base import CxbBase
-from titles.cxb.const import CxbConstants
+from .config import CxbConfig
+from .base import CxbBase
+from .const import CxbConstants
 
 
 class CxbRev(CxbBase):
@@ -47,7 +47,7 @@ class CxbRev(CxbBase):
     @cached(lifetime=86400)
     def handle_data_music_list_request(self, data: Dict) -> Dict:
         ret_str = ""
-        with open(r"titles/cxb/rev_data/MusicArchiveList.csv") as music:
+        with open(r"titles/cxb/data/rss/MusicArchiveList.csv") as music:
             lines = music.readlines()
             for line in lines:
                 line_split = line.split(",")
@@ -59,7 +59,7 @@ class CxbRev(CxbBase):
     def handle_data_item_list_icon_request(self, data: Dict) -> Dict:
         ret_str = "\r\n#ItemListIcon\r\n"
         with open(
-            r"titles/cxb/rev_data/Item/ItemArchiveList_Icon.csv", encoding="utf-8"
+            r"titles/cxb/data/rss/Item/ItemArchiveList_Icon.csv", encoding="utf-8"
         ) as item:
             lines = item.readlines()
             for line in lines:
@@ -70,7 +70,7 @@ class CxbRev(CxbBase):
     def handle_data_item_list_skin_notes_request(self, data: Dict) -> Dict:
         ret_str = "\r\n#ItemListSkinNotes\r\n"
         with open(
-            r"titles/cxb/rev_data/Item/ItemArchiveList_SkinNotes.csv", encoding="utf-8"
+            r"titles/cxb/data/rss/Item/ItemArchiveList_SkinNotes.csv", encoding="utf-8"
         ) as item:
             lines = item.readlines()
             for line in lines:
@@ -81,7 +81,7 @@ class CxbRev(CxbBase):
     def handle_data_item_list_skin_effect_request(self, data: Dict) -> Dict:
         ret_str = "\r\n#ItemListSkinEffect\r\n"
         with open(
-            r"titles/cxb/rev_data/Item/ItemArchiveList_SkinEffect.csv", encoding="utf-8"
+            r"titles/cxb/data/rss/Item/ItemArchiveList_SkinEffect.csv", encoding="utf-8"
         ) as item:
             lines = item.readlines()
             for line in lines:
@@ -92,7 +92,7 @@ class CxbRev(CxbBase):
     def handle_data_item_list_skin_bg_request(self, data: Dict) -> Dict:
         ret_str = "\r\n#ItemListSkinBg\r\n"
         with open(
-            r"titles/cxb/rev_data/Item/ItemArchiveList_SkinBg.csv", encoding="utf-8"
+            r"titles/cxb/data/rss/Item/ItemArchiveList_SkinBg.csv", encoding="utf-8"
         ) as item:
             lines = item.readlines()
             for line in lines:
@@ -103,7 +103,7 @@ class CxbRev(CxbBase):
     def handle_data_item_list_title_request(self, data: Dict) -> Dict:
         ret_str = "\r\n#ItemListTitle\r\n"
         with open(
-            r"titles/cxb/rev_data/Item/ItemList_Title.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss/Item/ItemList_Title.csv", encoding="shift-jis"
         ) as item:
             lines = item.readlines()
             for line in lines:
@@ -114,7 +114,7 @@ class CxbRev(CxbBase):
     def handle_data_shop_list_music_request(self, data: Dict) -> Dict:
         ret_str = "\r\n#ShopListMusic\r\n"
         with open(
-            r"titles/cxb/rev_data/Shop/ShopList_Music.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss/Shop/ShopList_Music.csv", encoding="shift-jis"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -125,7 +125,7 @@ class CxbRev(CxbBase):
     def handle_data_shop_list_icon_request(self, data: Dict) -> Dict:
         ret_str = "\r\n#ShopListIcon\r\n"
         with open(
-            r"titles/cxb/rev_data/Shop/ShopList_Icon.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss/Shop/ShopList_Icon.csv", encoding="shift-jis"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -136,7 +136,7 @@ class CxbRev(CxbBase):
     def handle_data_shop_list_title_request(self, data: Dict) -> Dict:
         ret_str = "\r\n#ShopListTitle\r\n"
         with open(
-            r"titles/cxb/rev_data/Shop/ShopList_Title.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss/Shop/ShopList_Title.csv", encoding="shift-jis"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -156,7 +156,7 @@ class CxbRev(CxbBase):
     def handle_data_shop_list_sale_request(self, data: Dict) -> Dict:
         ret_str = "\r\n#ShopListSale\r\n"
         with open(
-            r"titles/cxb/rev_data/Shop/ShopList_Sale.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss/Shop/ShopList_Sale.csv", encoding="shift-jis"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -171,7 +171,7 @@ class CxbRev(CxbBase):
         extra_num = int(data["dldate"]["filetype"][-4:])
         ret_str = ""
         with open(
-            rf"titles/cxb/rev_data/Ex000{extra_num}.csv", encoding="shift-jis"
+            rf"titles/cxb/data/rss/Ex000{extra_num}.csv", encoding="shift-jis"
         ) as stage:
             lines = stage.readlines()
             for line in lines:
@@ -187,7 +187,7 @@ class CxbRev(CxbBase):
     @cached(lifetime=86400)
     def handle_data_news_list_request(self, data: Dict) -> Dict:
         ret_str = ""
-        with open(r"titles/cxb/rev_data/NewsList.csv", encoding="UTF-8") as news:
+        with open(r"titles/cxb/data/rss/NewsList.csv", encoding="UTF-8") as news:
             lines = news.readlines()
             for line in lines:
                 ret_str += f"{line[:-1]}\r\n"
@@ -199,7 +199,7 @@ class CxbRev(CxbBase):
     @cached(lifetime=86400)
     def handle_data_license_request(self, data: Dict) -> Dict:
         ret_str = ""
-        with open(r"titles/cxb/rev_data/License_Offline.csv", encoding="UTF-8") as lic:
+        with open(r"titles/cxb/data/rss/License_Offline.csv", encoding="UTF-8") as lic:
             lines = lic.readlines()
             for line in lines:
                 ret_str += f"{line[:-1]}\r\n"
@@ -209,7 +209,7 @@ class CxbRev(CxbBase):
     def handle_data_course_list_request(self, data: Dict) -> Dict:
         ret_str = ""
         with open(
-            r"titles/cxb/rev_data/Course/CourseList.csv", encoding="UTF-8"
+            r"titles/cxb/data/rss/Course/CourseList.csv", encoding="UTF-8"
         ) as course:
             lines = course.readlines()
             for line in lines:
@@ -222,7 +222,7 @@ class CxbRev(CxbBase):
         extra_num = int(data["dldate"]["filetype"][-4:])
         ret_str = ""
         with open(
-            rf"titles/cxb/rev_data/Course/Cs000{extra_num}.csv", encoding="shift-jis"
+            rf"titles/cxb/data/rss/Course/Cs000{extra_num}.csv", encoding="shift-jis"
         ) as course:
             lines = course.readlines()
             for line in lines:
@@ -233,7 +233,7 @@ class CxbRev(CxbBase):
     def handle_data_mission_list_request(self, data: Dict) -> Dict:
         ret_str = ""
         with open(
-            r"titles/cxb/rev_data/MissionList.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss/MissionList.csv", encoding="shift-jis"
         ) as mission:
             lines = mission.readlines()
             for line in lines:
@@ -250,7 +250,7 @@ class CxbRev(CxbBase):
     def handle_data_event_list_request(self, data: Dict) -> Dict:
         ret_str = ""
         with open(
-            r"titles/cxb/rev_data/Event/EventArchiveList.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss/Event/EventArchiveList.csv", encoding="shift-jis"
         ) as mission:
             lines = mission.readlines()
             for line in lines:
@@ -292,7 +292,7 @@ class CxbRev(CxbBase):
     def handle_data_event_stamp_list_request(self, data: Dict) -> Dict:
         ret_str = ""
         with open(
-            r"titles/cxb/rev_data/Event/EventStampList.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss/Event/EventStampList.csv", encoding="shift-jis"
         ) as event:
             lines = event.readlines()
             for line in lines:

titles/cxb/rss1.py

@@ -7,9 +7,9 @@ from datetime import datetime
 
 from core.config import CoreConfig
 from core.data import Data, cached
-from titles.cxb.config import CxbConfig
-from titles.cxb.base import CxbBase
-from titles.cxb.const import CxbConstants
+from .config import CxbConfig
+from .base import CxbBase
+from .const import CxbConstants
 
 
 class CxbRevSunriseS1(CxbBase):
@@ -23,7 +23,7 @@ class CxbRevSunriseS1(CxbBase):
     @cached(lifetime=86400)
     def handle_data_music_list_request(self, data: Dict) -> Dict:
         ret_str = ""
-        with open(r"titles/cxb/rss1_data/MusicArchiveList.csv") as music:
+        with open(r"titles/cxb/data/rss1/MusicArchiveList.csv") as music:
             lines = music.readlines()
             for line in lines:
                 line_split = line.split(",")
@@ -36,7 +36,7 @@ class CxbRevSunriseS1(CxbBase):
         # ItemListIcon load
         ret_str = "#ItemListIcon\r\n"
         with open(
-            r"titles/cxb/rss1_data/Item/ItemList_Icon.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss1/Item/ItemList_Icon.csv", encoding="shift-jis"
         ) as item:
             lines = item.readlines()
             for line in lines:
@@ -45,7 +45,7 @@ class CxbRevSunriseS1(CxbBase):
         # ItemListTitle load
         ret_str += "\r\n#ItemListTitle\r\n"
         with open(
-            r"titles/cxb/rss1_data/Item/ItemList_Title.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss1/Item/ItemList_Title.csv", encoding="shift-jis"
         ) as item:
             lines = item.readlines()
             for line in lines:
@@ -58,7 +58,7 @@ class CxbRevSunriseS1(CxbBase):
         # ShopListIcon load
         ret_str = "#ShopListIcon\r\n"
         with open(
-            r"titles/cxb/rss1_data/Shop/ShopList_Icon.csv", encoding="utf-8"
+            r"titles/cxb/data/rss1/Shop/ShopList_Icon.csv", encoding="utf-8"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -67,7 +67,7 @@ class CxbRevSunriseS1(CxbBase):
         # ShopListMusic load
         ret_str += "\r\n#ShopListMusic\r\n"
         with open(
-            r"titles/cxb/rss1_data/Shop/ShopList_Music.csv", encoding="utf-8"
+            r"titles/cxb/data/rss1/Shop/ShopList_Music.csv", encoding="utf-8"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -76,7 +76,7 @@ class CxbRevSunriseS1(CxbBase):
         # ShopListSale load
         ret_str += "\r\n#ShopListSale\r\n"
         with open(
-            r"titles/cxb/rss1_data/Shop/ShopList_Sale.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss1/Shop/ShopList_Sale.csv", encoding="shift-jis"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -85,7 +85,7 @@ class CxbRevSunriseS1(CxbBase):
         # ShopListSkinBg load
         ret_str += "\r\n#ShopListSkinBg\r\n"
         with open(
-            r"titles/cxb/rss1_data/Shop/ShopList_SkinBg.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss1/Shop/ShopList_SkinBg.csv", encoding="shift-jis"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -94,7 +94,7 @@ class CxbRevSunriseS1(CxbBase):
         # ShopListSkinEffect load
         ret_str += "\r\n#ShopListSkinEffect\r\n"
         with open(
-            r"titles/cxb/rss1_data/Shop/ShopList_SkinEffect.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss1/Shop/ShopList_SkinEffect.csv", encoding="shift-jis"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -103,7 +103,7 @@ class CxbRevSunriseS1(CxbBase):
         # ShopListSkinNotes load
         ret_str += "\r\n#ShopListSkinNotes\r\n"
         with open(
-            r"titles/cxb/rss1_data/Shop/ShopList_SkinNotes.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss1/Shop/ShopList_SkinNotes.csv", encoding="shift-jis"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -112,7 +112,7 @@ class CxbRevSunriseS1(CxbBase):
         # ShopListTitle load
         ret_str += "\r\n#ShopListTitle\r\n"
         with open(
-            r"titles/cxb/rss1_data/Shop/ShopList_Title.csv", encoding="utf-8"
+            r"titles/cxb/data/rss1/Shop/ShopList_Title.csv", encoding="utf-8"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -140,7 +140,7 @@ class CxbRevSunriseS1(CxbBase):
     @cached(lifetime=86400)
     def handle_data_news_list_request(self, data: Dict) -> Dict:
         ret_str = ""
-        with open(r"titles/cxb/rss1_data/NewsList.csv", encoding="UTF-8") as news:
+        with open(r"titles/cxb/data/rss1/NewsList.csv", encoding="UTF-8") as news:
             lines = news.readlines()
             for line in lines:
                 ret_str += f"{line[:-1]}\r\n"
@@ -155,7 +155,7 @@ class CxbRevSunriseS1(CxbBase):
     @cached(lifetime=86400)
     def handle_data_random_music_list_request(self, data: Dict) -> Dict:
         ret_str = ""
-        with open(r"titles/cxb/rss1_data/MusicArchiveList.csv") as music:
+        with open(r"titles/cxb/data/rss1/MusicArchiveList.csv") as music:
             lines = music.readlines()
             count = 0
             for line in lines:
@@ -169,7 +169,7 @@ class CxbRevSunriseS1(CxbBase):
     @cached(lifetime=86400)
     def handle_data_license_request(self, data: Dict) -> Dict:
         ret_str = ""
-        with open(r"titles/cxb/rss1_data/License.csv", encoding="UTF-8") as licenses:
+        with open(r"titles/cxb/data/rss1/License.csv", encoding="UTF-8") as licenses:
             lines = licenses.readlines()
             for line in lines:
                 ret_str += f"{line[:-1]}\r\n"
@@ -179,7 +179,7 @@ class CxbRevSunriseS1(CxbBase):
     def handle_data_course_list_request(self, data: Dict) -> Dict:
         ret_str = ""
         with open(
-            r"titles/cxb/rss1_data/Course/CourseList.csv", encoding="UTF-8"
+            r"titles/cxb/data/rss1/Course/CourseList.csv", encoding="UTF-8"
         ) as course:
             lines = course.readlines()
             for line in lines:
@@ -191,7 +191,7 @@ class CxbRevSunriseS1(CxbBase):
         extra_num = int(data["dldate"]["filetype"][-4:])
         ret_str = ""
         with open(
-            rf"titles/cxb/rss1_data/Course/Cs{extra_num}.csv", encoding="shift-jis"
+            rf"titles/cxb/data/rss1/Course/Cs{extra_num}.csv", encoding="shift-jis"
         ) as course:
             lines = course.readlines()
             for line in lines:
@@ -229,7 +229,7 @@ class CxbRevSunriseS1(CxbBase):
     def handle_data_partnerxxxx_request(self, data: Dict) -> Dict:
         partner_num = int(data["dldate"]["filetype"][-4:])
         ret_str = f"{partner_num},,{partner_num},1,10000,\r\n"
-        with open(r"titles/cxb/rss1_data/Partner0000.csv") as partner:
+        with open(r"titles/cxb/data/rss1/Partner0000.csv") as partner:
             lines = partner.readlines()
             for line in lines:
                 ret_str += f"{line[:-1]}\r\n"

titles/cxb/rss2.py

@@ -7,9 +7,9 @@ from datetime import datetime
 
 from core.config import CoreConfig
 from core.data import Data, cached
-from titles.cxb.config import CxbConfig
-from titles.cxb.base import CxbBase
-from titles.cxb.const import CxbConstants
+from .config import CxbConfig
+from .base import CxbBase
+from .const import CxbConstants
 
 
 class CxbRevSunriseS2(CxbBase):
@@ -23,7 +23,7 @@ class CxbRevSunriseS2(CxbBase):
     @cached(lifetime=86400)
     def handle_data_music_list_request(self, data: Dict) -> Dict:
         ret_str = ""
-        with open(r"titles/cxb/rss2_data/MusicArchiveList.csv") as music:
+        with open(r"titles/cxb/data/rss2/MusicArchiveList.csv") as music:
             lines = music.readlines()
             for line in lines:
                 line_split = line.split(",")
@@ -36,7 +36,7 @@ class CxbRevSunriseS2(CxbBase):
         # ItemListIcon load
         ret_str = "#ItemListIcon\r\n"
         with open(
-            r"titles/cxb/rss2_data/Item/ItemList_Icon.csv", encoding="utf-8"
+            r"titles/cxb/data/rss2/Item/ItemList_Icon.csv", encoding="utf-8"
         ) as item:
             lines = item.readlines()
             for line in lines:
@@ -45,7 +45,7 @@ class CxbRevSunriseS2(CxbBase):
         # ItemListTitle load
         ret_str += "\r\n#ItemListTitle\r\n"
         with open(
-            r"titles/cxb/rss2_data/Item/ItemList_Title.csv", encoding="utf-8"
+            r"titles/cxb/data/rss2/Item/ItemList_Title.csv", encoding="utf-8"
         ) as item:
             lines = item.readlines()
             for line in lines:
@@ -58,7 +58,7 @@ class CxbRevSunriseS2(CxbBase):
         # ShopListIcon load
         ret_str = "#ShopListIcon\r\n"
         with open(
-            r"titles/cxb/rss2_data/Shop/ShopList_Icon.csv", encoding="utf-8"
+            r"titles/cxb/data/rss2/Shop/ShopList_Icon.csv", encoding="utf-8"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -67,7 +67,7 @@ class CxbRevSunriseS2(CxbBase):
         # ShopListMusic load
         ret_str += "\r\n#ShopListMusic\r\n"
         with open(
-            r"titles/cxb/rss2_data/Shop/ShopList_Music.csv", encoding="utf-8"
+            r"titles/cxb/data/rss2/Shop/ShopList_Music.csv", encoding="utf-8"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -76,7 +76,7 @@ class CxbRevSunriseS2(CxbBase):
         # ShopListSale load
         ret_str += "\r\n#ShopListSale\r\n"
         with open(
-            r"titles/cxb/rss2_data/Shop/ShopList_Sale.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss2/Shop/ShopList_Sale.csv", encoding="shift-jis"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -85,7 +85,7 @@ class CxbRevSunriseS2(CxbBase):
         # ShopListSkinBg load
         ret_str += "\r\n#ShopListSkinBg\r\n"
         with open(
-            r"titles/cxb/rss2_data/Shop/ShopList_SkinBg.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss2/Shop/ShopList_SkinBg.csv", encoding="shift-jis"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -94,7 +94,7 @@ class CxbRevSunriseS2(CxbBase):
         # ShopListSkinEffect load
         ret_str += "\r\n#ShopListSkinEffect\r\n"
         with open(
-            r"titles/cxb/rss2_data/Shop/ShopList_SkinEffect.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss2/Shop/ShopList_SkinEffect.csv", encoding="shift-jis"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -103,7 +103,7 @@ class CxbRevSunriseS2(CxbBase):
         # ShopListSkinNotes load
         ret_str += "\r\n#ShopListSkinNotes\r\n"
         with open(
-            r"titles/cxb/rss2_data/Shop/ShopList_SkinNotes.csv", encoding="shift-jis"
+            r"titles/cxb/data/rss2/Shop/ShopList_SkinNotes.csv", encoding="shift-jis"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -112,7 +112,7 @@ class CxbRevSunriseS2(CxbBase):
         # ShopListTitle load
         ret_str += "\r\n#ShopListTitle\r\n"
         with open(
-            r"titles/cxb/rss2_data/Shop/ShopList_Title.csv", encoding="utf-8"
+            r"titles/cxb/data/rss2/Shop/ShopList_Title.csv", encoding="utf-8"
         ) as shop:
             lines = shop.readlines()
             for line in lines:
@@ -140,7 +140,7 @@ class CxbRevSunriseS2(CxbBase):
     @cached(lifetime=86400)
     def handle_data_news_list_request(self, data: Dict) -> Dict:
         ret_str = ""
-        with open(r"titles/cxb/rss2_data/NewsList.csv", encoding="UTF-8") as news:
+        with open(r"titles/cxb/data/rss2/NewsList.csv", encoding="UTF-8") as news:
             lines = news.readlines()
             for line in lines:
                 ret_str += f"{line[:-1]}\r\n"
@@ -155,7 +155,7 @@ class CxbRevSunriseS2(CxbBase):
     @cached(lifetime=86400)
     def handle_data_random_music_list_request(self, data: Dict) -> Dict:
         ret_str = ""
-        with open(r"titles/cxb/rss2_data/MusicArchiveList.csv") as music:
+        with open(r"titles/cxb/data/rss2/MusicArchiveList.csv") as music:
             lines = music.readlines()
             count = 0
             for line in lines:
@@ -169,7 +169,7 @@ class CxbRevSunriseS2(CxbBase):
     @cached(lifetime=86400)
     def handle_data_license_request(self, data: Dict) -> Dict:
         ret_str = ""
-        with open(r"titles/cxb/rss2_data/License.csv", encoding="UTF-8") as licenses:
+        with open(r"titles/cxb/data/rss2/License.csv", encoding="UTF-8") as licenses:
             lines = licenses.readlines()
             for line in lines:
                 ret_str += f"{line[:-1]}\r\n"
@@ -179,7 +179,7 @@ class CxbRevSunriseS2(CxbBase):
     def handle_data_course_list_request(self, data: Dict) -> Dict:
         ret_str = ""
         with open(
-            r"titles/cxb/rss2_data/Course/CourseList.csv", encoding="UTF-8"
+            r"titles/cxb/data/rss2/Course/CourseList.csv", encoding="UTF-8"
         ) as course:
             lines = course.readlines()
             for line in lines:
@@ -191,7 +191,7 @@ class CxbRevSunriseS2(CxbBase):
         extra_num = int(data["dldate"]["filetype"][-4:])
         ret_str = ""
         with open(
-            rf"titles/cxb/rss2_data/Course/Cs{extra_num}.csv", encoding="shift-jis"
+            rf"titles/cxb/data/rss2/Course/Cs{extra_num}.csv", encoding="shift-jis"
         ) as course:
             lines = course.readlines()
             for line in lines:
@@ -229,7 +229,7 @@ class CxbRevSunriseS2(CxbBase):
     def handle_data_partnerxxxx_request(self, data: Dict) -> Dict:
         partner_num = int(data["dldate"]["filetype"][-4:])
         ret_str = f"{partner_num},,{partner_num},1,10000,\r\n"
-        with open(r"titles/cxb/rss2_data/Partner0000.csv") as partner:
+        with open(r"titles/cxb/data/rss2/Partner0000.csv") as partner:
             lines = partner.readlines()
             for line in lines:
                 ret_str += f"{line[:-1]}\r\n"