Merge branch 'master' into clever-fuzz

README.md

@@ -40,7 +40,7 @@ dnf install gnome-pass-search-provider
 
 ## Manual
 
-Ensure that python>=3.7 as well as the dbus and gobject Python modules are installed. They should all be packaged under python-name or python3-name depending on your distribution.
+Ensure that python>=3.7 as well as the dbus, gobject and thefuzz (formerly fuzzywuzzy, might still be packaged under that name in your distribution) Python modules are installed. They should all be packaged under python-name or python3-name depending on your distribution.
 
 Clone this repository and run the installation script as root:
 ```

gnome-pass-search-provider.py

@@ -32,6 +32,12 @@ from os.path import join as path_join
 import dbus.service
 from dbus.mainloop.glib import DBusGMainLoop
 
+try:
+    from thefuzz import fuzz
+    from thefuzz import process
+except ModuleNotFoundError:
+    from fuzzywuzzy import fuzz
+    from fuzzywuzzy import process
 from gi.repository import GLib
 
 # Convenience shorthand for declaring dbus interface methods.
@@ -110,7 +116,19 @@ class SearchPassService(dbus.service.Object):
             [self.password_executable, "list"], universal_newlines=True
         ).split("\n")[:-1]
 
-        results = list(filter(lambda x: x.startswith(name), password_list))[:5]
+        results = list(filter(lambda p: p.startswith(name), password_list))[:5]
+
+        remaining = 5 - len(results)
+
+        if remaining > 0:
+            fuzzy_results = [
+                e[0]
+                for e in process.extract(
+                    name, password_list, limit=remaining, scorer=fuzz.token_sort_ratio
+                )
+            ]
+
+            results.extend(fuzzy_results)
 
         if field is not None:
             results = [f":{field} {r}" for r in results]
@@ -139,7 +157,28 @@ class SearchPassService(dbus.service.Object):
                 path = path_join(dir_path, filename)[:-4]
                 password_list.append(path)
 
-        results = list(filter(lambda x: x.startswith(name), password_list))[:5]
+        results = list(filter(lambda p: p.startswith(name), password_list))[:5]
+
+        remaining = 5 - len(results)
+
+        if remaining > 0:
+            containing_results = list(filter(lambda p: name in p, password_list))[
+                :remaining
+            ]
+
+            results.extend(containing_results)
+
+        remaining = 5 - len(results)
+
+        if remaining > 0:
+            fuzzy_results = [
+                e[0]
+                for e in process.extract(
+                    name, password_list, limit=remaining, scorer=fuzz.token_sort_ratio
+                )
+            ]
+
+            results.extend(fuzzy_results)
 
         if field == "otp":
             results = [f"otp {r}" for r in results]
@@ -155,7 +194,9 @@ class SearchPassService(dbus.service.Object):
             if match:
                 value = match.group("value")
             else:
-                raise RuntimeError(f"The field {field} was not found in the password entry.")
+                raise RuntimeError(
+                    f"The field {field} was not found in the password entry."
+                )
         else:
             value = output.split("\n", 1)[0]
         return value
@@ -174,7 +215,9 @@ class SearchPassService(dbus.service.Object):
 
     def send_password_to_native_clipboard(self, base_args, name, field=None):
         if self.password_mode == "bw":
-            output = subprocess.check_output(base_args + [name], universal_newlines=True)
+            output = subprocess.check_output(
+                base_args + [name], universal_newlines=True
+            )
             value = self.get_value_from_output(output, field)
             p1 = subprocess.run(self.clipboard_executable, input=value, text=True)
             if p1.returncode:

gnome-pass-search-provider.spec

@@ -1,5 +1,5 @@
 Name:           gnome-pass-search-provider
-Version:        master
+Version:        1.3.2
 Release:        1
 License:        GPL-3.0+
 Summary:        Gnome Shell search provider for zx2c4/pass
@@ -9,6 +9,8 @@ Requires:       gnome-shell
 Requires:       pass
 Requires:       python3-gobject
 Requires:       python3-dbus
+Requires:       python3-fuzzywuzzy
+Requires:       python3-Levenshtein
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %global debug_package %{nil}