From 8ddb110cbbe0c49073fb94a6f9551e2fb3c36e06 Mon Sep 17 00:00:00 2001
From: GeoffreyCoulaud <geoffrey.coulaud@gmail.com>
Date: Mon, 29 May 2023 00:23:25 +0200
Subject: [PATCH] Managers use callback functions instead of signals

---
 src/store/managers/async_manager.py | 15 ++++++++-------
 src/store/managers/manager.py       | 20 ++++----------------
 src/store/pipeline.py               | 18 +++++++-----------
 3 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/src/store/managers/async_manager.py b/src/store/managers/async_manager.py
index 046bb6e..bd5c148 100644
--- a/src/store/managers/async_manager.py
+++ b/src/store/managers/async_manager.py
@@ -1,3 +1,5 @@
+from typing import Callable
+
 from gi.repository import Gio
 
 from src.game import Game
@@ -24,18 +26,17 @@ class AsyncManager(Manager):
         Already scheduled Tasks will no longer be cancellable."""
         self.cancellable = Gio.Cancellable()
 
-    def run(self, game: Game) -> None:
-        data = (game,)
-        task = Task.new(self, self.cancellable, self._task_callback, data)
-        task.set_task_data(data)
+    def run(self, game: Game, callback: Callable) -> None:
+        task = Task.new(self, self.cancellable, self._task_callback, (callback,))
+        task.set_task_data((game,))
         task.run_in_thread(self._task_thread_func)
 
     def _task_thread_func(self, _task, _source_object, data, cancellable):
         """Task thread entry point"""
         game, *_rest = data
-        self.emit("started")
         self.final_run(game)
 
-    def _task_callback(self, _source_object, _result, _data):
+    def _task_callback(self, _source_object, _result, data):
         """Method run after the async task is done"""
-        self.emit("done")
+        _game, callback, *_rest = data
+        callback(self)
diff --git a/src/store/managers/manager.py b/src/store/managers/manager.py
index 8d73999..cd3b37d 100644
--- a/src/store/managers/manager.py
+++ b/src/store/managers/manager.py
@@ -1,11 +1,10 @@
 from abc import abstractmethod
-
-from gi.repository import GObject
+from typing import Callable
 
 from src.game import Game
 
 
-class Manager(GObject.Object):
+class Manager:
     """Class in charge of handling a post creation action for games.
 
     * May connect to signals on the game to handle them.
@@ -39,19 +38,8 @@ class Manager(GObject.Object):
         * May not raise exceptions, as they will be silently ignored
         """
 
-    def run(self, game: Game) -> None:
+    def run(self, game: Game, callback: Callable[["Manager"]]) -> None:
         """Pass the game through the manager.
         In charge of calling the final_run method."""
-        self.emit("started")
         self.final_run(game)
-        self.emit("done")
-
-    @GObject.Signal(name="started")
-    def started(self) -> None:
-        """Signal emitted when a manager is started"""
-        pass
-
-    @GObject.Signal(name="done")
-    def done(self) -> None:
-        """Signal emitted when a manager is done"""
-        pass
+        callback(self)
diff --git a/src/store/pipeline.py b/src/store/pipeline.py
index 7453630..fd0ad5a 100644
--- a/src/store/pipeline.py
+++ b/src/store/pipeline.py
@@ -55,25 +55,21 @@ class Pipeline(GObject.Object):
         # Separate blocking / async managers
         managers = self.ready
         blocking = set(filter(lambda manager: manager.blocking, managers))
-        parallel = managers - parallel
+        parallel = managers - blocking
 
         # Schedule parallel managers, then run the blocking ones
         for manager in (*parallel, *blocking):
-            manager.run(self.game)
+            self.emit("manager-started", manager)
+            manager.run(self.game, self._manager_callback)
+
+    def _manager_callback(self, manager: Manager) -> None:
+        """Method called by a manager when it's done"""
+        self.emit("manager-done", manager)
 
     @GObject.Signal(name="manager-started", arg_types=(object,))
     def manager_started(self, manager: Manager) -> None:
         """Signal emitted when a manager is started"""
-        pass
 
     @GObject.Signal(name="manager-done", arg_types=(object,))
     def manager_done(self, manager: Manager) -> None:
         """Signal emitted when a manager is done"""
-        pass
-
-    def on_manager_started(self, manager: Manager) -> None:
-        self.emit("manager-started", manager)
-
-    def on_manager_done(self, manager: Manager) -> None:
-        self.emit("manager-done", manager)
-        self.advance()