From 6f8fc6afedf4eabb5e2ec26c6cab3fddefbc0d48 Mon Sep 17 00:00:00 2001 From: Georges-Antoine Assi Date: Fri, 28 Jul 2023 19:45:58 -0400 Subject: [PATCH] Improved tag detection and support --- backend/handler/igdb_handler.py | 2 +- backend/utils/__init__.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/handler/igdb_handler.py b/backend/handler/igdb_handler.py index fe8342ff7..40cc68870 100644 --- a/backend/handler/igdb_handler.py +++ b/backend/handler/igdb_handler.py @@ -191,4 +191,4 @@ class TwitchAuth(): if not self._is_token_valid(): log.warning("Twitch token invalid: fetching a new one") self._update_twitch_token() - return self.token \ No newline at end of file + return self.token diff --git a/backend/utils/__init__.py b/backend/utils/__init__.py index f173fca5a..f8dc7576a 100644 --- a/backend/utils/__init__.py +++ b/backend/utils/__init__.py @@ -70,7 +70,8 @@ def parse_tags(file_name: str) -> tuple: reg = REGIONS_BY_SHORTCODE[tag.lower()] elif tag.lower() in REGIONS_NAME_KEYS: reg = tag - elif "rev" in tag.lower(): + # Explicit support for "Rev A/Rev 1" tags + elif "rev " in tag.lower(): rev = tag.split(" ")[1] else: other_tags.append(tag) @@ -78,7 +79,8 @@ def parse_tags(file_name: str) -> tuple: def get_file_name_with_no_tags(file_name: str) -> str: - return re.sub("[\(\[].*?[\)\]]", "", file_name.split(".")[0]) + # Use .rsplit to remove only the file extension + return re.sub("[\(\[].*?[\)\]]", "", file_name.rsplit(".", 1)[0]) def get_file_extension(rom: dict) -> str: