Limit results returned per plugin

Related to #23
otsaloma · Oct 23, 2023 · 112f811 · 112f811
1 parent f4ffb00
commit 112f811
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+PENDING: Catapult 1.0
+=====================
+
+* Limit results returned per plugin (default 24) to avoid issues with
+  huge file indexes paired with short query strings (#23)
+
 2023-08-31: Catapult 0.999
 ==========================
 

diff --git a/catapult/conf.py b/catapult/conf.py
@@ -49,6 +49,7 @@ class ConfigurationStore(catapult.DebugMixin):
 
     _defaults = {
         "max_results": 24,
+        "max_results_per_plugin": 24,
         "max_results_visible": 7,
         "plugins": ["apps", "builtins", "calculator", "clipboard", "files", "session"],
         "theme": "dark",

diff --git a/catapult/search.py b/catapult/search.py
@@ -56,7 +56,11 @@ def _get_results(self, plugins, query):
         for plugin in plugins:
             self.tick()
             try:
-                yield from plugin.search(query)
+                for i, result in enumerate(plugin.search(query)):
+                    yield result
+                    if i + 1 >= catapult.conf.max_results_per_plugin:
+                        self.debug(f"Terminating after {i+1} results")
+                        break
                 elapsed = self.tock()
                 self.debug(f"{plugin.name} delivered in {elapsed:.0f} ms")
             except Exception: