From f04228990ddc04d28940930bff87382928af7fb8 Mon Sep 17 00:00:00 2001
From: RumovZ <gp5glkw78@relay.firefox.com>
Date: Thu, 28 Jan 2021 20:51:32 +0100
Subject: [PATCH] Add browser_search helper in mw

---
 qt/aqt/addcards.py   |  4 +---
 qt/aqt/browser.py    |  7 -------
 qt/aqt/editor.py     |  3 +--
 qt/aqt/emptycards.py |  4 +---
 qt/aqt/main.py       | 10 ++++++++++
 qt/aqt/mediacheck.py |  5 +----
 6 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index 7d01cf472..3cfdde261 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -161,9 +161,7 @@ class AddCards(QDialog):
         m.exec_(self.historyButton.mapToGlobal(QPoint(0, 0)))
 
     def editHistory(self, nid):
-        browser = aqt.dialogs.open("Browser", self.mw)
-        browser.form.searchEdit.lineEdit().setText(self.mw.col.search_string(nids=[nid]))
-        browser.onSearchActivated()
+        self.mw.browser_search(nids=[nid])
 
     def addNote(self, note) -> Optional[Note]:
         note.model()["did"] = self.deckChooser.selectedId()
diff --git a/qt/aqt/browser.py b/qt/aqt/browser.py
index 01b9dcbcf..317652c5a 100644
--- a/qt/aqt/browser.py
+++ b/qt/aqt/browser.py
@@ -1637,13 +1637,6 @@ where id in %s"""
     # Edit: finding dupes
     ######################################################################
 
-    # filter called by the editor
-    def search_dupe(self, mid: int, text: str):
-        self.form.searchEdit.lineEdit().setText(
-            self.col.search_string(dupe=(mid, text))
-        )
-        self.onSearchActivated()
-
     def onFindDupes(self):
         self.editor.saveNow(self._onFindDupes)
 
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 5e276f1fe..cff937d44 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -539,8 +539,7 @@ class Editor:
         self.web.eval("setBackgrounds(%s);" % json.dumps(cols))
 
     def showDupes(self):
-        browser = aqt.dialogs.open("Browser", self.mw)
-        browser.search_dupe(self.note.model()["id"], self.note.fields[0])
+        self.mw.browser_search(dupe=(self.note.model()["id"], self.note.fields[0]))
 
     def fieldsAreBlank(self, previousNote=None):
         if not self.note:
diff --git a/qt/aqt/emptycards.py b/qt/aqt/emptycards.py
index d7d0d0801..49df85598 100644
--- a/qt/aqt/emptycards.py
+++ b/qt/aqt/emptycards.py
@@ -66,9 +66,7 @@ class EmptyCardsDialog(QDialog):
         self._delete_button.clicked.connect(self._on_delete)
 
     def _on_note_link_clicked(self, link):
-        browser = aqt.dialogs.open("Browser", self.mw)
-        browser.form.searchEdit.lineEdit().setText(link)
-        browser.onSearchActivated()
+        self.mw.browser_search(searches=[link])
 
     def _on_delete(self):
         self.mw.progress.start()
diff --git a/qt/aqt/main.py b/qt/aqt/main.py
index 2f43864b6..1f1dc79aa 100644
--- a/qt/aqt/main.py
+++ b/qt/aqt/main.py
@@ -1617,3 +1617,13 @@ title="%s" %s>%s</button>""" % (
 
     def serverURL(self) -> str:
         return "http://127.0.0.1:%d/" % self.mediaServer.getPort()
+
+    # Helpers for all windows
+    ##########################################################################
+
+    # Wrapper for col.search_string() to look up the result in the browser.
+    def browser_search(self, **kwargs) -> None:
+        search = self.col.search_string(**kwargs)
+        browser = aqt.dialogs.open("Browser", self)
+        browser.form.searchEdit.lineEdit().setText(search)
+        browser.onSearchActivated()
diff --git a/qt/aqt/mediacheck.py b/qt/aqt/mediacheck.py
index 76456a860..86616cec1 100644
--- a/qt/aqt/mediacheck.py
+++ b/qt/aqt/mediacheck.py
@@ -145,10 +145,7 @@ class MediaChecker:
 
         if out is not None:
             nid, err = out
-            browser = aqt.dialogs.open("Browser", self.mw)
-            search = self.mw.col.search_string(nids=[nid])
-            browser.form.searchEdit.lineEdit().setText(search)
-            browser.onSearchActivated()
+            self.mw.browser_search(nids=[nid])
             showText(err, type="html")
         else:
             tooltip(tr(TR.MEDIA_CHECK_ALL_LATEX_RENDERED))