Typing

src/store/managers/manager.py

@@ -46,7 +46,7 @@ class Manager(ErrorProducer):
     max_tries: int = 3
 
     @property
-    def name(self):
+    def name(self) -> str:
         return type(self).__name__
 
     @abstractmethod
@@ -59,13 +59,13 @@ class Manager(ErrorProducer):
         * May raise other exceptions that will be reported
         """
 
-    def run(self, game: Game, additional_data: dict):
+    def run(self, game: Game, additional_data: dict) -> None:
         """Handle errors (retry, ignore or raise) that occur in the manager logic"""
 
         # Keep track of the number of tries
         tries = 1
 
-        def handle_error(error: Exception):
+        def handle_error(error: Exception) -> None:
             nonlocal tries
 
             # If FriendlyError, handle its cause instead
@@ -83,11 +83,11 @@ class Manager(ErrorProducer):
             retrying_format = "Retrying %s in %s for %s"
             unretryable_format = "Unretryable %s in %s for %s"
 
-            if error in self.continue_on:
+            if type(error) in self.continue_on:
                 # Handle skippable errors (skip silently)
                 return
 
-            if error in self.retryable_on:
+            if type(error) in self.retryable_on:
                 if tries > self.max_tries:
                     # Handle being out of retries
                     logging.error(out_of_retries_format, *log_args)
@@ -104,7 +104,7 @@ class Manager(ErrorProducer):
                 logging.error(unretryable_format, *log_args, exc_info=error)
                 self.report_error(base_error)
 
-        def try_manager_logic():
+        def try_manager_logic() -> None:
             try:
                 self.main(game, additional_data)
             except Exception as error:  # pylint: disable=broad-exception-caught

src/store/pipeline.py

@@ -83,7 +83,7 @@ class Pipeline(GObject.Object):
             progress = 1
         return progress
 
-    def advance(self):
+    def advance(self) -> None:
         """Spawn tasks for managers that are able to run for a game"""
 
         # Separate blocking / async managers

src/store/store.py

@@ -18,7 +18,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import logging
-from typing import Any, Generator, MutableMapping
+from typing import Any, Generator, MutableMapping, Optional
 
 from src import shared
 from src.game import Game
@@ -77,13 +77,15 @@ class Store:
         except KeyError:
             return default
 
-    def add_manager(self, manager: Manager, in_pipeline=True):
+    def add_manager(self, manager: Manager, in_pipeline: bool = True) -> None:
         """Add a manager to the store"""
         manager_type = type(manager)
         self.managers[manager_type] = manager
         self.toggle_manager_in_pipelines(manager_type, in_pipeline)
 
-    def toggle_manager_in_pipelines(self, manager_type: type[Manager], enable: bool):
+    def toggle_manager_in_pipelines(
+        self, manager_type: type[Manager], enable: bool
+    ) -> None:
         """Change if a manager should run in new pipelines"""
         if enable:
             self.pipeline_managers.add(self.managers[manager_type])
@@ -108,8 +110,8 @@ class Store:
                 pass
 
     def add_game(
-        self, game: Game, additional_data: dict, run_pipeline=True
-    ) -> Pipeline | None:
+        self, game: Game, additional_data: dict, run_pipeline: bool = True
+    ) -> Optional[Pipeline]:
         """Add a game to the app"""
 
         # Ignore games from a newer spec version