From 34cee68ad9a33159dc48c3d5d25d77c28302533a Mon Sep 17 00:00:00 2001
From: Jamie Gravendeel <me@jamie.garden>
Date: Wed, 24 Dec 2025 15:26:49 +0100
Subject: [PATCH] window: Add game to collection automatically

---
 cartridges/ui/game-details.blp |  2 +-
 cartridges/ui/game-item.blp    |  2 +-
 cartridges/ui/game_details.py  |  8 +++++++-
 cartridges/ui/game_item.py     |  6 ++++++
 cartridges/ui/window.py        | 14 +++++++++++---
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/cartridges/ui/game-details.blp b/cartridges/ui/game-details.blp
index 18921ca..b56800b 100644
--- a/cartridges/ui/game-details.blp
+++ b/cartridges/ui/game-details.blp
@@ -172,7 +172,7 @@ template $GameDetails: Adw.NavigationPage {
 
                         popover: PopoverMenu {
                           menu-model: menu {
-                            item (_("New Collection"), "win.add-collection")
+                            item (_("New Collection"), "details.add-collection")
 
                             item {
                               custom: "collections";
diff --git a/cartridges/ui/game-item.blp b/cartridges/ui/game-item.blp
index 71fdce2..2b66027 100644
--- a/cartridges/ui/game-item.blp
+++ b/cartridges/ui/game-item.blp
@@ -52,7 +52,7 @@ template $GameItem: Box {
             }
 
             section {
-              item (_("New Collection"), "win.add-collection")
+              item (_("New Collection"), "item.add-collection")
 
               item {
                 custom: "collections";
diff --git a/cartridges/ui/game_details.py b/cartridges/ui/game_details.py
index 8c61137..2d41262 100644
--- a/cartridges/ui/game_details.py
+++ b/cartridges/ui/game_details.py
@@ -10,7 +10,7 @@ from gettext import gettext as _
 from typing import Any, TypeVar, cast
 from urllib.parse import quote
 
-from gi.repository import Adw, Gdk, Gio, GObject, Gtk
+from gi.repository import Adw, Gdk, Gio, GLib, GObject, Gtk
 
 from cartridges import games
 from cartridges.config import PREFIX
@@ -79,6 +79,12 @@ class GameDetails(Adw.NavigationPage):
                 ),
                 "s",
             ),
+            (
+                "add-collection",
+                lambda *_: self.activate_action(
+                    "win.add-collection", GLib.Variant.new_string(self.game.game_id)
+                ),
+            ),
         ))
 
         group.add_action(apply := Gio.SimpleAction.new("apply"))
diff --git a/cartridges/ui/game_item.py b/cartridges/ui/game_item.py
index d857bc4..9f61c7f 100644
--- a/cartridges/ui/game_item.py
+++ b/cartridges/ui/game_item.py
@@ -46,6 +46,12 @@ class GameItem(Gtk.Box):
                     "win.edit", GLib.Variant.new_uint32(self.position)
                 ),
             ),
+            (
+                "add-collection",
+                lambda *_: self.activate_action(
+                    "win.add-collection", GLib.Variant.new_string(self.game.game_id)
+                ),
+            ),
         ))
 
         self._reveal_buttons()
diff --git a/cartridges/ui/window.py b/cartridges/ui/window.py
index 39008aa..661b8be 100644
--- a/cartridges/ui/window.py
+++ b/cartridges/ui/window.py
@@ -128,7 +128,11 @@ class Window(Adw.ApplicationWindow):
                 "u",
             ),
             ("add", lambda *_: self._add()),
-            ("add-collection", lambda *_: self._add_collection()),
+            (
+                "add-collection",
+                lambda _action, param, *_: self._add_collection(param.get_string()),
+                "s",
+            ),
             (
                 "edit-collection",
                 lambda _action, param, *_: self._edit_collection(param.get_uint32()),
@@ -257,8 +261,12 @@ class Window(Adw.ApplicationWindow):
 
         self.details.edit()
 
-    def _add_collection(self):
-        details = CollectionDetails(collection=Collection())
+    def _add_collection(self, game_id: str | None = None):
+        collection = Collection()
+        if game_id:
+            collection.game_ids.append(game_id)
+
+        details = CollectionDetails(collection=collection)
         details.present(self)
 
     def _edit_collection(self, pos: int):