cleanup

Author: gantoine

backend/handler/metadata/hasheous_handler.py

@@ -60,6 +60,7 @@ class HasheousRom(BaseRom):
     ra_id: NotRequired[int | None]
     ra_metadata: NotRequired[RAMetadata]
     tgdb_id: NotRequired[int | None]
+    ss_id: NotRequired[int | None]
     hasheous_metadata: NotRequired[HasheousMetadata]
 
 
@@ -431,7 +432,7 @@ def _jeu_to_ss_rom(self, rom: Rom, response: dict) -> SSRom:
         return build_ss_game(rom, jeu)
 
     async def get_ss_game(
-        self, rom: Rom, platform_ss_id: int, files: list[RomFile]
+        self, rom: Rom, platform_ss_id: int | None, files: list[RomFile]
     ) -> SSRom:
         """Fetch ScreenScraper metadata for a ROM through the Hasheous proxy.
 

backend/handler/scan_handler.py

@@ -444,7 +444,9 @@ async def fetch_hasheous_hash_match() -> HasheousRom:
                 platform.slug, get_match_files()
             )
 
-        return HasheousRom(hasheous_id=None, igdb_id=None, tgdb_id=None, ra_id=None)
+        return HasheousRom(
+            hasheous_id=None, igdb_id=None, tgdb_id=None, ra_id=None, ss_id=None
+        )
 
     _added_rom = db_rom_handler.add_rom(Rom(**rom_attrs))
     _added_rom.is_identifying = True
@@ -640,17 +642,9 @@ async def fetch_moby_rom(playmatch_rom: PlaymatchRomMatch) -> MobyGamesRom:
         return MobyGamesRom(moby_id=None)
 
     async def fetch_ss_rom(playmatch_rom: PlaymatchRomMatch) -> SSRom:
-        # When the user has no ScreenScraper credentials, fall back to fetching
-        # ScreenScraper metadata through the Hasheous proxy (credential-free).
-        ss_via_hasheous = (
-            not meta_ss_handler.is_enabled()
-            and meta_hasheous_handler.is_enabled()
-            and rom.platform_slug in HASHEOUS_PLATFORM_LIST
-        )
         if (
             MetadataSource.SS in metadata_sources
             and platform.ss_id
-            and (meta_ss_handler.is_enabled() or ss_via_hasheous)
             and (
                 newly_added
                 or scan_type == ScanType.COMPLETE
@@ -662,12 +656,12 @@ async def fetch_ss_rom(playmatch_rom: PlaymatchRomMatch) -> SSRom:
                 )
             )
         ):
-            if ss_via_hasheous:
-                if scan_type == ScanType.UPDATE and rom.ss_id:
-                    return await meta_hasheous_handler.get_ss_rom_by_id(rom, rom.ss_id)
-                return await meta_hasheous_handler.get_ss_game(
-                    rom, platform.ss_id, get_match_files()
-                )
+            # if ss_via_hasheous:
+            #     if scan_type == ScanType.UPDATE and rom.ss_id:
+            #         return await meta_hasheous_handler.get_ss_rom_by_id(rom, rom.ss_id)
+            #     return await meta_hasheous_handler.get_ss_game(
+            #         rom, platform.ss_id, get_match_files()
+            #     )
 
             # Use the ID to refetch metadata
             if scan_type == ScanType.UPDATE and rom.ss_id:
@@ -815,20 +809,20 @@ async def fetch_hasheous_rom(hasheous_rom: HasheousRom) -> HasheousRom:
             (
                 igdb_game,
                 ra_game,
+                ss_game,
             ) = await asyncio.gather(
                 meta_hasheous_handler.get_igdb_game(hasheous_rom),
                 meta_hasheous_handler.get_ra_game(hasheous_rom),
+                meta_hasheous_handler.get_ss_game(
+                    rom, platform.ss_id, get_match_files()
+                ),
             )
 
-            return HasheousRom(
-                {
-                    **hasheous_rom,
-                    **ra_game,
-                    **igdb_game,
-                }
-            )
+            return HasheousRom({**hasheous_rom, **ra_game, **igdb_game, **ss_game})
 
-        return HasheousRom(hasheous_id=None, igdb_id=None, tgdb_id=None, ra_id=None)
+        return HasheousRom(
+            hasheous_id=None, igdb_id=None, tgdb_id=None, ra_id=None, ss_id=None
+        )
 
     # Run metadata fetches concurrently
     (

frontend/src/stores/heartbeat.ts

@@ -144,12 +144,9 @@ export default defineStore("heartbeat", {
           name: "Screenscraper",
           value: "ss",
           logo_path: "/assets/scrappers/ss.png",
-          // Usable with own credentials, or credential-free via the Hasheous proxy.
-          disabled:
-            !this.value.METADATA_SOURCES?.SS_API_ENABLED &&
-            !this.value.METADATA_SOURCES?.HASHEOUS_API_ENABLED
-              ? i18n.global.t("scan.api-key-missing")
-              : "",
+          disabled: !this.value.METADATA_SOURCES?.SS_API_ENABLED
+            ? i18n.global.t("scan.api-key-missing")
+            : "",
         },
         {
           name: "Mobygames",