🐛 Task fix + progress bar

src/utils/task.py

@@ -1,7 +1,68 @@
-def make_task_thread_func_closure(func, data):
-    """Prepare a Gio.TaskThreadFunc with its data bound in a closure"""
+from gi.repository import Gio
+from functools import wraps
 
-    def closure(task, obj, _data, cancellable):
-        func(task, obj, data, cancellable)
+
+def create_task_thread_func_closure(func, data):
+    """Wrap a Gio.TaskThreadFunc with the given data in a closure"""
+
+    def closure(task, source_object, _data, cancellable):
+        func(task, source_object, data, cancellable)
 
     return closure
+
+
+def decorate_set_task_data(task):
+    """Decorate Gio.Task.set_task_data to replace it"""
+
+    def decorator(original_method):
+        @wraps(original_method)
+        def new_method(task_data):
+            task.__task_data = task_data
+            pass
+
+        return new_method
+
+    return decorator
+
+
+def decorate_run_in_thread(task):
+    """Decorate Gio.Task.run_in_thread to pass the task data correctly
+    Creates a closure around task_thread_func with the task data available."""
+
+    def decorator(original_method):
+        @wraps(original_method)
+        def new_method(task_thread_func):
+            closure = create_task_thread_func_closure(
+                task_thread_func, task.__task_data
+            )
+            original_method(closure)
+
+        return new_method
+
+    return decorator
+
+
+class Task:
+    """Wrapper around Gio.Task to patch task data not being passed"""
+
+    @classmethod
+    def new(cls, source_object, cancellable, callback, callback_data):
+        """Create a new, monkey-patched Gio.Task.
+        The `set_task_data` and `run_in_thread` methods are decorated.
+
+        As of 2023-05-19, pygobject does not work well with Gio.Task, so to pass data
+        the only viable way it to create a closure with the thread function and its data.
+        This class is supposed to make Gio.Task comply with its expected behaviour
+        per the docs:
+
+        http://lazka.github.io/pgi-docs/#Gio-2.0/classes/Task.html#Gio.Task.set_task_data
+
+        This code may break if pygobject overrides change in the future.
+        We need to manually pass `self` to the decorators since it's otherwise bound but
+        not accessible from Python's side.
+        """
+
+        task = Gio.Task.new(source_object, cancellable, callback, callback_data)
+        task.set_task_data = decorate_set_task_data(task)(task.set_task_data)
+        task.run_in_thread = decorate_run_in_thread(task)(task.run_in_thread)
+        return task