[gnome-music] query: Use subqueries for searching in songs

[Vadim Rutkovsky <vrutkovsky src gnome org>]

commit a0209b5b69a790ed38fdc2ab63967b75169b6322
Author: Arnel Borja <arnelborja src gnome org>
Date:   Sat May 3 20:38:01 2014 +0800

    query: Use subqueries for searching in songs
    
    Use subqueries so we could prevent multiple instances in result.

 gnomemusic/query.py |  119 ++++++++++++++++++++++++++-------------------------
 1 files changed, 61 insertions(+), 58 deletions(-)
---
diff --git a/gnomemusic/query.py b/gnomemusic/query.py
index 0e458c2..9723969 100644
--- a/gnomemusic/query.py
+++ b/gnomemusic/query.py
@@ -443,6 +443,25 @@ class Query():
 
         return query
 
+    @staticmethod
+    def songs(where_clause):
+        query = '''
+    SELECT DISTINCT
+        rdf:type(?song)
+        tracker:id(?song) AS id
+        nie:url(?song) AS url
+        nie:title(?song) AS title
+        nmm:artistName(nmm:performer(?song)) AS artist
+        nie:title(nmm:musicAlbum(?song)) AS album
+        nfo:duration(?song) AS duration
+        {
+            %(where_clause)s
+        }
+    ORDER BY tracker:added(?song)
+    '''.replace('\n', ' ').strip() % {'where_clause': where_clause.replace('\n', ' ').strip()}
+
+        return query
+
 
     @staticmethod
     def album_songs(album_id):
@@ -721,88 +740,72 @@ class Query():
     def get_songs_with_any_match(name):
         name = Tracker.sparql_escape_string(GLib.utf8_casefold(name, -1))
         query = '''
-            SELECT DISTINCT
-                rdf:type(?song)
-                tracker:id(?song) AS id
-                nie:url(?song) AS url
-                nie:title(?song) AS title
-                nmm:artistName(nmm:performer(?song)) AS artist
-                nie:title(nmm:musicAlbum(?song)) AS album
-                nfo:duration(?song) AS duration
-            WHERE {
-                ?song a nmm:MusicPiece .
-                FILTER (
-                    fn:contains(tracker:case-fold(nie:title(?song)), "%(name)s") ||
-                    fn:contains(tracker:case-fold(nmm:artistName(nmm:performer(?song))), "%(name)s") ||
-                    fn:contains(tracker:case-fold(nie:title(nmm:musicAlbum(?song))), "%(name)s")
-                )
+            {
+                SELECT DISTINCT
+                    ?song
+                WHERE {
+                    ?song a nmm:MusicPiece .
+                    FILTER (
+                        fn:contains(tracker:case-fold(nie:title(?song)), "%(name)s") ||
+                        fn:contains(tracker:case-fold(nmm:artistName(nmm:performer(?song))), "%(name)s") ||
+                        fn:contains(tracker:case-fold(nie:title(nmm:musicAlbum(?song))), "%(name)s")
+                    )
+                }
             }
             '''.replace('\n', ' ').strip() % {'name': name}
 
-        return query
+        return Query.songs(query)
 
     @staticmethod
     def get_songs_with_artist_match(name):
         name = Tracker.sparql_escape_string(GLib.utf8_casefold(name, -1))
         query = '''
-            SELECT DISTINCT
-                rdf:type(?song)
-                tracker:id(?song) AS id
-                nie:url(?song) AS url
-                nie:title(?song) AS title
-                nmm:artistName(nmm:performer(?song)) AS artist
-                nie:title(nmm:musicAlbum(?song)) AS album
-                nfo:duration(?song) AS duration
-            WHERE {
-                ?song a nmm:MusicPiece .
-                FILTER (
-                    fn:contains(tracker:case-fold(nmm:artistName(nmm:performer(?song))), "%(name)s")
-                )
+            {
+                SELECT DISTINCT
+                    ?song
+                WHERE {
+                    ?song a nmm:MusicPiece .
+                    FILTER (
+                        fn:contains(tracker:case-fold(nmm:artistName(nmm:performer(?song))), "%(name)s")
+                    )
+                }
             }
             '''.replace('\n', ' ').strip() % {'name': name}
 
-        return query
+        return Query.songs(query)
 
     @staticmethod
     def get_songs_with_album_match(name):
         name = Tracker.sparql_escape_string(GLib.utf8_casefold(name, -1))
         query = '''
-            SELECT DISTINCT
-                rdf:type(?song)
-                tracker:id(?song) AS id
-                nie:url(?song) AS url
-                nie:title(?song) AS title
-                nmm:artistName(nmm:performer(?song)) AS artist
-                nie:title(nmm:musicAlbum(?song)) AS album
-                nfo:duration(?song) AS duration
-            WHERE {
-                ?song a nmm:MusicPiece .
-                FILTER (
-                    fn:contains(tracker:case-fold(nie:title(nmm:musicAlbum(?song))), "%(name)s")
-                )
+            {
+                SELECT DISTINCT
+                    ?song
+                WHERE {
+                    ?song a nmm:MusicPiece .
+                    FILTER (
+                        fn:contains(tracker:case-fold(nie:title(nmm:musicAlbum(?song))), "%(name)s")
+                    )
+                }
             }
             '''.replace('\n', ' ').strip() % {'name': name}
 
-        return query
+        return Query.songs(query)
 
     @staticmethod
     def get_songs_with_track_match(name):
         name = Tracker.sparql_escape_string(GLib.utf8_casefold(name, -1))
         query = '''
-            SELECT DISTINCT
-                rdf:type(?song)
-                tracker:id(?song) AS id
-                nie:url(?song) AS url
-                nie:title(?song) AS title
-                nmm:artistName(nmm:performer(?song)) AS artist
-                nie:title(nmm:musicAlbum(?song)) AS album
-                nfo:duration(?song) AS duration
-            WHERE {
-                ?song a nmm:MusicPiece .
-                FILTER (
-                    fn:contains(tracker:case-fold(nie:title(?song)), "%(name)s")
-                )
+            {
+                SELECT DISTINCT
+                    ?song
+                WHERE {
+                    ?song a nmm:MusicPiece .
+                    FILTER (
+                        fn:contains(tracker:case-fold(nie:title(?song)), "%(name)s")
+                    )
+                }
             }
             '''.replace('\n', ' ').strip() % {'name': name}
 
-        return query
+        return Query.songs(query)