🚧 More fixes

src/importer/importer.py

@@ -3,6 +3,7 @@ import logging
 from gi.repository import Adw, Gio, Gtk
 from requests import HTTPError
 
+import src.shared as shared
 from src.utils.create_dialog import create_dialog
 from src.utils.steamgriddb import SGDBAuthError, SGDBError, SGDBHelper
 from src.utils.task import Task
@@ -16,7 +17,6 @@ class Importer:
     import_statuspage = None
     import_dialog = None
 
-    win = None
     sources = None
 
     n_games_added = 0
@@ -27,8 +27,7 @@ class Importer:
     sgdb_cancellable = None
     sgdb_error = None
 
-    def __init__(self, win):
-        self.win = win
+    def __init__(self):
         self.sources = set()
 
     @property
@@ -82,7 +81,7 @@ class Importer:
             modal=True,
             default_width=350,
             default_height=-1,
-            transient_for=self.win,
+            transient_for=shared.win,
             deletable=False,
         )
         self.import_dialog.present()
@@ -123,14 +122,14 @@ class Importer:
 
             # Avoid duplicates
             if (
-                game.game_id in self.win.games
-                and not self.win.games[game.game_id].removed
+                game.game_id in shared.win.games
+                and not shared.win.games[game.game_id].removed
             ):
                 continue
 
             # Register game
             logging.info("New game registered %s (%s)", game.name, game.game_id)
-            self.win.games[game.game_id] = game
+            shared.win.games[game.game_id] = game
             game.save()
             self.n_games_added += 1
 
@@ -156,7 +155,7 @@ class Importer:
         """SGDB query code"""
         game, *_rest = data
         game.set_loading(1)
-        sgdb = SGDBHelper(self.win)
+        sgdb = SGDBHelper()
         try:
             sgdb.conditionaly_update_cover(game)
         except SGDBAuthError as error:
@@ -208,12 +207,12 @@ class Importer:
             # The variable is the number of games
             toast.set_title(_("{} games imported").format(self.n_games_added))
 
-        self.win.toast_overlay.add_toast(toast)
+        shared.win.toast_overlay.add_toast(toast)
 
     def create_sgdb_error_dialog(self):
         """SGDB error dialog"""
         create_dialog(
-            self.win,
+            shared.win,
             _("Couldn't Connect to SteamGridDB"),
             str(self.sgdb_error),
             "open_preferences",
@@ -221,7 +220,7 @@ class Importer:
         ).connect("response", self.dialog_response_callback, "sgdb")
 
     def open_preferences(self, page=None, expander_row=None):
-        self.win.get_application().on_preferences_action(
+        shared.win.get_application().on_preferences_action(
             page_name=page, expander_row=expander_row
         )
 

src/importer/source.py

@@ -3,7 +3,6 @@ from collections.abc import Iterable, Iterator, Sized
 from typing import Optional
 
 from src.game import Game
-from src.window import CartridgesWindow
 
 
 class SourceIterator(Iterator, Sized):
@@ -33,14 +32,9 @@ class SourceIterator(Iterator, Sized):
 class Source(Iterable):
     """Source of games. E.g an installed app with a config file that lists game directories"""
 
-    win: "CartridgesWindow" = None
     name: str
     variant: str
 
-    def __init__(self, win) -> None:
-        super().__init__()
-        self.win = win
-
     @property
     def full_name(self) -> str:
         """The source's full name"""

src/importer/sources/lutris_source.py

@@ -4,6 +4,7 @@ from sqlite3 import connect
 from time import time
 from pathlib import Path
 
+import src.shared as shared
 from src.game import Game
 from src.importer.source import Source, SourceIterator
 from src.utils.decorators import replaced_by_path, replaced_by_schema_key
@@ -41,7 +42,7 @@ class LutrisSourceIterator(SourceIterator):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.import_steam = self.source.win.schema.get_boolean("lutris-import-steam")
+        self.import_steam = shared.schema.get_boolean("lutris-import-steam")
         self.db_location = self.source.location / "pga.db"
         self.db_connection = connect(self.db_location)
         self.db_request_params = {"import_steam": self.import_steam}
@@ -77,13 +78,12 @@ class LutrisSourceIterator(SourceIterator):
             "executable": self.source.executable_format.format(game_id=row[2]),
             "developer": None,  # TODO get developer metadata on Lutris
         }
-        game = Game(self.source.win, values, allow_side_effects=False)
+        game = Game(values, allow_side_effects=False)
 
         # Save official image
         image_path = self.source.location / "covers" / "coverart" / f"{row[2]}.jpg"
         if image_path.exists():
-            resized = resize_cover(self.source.win, image_path)
-            save_cover(self.source.win, values["game_id"], resized)
+            save_cover(values["game_id"], resize_cover(image_path))
 
         return game
 

src/importer/sources/steam_source.py

@@ -84,7 +84,7 @@ class SteamSourceIterator(SourceIterator):
             "game_id": self.source.game_id_format.format(game_id=appid),
             "executable": self.source.executable_format.format(game_id=appid),
         }
-        game = Game(self.source.win, values, allow_side_effects=False)
+        game = Game(values, allow_side_effects=False)
 
         # Add official cover image
         cover_path = (
@@ -94,9 +94,7 @@ class SteamSourceIterator(SourceIterator):
             / f"{appid}_library_600x900.jpg"
         )
         if cover_path.is_file():
-            save_cover(
-                self.source.win, game.game_id, resize_cover(self.source.win, cover_path)
-            )
+            save_cover(game.game_id, resize_cover(cover_path))
 
         # Get online metadata
         # TODO move to its own manager