[gnome-music/wip/mschraal/search-cleanups: 6/10] grltrackerwrapper: Simplify searches slightly

[Marinus Schraal <mschraal src gnome org>]

commit 97a490364438137321136a73eeeb7ece6f1179d2
Author: Marinus Schraal <mschraal gnome org>
Date:   Fri Jul 19 14:53:00 2019 +0200

    grltrackerwrapper: Simplify searches slightly
    
    Searches were quite broad, coming up with a lot of results that made no
    immediate sense. For example, the artist search was also looking for a match
    in song names.
    
    Related: #301

 gnomemusic/grilowrappers/grltrackerwrapper.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
---
diff --git a/gnomemusic/grilowrappers/grltrackerwrapper.py b/gnomemusic/grilowrappers/grltrackerwrapper.py
index c271eec9..5c5db1df 100644
--- a/gnomemusic/grilowrappers/grltrackerwrapper.py
+++ b/gnomemusic/grilowrappers/grltrackerwrapper.py
@@ -690,7 +690,6 @@ class GrlTrackerWrapper(GObject.GObject):
                 nie:title(nmm:musicAlbum(?song)), 'nfkd') AS ?match1) .
             BIND(tracker:normalize(
                 nmm:artistName(nmm:performer(?song)), 'nfkd') AS ?match2) .
-            BIND(tracker:normalize(nie:title(?song), 'nfkd') AS ?match3) .
             BIND(tracker:normalize(nmm:composer(?song), 'nfkd') AS ?match4) .
             FILTER (
                 CONTAINS(tracker:case-fold(
@@ -699,9 +698,6 @@ class GrlTrackerWrapper(GObject.GObject):
                 || CONTAINS(tracker:case-fold(
                     tracker:unaccent(?match2)), "%(name)s")
                 || CONTAINS(tracker:case-fold(?match2), "%(name)s")
-                || CONTAINS(tracker:case-fold(
-                    tracker:unaccent(?match3)), "%(name)s")
-                || CONTAINS(tracker:case-fold(?match3), "%(name)s")
                 || CONTAINS(tracker:case-fold(
                     tracker:unaccent(?match4)), "%(name)s")
                 || CONTAINS(tracker:case-fold(?match4), "%(name)s")
@@ -745,10 +741,9 @@ class GrlTrackerWrapper(GObject.GObject):
                     nmm:musicAlbum ?album ;
                     nmm:performer ?artist .
             BIND(tracker:normalize(
-                nie:title(nmm:musicAlbum(?song)), 'nfkd') AS ?match1) .
+                nmm:artistName(nmm:albumArtist(?album)), 'nfkd') AS ?match1) .
             BIND(tracker:normalize(
                 nmm:artistName(nmm:performer(?song)), 'nfkd') AS ?match2) .
-            BIND(tracker:normalize(nie:title(?song), 'nfkd') AS ?match3) .
             BIND(tracker:normalize(nmm:composer(?song), 'nfkd') AS ?match4) .
             FILTER (
                 CONTAINS(tracker:case-fold(
@@ -757,9 +752,6 @@ class GrlTrackerWrapper(GObject.GObject):
                 || CONTAINS(tracker:case-fold(
                     tracker:unaccent(?match2)), "%(name)s")
                 || CONTAINS(tracker:case-fold(?match2), "%(name)s")
-                || CONTAINS(tracker:case-fold(
-                    tracker:unaccent(?match3)), "%(name)s")
-                || CONTAINS(tracker:case-fold(?match3), "%(name)s")
                 || CONTAINS(tracker:case-fold(
                     tracker:unaccent(?match4)), "%(name)s")
                 || CONTAINS(tracker:case-fold(?match4), "%(name)s")