v2.2.1

data/hu.kramo.Cartridges.metainfo.xml.in

@@ -44,6 +44,13 @@
   </screenshots>
   <content_rating type="oars-1.1" />
   <releases>
+    <release version="2.2.1" date="2023-08-17">
+      <description translatable="no">
+        <ul>
+          <li>Fixes a small issue with import toasts</li>
+        </ul>
+      </description>
+    </release>
     <release version="2.2" date="2023-08-17">
       <description translatable="no">
         <ul>

meson.build

@@ -1,5 +1,5 @@
 project('cartridges',
-          version: '2.2',
+          version: '2.2.1',
     meson_version: '>= 0.59.0',
   default_options: [ 'warning_level=2', 'werror=false', ],
 )

src/importer/importer.py

@@ -41,7 +41,7 @@ class Importer(ErrorProducer):
     progressbar: Gtk.ProgressBar
     import_statuspage: Adw.StatusPage
     import_dialog: Adw.MessageDialog
-    summary_toast: Adw.Toast
+    summary_toast: Optional[Adw.Toast] = None
 
     sources: set[Source]
 
@@ -50,8 +50,8 @@ class Importer(ErrorProducer):
     n_pipelines_done: int = 0
     game_pipelines: set[Pipeline]
 
-    removed_game_ids: set[str] = set()
+    removed_game_ids: set[str]
-    imported_game_ids: set[str] = set()
+    imported_game_ids: set[str]
 
     def __init__(self) -> None:
         super().__init__()
@@ -60,6 +60,9 @@ class Importer(ErrorProducer):
         shared.store.new_game_ids = set()
         shared.store.duplicate_game_ids = set()
 
+        self.removed_game_ids = set()
+        self.imported_game_ids = set()
+
         self.game_pipelines = set()
         self.sources = set()
 
@@ -100,6 +103,9 @@ class Importer(ErrorProducer):
     def run(self) -> None:
         """Use several Gio.Task to import games from added sources"""
 
+        if Importer.summary_toast:
+            Importer.summary_toast.dismiss()
+
         shared.win.get_application().lookup_action("import").set_enabled(False)
 
         self.create_dialog()
@@ -260,7 +266,7 @@ class Importer(ErrorProducer):
         shared.store.new_game_ids = set()
         shared.store.duplicate_game_ids = set()
         self.import_dialog.close()
-        self.summary_toast = self.create_summary_toast()
+        Importer.summary_toast = self.create_summary_toast()
         self.create_error_dialog()
         shared.win.get_application().lookup_action("import").set_enabled(True)
 
@@ -329,7 +335,8 @@ class Importer(ErrorProducer):
 
         self.imported_game_ids = set()
         self.removed_game_ids = set()
-        self.summary_toast.dismiss()
+        if Importer.summary_toast:
+            Importer.summary_toast.dismiss()
 
         logging.info("Import undone")
 
@@ -385,7 +392,8 @@ class Importer(ErrorProducer):
 
     def timeout_toast(self, *_args: Any) -> None:
         """Manually timeout the toast after the user has dismissed all warnings"""
-        GLib.timeout_add_seconds(5, self.summary_toast.dismiss)
+        if Importer.summary_toast:
+            GLib.timeout_add_seconds(5, Importer.summary_toast.dismiss)
 
     def dialog_response_callback(self, _widget: Any, response: str, *args: Any) -> None:
         """Handle after-import dialogs callback"""