Using a named tuple to store source locations

src/importer/sources/lutris_source.py

@@ -20,6 +20,7 @@
 from shutil import rmtree
 from sqlite3 import connect
 from time import time
+from typing import NamedTuple
 
 from src import shared
 from src.game import Game
@@ -51,7 +52,7 @@ class LutrisSourceIterable(SourceIterable):
             "import_steam": shared.schema.get_boolean("lutris-import-steam"),
             "import_flatpak": shared.schema.get_boolean("lutris-import-flatpak"),
         }
-        db_path = copy_db(self.source.data_location["pga.db"])
+        db_path = copy_db(self.source.locations.config["pga.db"])
         connection = connect(db_path)
         cursor = connection.execute(request, params)
 
@@ -73,7 +74,7 @@ class LutrisSourceIterable(SourceIterable):
             game = Game(values)
 
             # Get official image path
-            image_path = self.source.cache_location["coverart"] / f"{row[2]}.jpg"
+            image_path = self.source.locations.cache["coverart"] / f"{row[2]}.jpg"
             additional_data = {"local_image_path": image_path}
 
             # Produce game
@@ -83,6 +84,11 @@ class LutrisSourceIterable(SourceIterable):
         rmtree(str(db_path.parent))
 
 
+class LutrisLocations(NamedTuple):
+    config: Location
+    cache: Location
+
+
 class LutrisSource(URLExecutableSource):
     """Generic Lutris source"""
 
@@ -91,30 +97,31 @@ class LutrisSource(URLExecutableSource):
     url_format = "lutris:rungameid/{game_id}"
     available_on = {"linux"}
 
-    # FIXME possible bug: location picks ~/.var... and cache_lcoation picks ~/.local...
+    # FIXME possible bug: config picks ~/.var... and cache picks ~/.local...
 
-    data_location = Location(
-        schema_key="lutris-location",
-        candidates=(
-            shared.flatpak_dir / "net.lutris.Lutris" / "data" / "lutris",
-            shared.data_dir / "lutris",
-            shared.home / ".local" / "share" / "lutris",
+    locations = LutrisLocations(
+        Location(
+            schema_key="lutris-location",
+            candidates=(
+                shared.flatpak_dir / "net.lutris.Lutris" / "data" / "lutris",
+                shared.data_dir / "lutris",
+                shared.home / ".local" / "share" / "lutris",
+            ),
+            paths={
+                "pga.db": (False, "pga.db"),
+            },
         ),
-        paths={
-            "pga.db": (False, "pga.db"),
-        },
-    )
-
-    cache_location = Location(
-        schema_key="lutris-cache-location",
-        candidates=(
-            shared.flatpak_dir / "net.lutris.Lutris" / "cache" / "lutris",
-            shared.cache_dir / "lutris",
-            shared.home / ".cache" / "lutris",
+        Location(
+            schema_key="lutris-cache-location",
+            candidates=(
+                shared.flatpak_dir / "net.lutris.Lutris" / "cache" / "lutris",
+                shared.cache_dir / "lutris",
+                shared.home / ".cache" / "lutris",
+            ),
+            paths={
+                "coverart": (True, "coverart"),
+            },
         ),
-        paths={
-            "coverart": (True, "coverart"),
-        },
     )
 
     @property