From 5708f48db809375c50168deba629094277a58aeb Mon Sep 17 00:00:00 2001
From: Rilic <me@rilic.red>
Date: Sun, 23 Jul 2023 22:22:18 +0100
Subject: [PATCH] Finish Dolphin importer, fix cache reader bug

---
 src/importer/sources/dolphin_source.py | 31 +++++++++++++-------------
 src/utils/dolphin_cache_reader.py      |  7 +++---
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/importer/sources/dolphin_source.py b/src/importer/sources/dolphin_source.py
index 6398295..2609939 100644
--- a/src/importer/sources/dolphin_source.py
+++ b/src/importer/sources/dolphin_source.py
@@ -17,6 +17,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+from pathlib import Path
 from time import time
 
 from src import shared
@@ -36,23 +37,25 @@ class DolphinIterator(SourceIterator):
         games_data = cache_reader.get_games()
 
         for game_data in games_data:
-            print(game_data["file_name"])
-
             # Build game
-            game = Game(values)
             values = {
                 "source": self.source.id,
                 "added": added_time,
-                #    "name": item["label"],
-                #    "game_id": self.source.game_id_format.format(game_id=game_id),
-                #    "executable": self.source.executable_format.format(
-                #        rom_path=item["path"],
-                #        core_path=core_path,
-                #    ),
+                "name": Path(game_data["file_name"]).stem,
+                "game_id": self.source.game_id_format.format(
+                    game_id=game_data["game_id"]
+                ),
+                "executable": self.source.executable_format.format(
+                    rom_path=game_data["file_path"],
+                ),
             }
 
             game = Game(values)
-            additional_data = {}
+
+            image_path = Path(
+                self.source.cache_location["covers"] / (game_data["game_id"] + ".png")
+            )
+            additional_data = {"local_image_path": image_path}
 
             yield (game, additional_data)
 
@@ -68,15 +71,13 @@ class DolphinSource(Source):
             shared.flatpak_dir / "org.DolphinEmu.dolphin-emu" / "cache" / "dolphin-emu",
             shared.home / ".cache" / "dolphin-emu",
         ),
-        paths={
-            "cache_file": (False, "gamelist.cache"),
-        },
+        paths={"cache_file": (False, "gamelist.cache"), "covers": (True, "GameCovers")},
     )
 
     @property
     def executable_format(self):
-        self.config_location.resolve()
-        is_flatpak = self.data_location.root.is_relative_to(shared.flatpak_dir)
+        self.cache_location.resolve()
+        is_flatpak = self.cache_location.root.is_relative_to(shared.flatpak_dir)
         base = "flatpak run org.DolphinEmu.dolphin-emu" if is_flatpak else "dolphin-emu"
         args = '-e "{rom_path}"'
         return f"{base} {args}"
diff --git a/src/utils/dolphin_cache_reader.py b/src/utils/dolphin_cache_reader.py
index 8c997ea..fe4b361 100644
--- a/src/utils/dolphin_cache_reader.py
+++ b/src/utils/dolphin_cache_reader.py
@@ -1,10 +1,11 @@
 """Reads the Dolphin game database, stored in a binary format"""
-# Copyright 2022 strycore - Lutris
+# Copyright 2022-2023 strycore - Lutris
+# Copyright 2023 Rilic
 
 import logging
 from pathlib import Path
 
-SUPPORTED_CACHE_VERSION = 20
+SUPPORTED_CACHE_VERSION = 24
 
 
 def get_hex_string(string):
@@ -29,7 +30,7 @@ class DolphinCacheReader:
         "file_name": "s",
         "file_size": 8,
         "volume_size": 8,
-        "volume_size_is_accurate": 1,
+        "volume_size_type": 4,
         "is_datel_disc": 1,
         "is_nkit": 1,
         "short_names": "a",