feat/fuzzy_match (#8)

* feat/fuzzy_match

* feat/fuzzy_match

Author: JarbasAl

__init__.py

@@ -5,14 +5,14 @@
 from json_database import JsonStorageXDG
 from ovos_bus_client.apis.ocp import OCPInterface
 from ovos_bus_client.message import Message
-
 from ovos_utils import classproperty
 from ovos_utils.log import LOG
+from ovos_utils.ocp import MediaType, PlaybackType
+from ovos_utils.parse import fuzzy_match, MatchStrategy
 from ovos_utils.process_utils import RuntimeRequirements
 from ovos_workshop.decorators import intent_handler
 from ovos_workshop.decorators.ocp import ocp_search
 from ovos_workshop.skills.common_play import OVOSCommonPlaybackSkill
-from ovos_utils.ocp import MediaType, PlaybackType
 
 
 class LocalMediaSkill(OVOSCommonPlaybackSkill):
@@ -24,7 +24,7 @@ class LocalMediaSkill(OVOSCommonPlaybackSkill):
 
     def __init__(self, *args, **kwargs):
         self.archive = JsonStorageXDG("LocalMedia", subfolder="OCP")
-        super().__init__(skill_icon = join(dirname(__file__), "res", "icon", "ovos-file-browser.svg"),
+        super().__init__(skill_icon=join(dirname(__file__), "res", "icon", "ovos-file-browser.svg"),
                          supported_media=[MediaType.SHORT_FILM, MediaType.MUSIC,
                                           MediaType.RADIO, MediaType.RADIO_THEATRE,
                                           MediaType.MOVIE, MediaType.AUDIOBOOK,
@@ -146,16 +146,24 @@ def search_db(self, phrase, media_type):
         entities = self.ocp_voc_match(phrase)
         base_score += 30 * len(entities)
 
+        if media_type == MediaType.GENERIC:
+            candidates = self.archive.values()
+        else:
+            candidates = [video for video in self.archive.values()
+                          if video["media_type"] == media_type]
+
         if entities:
-            if media_type == MediaType.GENERIC:
-                candidates = self.archive.values()
-            else:
-                candidates = [video for video in self.archive.values()
-                              if video["media_type"] == media_type]
-                
             title = list(entities.values())[0]
-            return [video for video in candidates
-                    if title.lower() in video["title"].lower()]
+            for video in candidates:
+                if title.lower() in video["title"].lower():
+                    video["match_confidence"] = base_score
+                    yield video
+        else:
+            for entry in candidates:
+                score = fuzzy_match(phrase, entry["title"],
+                                    strategy=MatchStrategy.DAMERAU_LEVENSHTEIN_SIMILARITY)
+                entry["match_confidence"] = score * 100
+                yield entry
         return []
 
     ## File Browser

requirements.txt

@@ -1,3 +1,3 @@
-ovos-utils >= 0.1.0a7
+ovos-utils >= 0.1.0a16
 ovos-bus-client>=0.0.9a2
 ovos-workshop>=0.0.16a5