From 76b4b7f6b158fe266b98201e30ade5f8c7a258e6 Mon Sep 17 00:00:00 2001
From: RumovZ <gp5glkw78@relay.firefox.com>
Date: Tue, 23 Mar 2021 11:20:46 +0100
Subject: [PATCH] Add context action 'Update with Current Search'

---
 ftl/core/browsing.ftl |  1 +
 qt/aqt/sidebar.py     | 51 +++++++++++++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/ftl/core/browsing.ftl b/ftl/core/browsing.ftl
index 30b43c260..d9bfedcb1 100644
--- a/ftl/core/browsing.ftl
+++ b/ftl/core/browsing.ftl
@@ -98,6 +98,7 @@ browsing-target-field = Target field:
 browsing-toggle-mark = Toggle Mark
 browsing-toggle-suspend = Toggle Suspend
 browsing-treat-input-as-regular-expression = Treat input as regular expression
+browsing-update-saved-search = Update with Current Search
 browsing-whole-collection = Whole Collection
 browsing-you-must-have-at-least-one = You must have at least one column.
 browsing-group =
diff --git a/qt/aqt/sidebar.py b/qt/aqt/sidebar.py
index 57f947d64..08ba8050e 100644
--- a/qt/aqt/sidebar.py
+++ b/qt/aqt/sidebar.py
@@ -1080,6 +1080,11 @@ class SidebarTreeView(QTreeView):
             menu.addAction(
                 tr(TR.BROWSING_SIDEBAR_SAVE_CURRENT_SEARCH), self.save_current_search
             )
+        elif item.item_type == SidebarItemType.SAVED_SEARCH:
+            menu.addAction(
+                tr(TR.BROWSING_UPDATE_SAVED_SEARCH),
+                lambda: self.update_saved_search(item),
+            )
 
     def _maybe_add_delete_action(
         self, menu: QMenu, item: SidebarItem, index: QModelIndex
@@ -1218,6 +1223,30 @@ class SidebarTreeView(QTreeView):
     def _set_saved_searches(self, searches: Dict[str, str]) -> None:
         self.col.set_config(self._saved_searches_key, searches)
 
+    def _get_current_search(self) -> Optional[str]:
+        try:
+            return self.col.build_search_string(
+                self.browser.form.searchEdit.lineEdit().text()
+            )
+        except InvalidInput as e:
+            show_invalid_search_error(e)
+            return None
+
+    def _save_search(self, name: str, search: str, update: bool = False) -> None:
+        conf = self._get_saved_searches()
+        if (
+            not update
+            and name in conf
+            and not askUser(tr(TR.BROWSING_CONFIRM_SAVED_SEARCH_OVERWRITE, name=name))
+        ):
+            return
+        conf[name] = search
+        self._set_saved_searches(conf)
+        self.refresh(
+            lambda item: item.item_type == SidebarItemType.SAVED_SEARCH
+            and item.name == name
+        )
+
     def remove_saved_searches(self, _item: SidebarItem) -> None:
         selected = self._selected_saved_searches()
         conf = self._get_saved_searches()
@@ -1246,27 +1275,17 @@ class SidebarTreeView(QTreeView):
         )
 
     def save_current_search(self) -> None:
-        try:
-            filt = self.col.build_search_string(
-                self.browser.form.searchEdit.lineEdit().text()
-            )
-        except InvalidInput as e:
-            show_invalid_search_error(e)
+        if (search := self._get_current_search()) is None:
             return
         name = getOnlyText(tr(TR.BROWSING_PLEASE_GIVE_YOUR_FILTER_A_NAME))
         if not name:
             return
-        conf = self._get_saved_searches()
-        if name in conf and not askUser(
-            tr(TR.BROWSING_CONFIRM_SAVED_SEARCH_OVERWRITE, name=name)
-        ):
+        self._save_search(name, search)
+
+    def update_saved_search(self, item: SidebarItem) -> None:
+        if (search := self._get_current_search()) is None:
             return
-        conf[name] = filt
-        self._set_saved_searches(conf)
-        self.refresh(
-            lambda item: item.item_type == SidebarItemType.SAVED_SEARCH
-            and item.name == name
-        )
+        self._save_search(item.name, search, update=True)
 
     # Notetypes and templates
     ####################################