Merge pull request #125 from kra-mo/remove-allow-side-effects

Various cleanups

data/gtk/preferences.blp

@@ -233,7 +233,7 @@ template $PreferencesWindow : Adw.PreferencesWindow {
         Adw.ActionRow flatpak_data_action_row {
           title: _("Install Location");
 
-          Button flatpak_config_file_chooser_button {
+          Button flatpak_data_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
           }

src/details_window.py

@@ -169,8 +169,7 @@ class DetailsWindow(Adw.Window):
                     "hidden": False,
                     "source": "imported",
                     "added": int(time()),
-                },
+                }
-                allow_side_effects=False,
             )
 
         else:

src/game.py

@@ -61,7 +61,7 @@ class Game(Gtk.Box):
     game_cover = None
     version = 0
 
-    def __init__(self, data, allow_side_effects=True, **kwargs):
+    def __init__(self, data, **kwargs):
         super().__init__(**kwargs)
 
         self.win = shared.win
@@ -70,9 +70,6 @@ class Game(Gtk.Box):
 
         self.update_values(data)
 
-        if allow_side_effects:
-            self.win.games[self.game_id] = self
-
         self.set_play_icon()
 
         self.event_contoller_motion = Gtk.EventControllerMotion.new()

src/importer/sources/bottles_source.py

@@ -54,7 +54,7 @@ class BottlesSourceIterator(SourceIterator):
                     bottle_name=entry["bottle"]["name"], game_name=entry["name"]
                 ),
             }
-            game = Game(values, allow_side_effects=False)
+            game = Game(values)
 
             # Get official cover path
             try:

src/importer/sources/flatpak_source.py

@@ -100,7 +100,7 @@ class FlatpakSourceIterator(SourceIterator):
                     flatpak_id=flatpak_id
                 ),
             }
-            game = Game(values, allow_side_effects=False)
+            game = Game(values)
 
             additional_data = {}
             if icon_name := desktop_values["Icon"]:

src/importer/sources/heroic_source.py

@@ -90,7 +90,7 @@ class HeroicSourceIterator(SourceIterator):
             ),
             "executable": self.source.executable_format.format(app_name=app_name),
         }
-        game = Game(values, allow_side_effects=False)
+        game = Game(values)
 
         # Get the image path from the heroic cache
         # Filenames are derived from the URL that heroic used to get the file

src/importer/sources/itch_source.py

@@ -71,7 +71,7 @@ class ItchSourceIterator(SourceIterator):
                 "executable": self.source.executable_format.format(cave_id=row[4]),
             }
             additional_data = {"online_cover_url": row[3] or row[2]}
-            game = Game(values, allow_side_effects=False)
+            game = Game(values)
             yield (game, additional_data)
 
         # Cleanup

src/importer/sources/legendary_source.py

@@ -62,7 +62,7 @@ class LegendarySourceIterator(SourceIterator):
         except (JSONDecodeError, OSError, KeyError):
             pass
 
-        game = Game(values, allow_side_effects=False)
+        game = Game(values)
         return (game, data)
 
     def generator_builder(self) -> Generator[SourceIterationResult, None, None]:

src/importer/sources/lutris_source.py

@@ -74,7 +74,7 @@ class LutrisSourceIterator(SourceIterator):
                 ),
                 "executable": self.source.executable_format.format(game_id=row[2]),
             }
-            game = Game(values, allow_side_effects=False)
+            game = Game(values)
 
             # Get official image path
             image_path = self.source.cache_location["coverart"] / f"{row[2]}.jpg"

src/importer/sources/steam_source.py

@@ -96,7 +96,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(values, allow_side_effects=False)
+            game = Game(values)
 
             # Add official cover image
             image_path = (

src/main.py

@@ -56,6 +56,7 @@ class CartridgesApplication(Adw.Application):
     win = None
 
     def __init__(self):
+        shared.store = Store()
         super().__init__(
             application_id=shared.APP_ID, flags=Gio.ApplicationFlags.FLAGS_NONE
         )
@@ -82,12 +83,9 @@ class CartridgesApplication(Adw.Application):
             "is-maximized", self.win, "maximized", Gio.SettingsBindFlags.DEFAULT
         )
 
-        # Create the games store ready to load games from disk
+        # Load games from disk
-        if not shared.store:
+        shared.store.add_manager(FileManager(), False)
-            shared.store = Store()
+        shared.store.add_manager(DisplayManager())
-            shared.store.add_manager(FileManager(), False)
-            shared.store.add_manager(DisplayManager())
-
         self.load_games_from_disk()
 
         # Add rest of the managers for game imports
@@ -140,7 +138,7 @@ class CartridgesApplication(Adw.Application):
         if shared.games_dir.is_dir():
             for game_file in shared.games_dir.iterdir():
                 data = json.load(game_file.open())
-                game = Game(data, allow_side_effects=False)
+                game = Game(data)
                 shared.store.add_game(game, {"skip_save": True})
 
     def on_about_action(self, *_args):

src/preferences.py

@@ -83,7 +83,7 @@ class PreferencesWindow(Adw.PreferencesWindow):
 
     flatpak_expander_row = Gtk.Template.Child()
     flatpak_data_action_row = Gtk.Template.Child()
-    flatpak_config_file_chooser_button = Gtk.Template.Child()
+    flatpak_data_file_chooser_button = Gtk.Template.Child()
     flatpak_import_launchers_switch = Gtk.Template.Child()
 
     sgdb_key_group = Gtk.Template.Child()
@@ -212,7 +212,7 @@ class PreferencesWindow(Adw.PreferencesWindow):
         self.toast.dismiss()
 
     def remove_all_games(self, *_args):
-        for game in self.win.games.values():
+        for game in shared.store.games.values():
             if not game.removed:
                 self.removed_games.add(game)
 
@@ -225,7 +225,7 @@ class PreferencesWindow(Adw.PreferencesWindow):
 
         self.add_toast(self.toast)
 
-    def reset_app(*_args):
+    def reset_app(self, *_args):
         rmtree(shared.data_dir / "cartridges", True)
         rmtree(shared.config_dir / "cartridges", True)
         rmtree(shared.cache_dir / "cartridges", True)

src/store/managers/display_manager.py

@@ -17,7 +17,6 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from src import shared
 from src.game import Game
 from src.game_cover import GameCover
 from src.store.managers.manager import Manager
@@ -32,7 +31,6 @@ class DisplayManager(Manager):
     signals = {"update-ready"}
 
     def manager_logic(self, game: Game, _additional_data: dict) -> None:
-        shared.win.games[game.game_id] = game
         if game.get_parent():
             game.get_parent().get_parent().remove(game)
             if game.get_parent():

src/window.py

@@ -64,7 +64,6 @@ class CartridgesWindow(Adw.ApplicationWindow):
     hidden_search_entry = Gtk.Template.Child()
     hidden_search_button = Gtk.Template.Child()
 
-    games = {}
     game_covers = {}
     toasts = {}
     active_game = None
@@ -118,7 +117,7 @@ class CartridgesWindow(Adw.ApplicationWindow):
     def set_library_child(self):
         child, hidden_child = self.notice_empty, self.hidden_notice_empty
 
-        for game in self.games.values():
+        for game in shared.store.games.values():
             if game.removed or game.blacklisted:
                 continue
             if game.hidden: