Merge pull request #3368 from rommapp/copilot/fix-ra-hashes-missing-ids

fix: include games without achievements in RA hash cache

Author: gantoine

backend/handler/metadata/ra_handler.py

@@ -11,7 +11,6 @@
 from adapters.services.retroachievements import RetroAchievementsService
 from adapters.services.retroachievements_types import (
     RAGameExtendedDetails,
-    RAGameListItem,
 )
 from config import (
     REFRESH_RETROACHIEVEMENTS_CACHE_DAYS,
@@ -128,7 +127,7 @@ def parse_release_timestamp():
 class RAHandler(MetadataHandler):
     def __init__(self) -> None:
         self.ra_service = RetroAchievementsService()
-        self.HASHES_FILE_NAME = "ra_hashes.json"
+        self.HASHES_FILE_NAME = "ra_hashes_v2.json"
 
     @classmethod
     def is_enabled(cls) -> bool:
@@ -174,47 +173,44 @@ async def _days_since_last_cache_file_update(self, platform_id: int) -> int:
         file_stat = await AnyioPath(str(full_path)).stat()
         return int((time.time() - file_stat.st_mtime) / (24 * 3600))
 
-    async def _search_rom(self, rom: Rom, ra_hash: str) -> RAGameListItem | None:
+    async def _search_rom(self, rom: Rom, ra_hash: str) -> int | None:
         if not rom.platform.ra_id:
             return None
 
-        # Fetch all hashes for specific platform
-        roms: list[RAGameListItem]
+        # hash_index maps lowercase hash -> game ID for O(1) lookups
+        hash_index: dict[str, int]
         if (
             REFRESH_RETROACHIEVEMENTS_CACHE_DAYS
             <= await self._days_since_last_cache_file_update(rom.platform.id)
             or not await self._exists_cache_file(rom.platform.id)
         ):
-            # Write the roms result to a JSON file if older than REFRESH_RETROACHIEVEMENTS_CACHE_DAYS days
+            # Fetch all games (including those without achievements) and build index
             roms = await self.ra_service.get_game_list(
                 system_id=rom.platform.ra_id,
-                only_games_with_achievements=True,
+                only_games_with_achievements=False,
                 include_hashes=True,
             )
 
+            hash_index = {h.lower(): r["ID"] for r in roms for h in r.get("Hashes", ())}
+
             platform_resources_path = fs_resource_handler.get_platform_resources_path(
                 rom.platform.id
             )
 
-            json_file = json.dumps(roms, indent=4)
+            json_file = json.dumps(hash_index, indent=4)
             await fs_resource_handler.write_file(
                 json_file.encode("utf-8"),
                 platform_resources_path,
                 self.HASHES_FILE_NAME,
             )
         else:
-            # Read the roms result from the JSON file
+            # Read the hash index from the JSON file
             json_file_bytes = await fs_resource_handler.read_file(
                 self._get_hashes_file_path(rom.platform.id)
             )
-            roms = json.loads(json_file_bytes.decode("utf-8"))
-
-        ra_hash_lower = ra_hash.lower()
-        for r in roms:
-            if any(ra_hash_lower == h.lower() for h in r.get("Hashes", ())):
-                return r
+            hash_index = json.loads(json_file_bytes.decode("utf-8"))
 
-        return None
+        return hash_index.get(ra_hash.lower())
 
     def get_platform(self, slug: str) -> RAGamesPlatform:
         if slug not in RA_PLATFORM_LIST:
@@ -250,15 +246,13 @@ async def get_rom(self, rom: Rom, ra_hash: str) -> RAGameRom:
         if not ra_hash:
             return RAGameRom(ra_id=None)
 
-        ra_game_list_item = await self._search_rom(rom, ra_hash)
+        ra_game_id = await self._search_rom(rom, ra_hash)
 
-        if not ra_game_list_item:
+        if ra_game_id is None:
             return RAGameRom(ra_id=None)
 
         try:
-            rom_details = await self.ra_service.get_game_extended_details(
-                ra_game_list_item["ID"]
-            )
+            rom_details = await self.ra_service.get_game_extended_details(ra_game_id)
 
             return RAGameRom(
                 ra_id=rom_details["ID"],