From 5fd966eaad501f6f0b79cd14dedf6e2672b224b6 Mon Sep 17 00:00:00 2001 From: Midorica Date: Sat, 25 Nov 2023 16:03:26 -0500 Subject: [PATCH] cxb: adding non-omni music list support --- .../cxb/data/rss2/MusicArchiveList-NonOmni.csv | Bin 0 -> 16573 bytes titles/cxb/rss2.py | 11 ++++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 titles/cxb/data/rss2/MusicArchiveList-NonOmni.csv diff --git a/titles/cxb/data/rss2/MusicArchiveList-NonOmni.csv b/titles/cxb/data/rss2/MusicArchiveList-NonOmni.csv new file mode 100644 index 0000000000000000000000000000000000000000..fd5fc58865a70bcff845c4f060812bfb1f60da24 GIT binary patch literal 16573 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 Drov_p literal 0 HcmV?d00001 diff --git a/titles/cxb/rss2.py b/titles/cxb/rss2.py index 114d142..b15deda 100644 --- a/titles/cxb/rss2.py +++ b/titles/cxb/rss2.py @@ -22,8 +22,17 @@ class CxbRevSunriseS2(CxbBase): @cached(lifetime=86400) def handle_data_music_list_request(self, data: Dict) -> Dict: + version = data["dldate"]["filetype"].split("/")[0] ret_str = "" - with open(r"titles/cxb/data/rss2/MusicArchiveList.csv") as music: + + if "10104" in version: + self.logger.warning("Game Version is Season 2 Non-Omni") + file = "titles/cxb/data/rss2/MusicArchiveList-NonOmni.csv" + else: + self.logger.warning("Game Version is Season 2 Omnimix") + file = "titles/cxb/data/rss2/MusicArchiveList.csv" + + with open(rf"{file}") as music: lines = music.readlines() for line in lines: line_split = line.split(",")