[gnome-music/wip/jfelder/songeditor-gtk4: 57/76] grltrackerwrapper: Retrieve musicbrainz artist id for songs

[Jean Felder <jfelder src gnome org>]

commit 4434d655fdbd2a59c751a2059b1baabe26f3fbd7
Author: Jean Felder <jfelder src gnome org>
Date:   Wed Jul 29 13:32:30 2020 +0200

    grltrackerwrapper: Retrieve musicbrainz artist id for songs

 gnomemusic/grilowrappers/grltrackerwrapper.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/gnomemusic/grilowrappers/grltrackerwrapper.py b/gnomemusic/grilowrappers/grltrackerwrapper.py
index 56e59076a..7459f6f0f 100644
--- a/gnomemusic/grilowrappers/grltrackerwrapper.py
+++ b/gnomemusic/grilowrappers/grltrackerwrapper.py
@@ -70,6 +70,7 @@ class GrlTrackerWrapper(GObject.GObject):
         Grl.METADATA_KEY_DURATION,
         Grl.METADATA_KEY_FAVOURITE,
         Grl.METADATA_KEY_ID,
+        Grl.METADATA_KEY_MB_ARTIST_ID,
         Grl.METADATA_KEY_MB_RECORDING_ID,
         Grl.METADATA_KEY_MB_TRACK_ID,
         Grl.METADATA_KEY_PLAY_COUNT,
@@ -428,7 +429,7 @@ class GrlTrackerWrapper(GObject.GObject):
         query = " ".join(f"""
         SELECT
             ?type ?urn ?title ?id ?mbRecording ?mbTrack ?url
-            ?artist ?album
+            ?artist ?mbArtist ?album
             ?albumArtist ?duration ?trackNumber
             ?albumDiscNumber ?publicationDate
             nie:usageCounter(?urn) AS ?playCount
@@ -446,6 +447,7 @@ class GrlTrackerWrapper(GObject.GObject):
                         tracker:referenceIdentifier(?track_id) AS ?mbTrack
                         nie:isStoredAs(?song) AS ?url
                         nmm:artistName(nmm:artist(?song)) AS ?artist
+                        tracker:referenceIdentifier(?artist_id) AS ?mbArtist
                         nie:title(nmm:musicAlbum(?song)) AS ?album
                         ?album_artist AS ?albumArtist
                         nfo:duration(?song) AS ?duration
@@ -465,6 +467,12 @@ class GrlTrackerWrapper(GObject.GObject):
                             ?track_id tracker:referenceSource
                                 "https://musicbrainz.org/doc/Track"; .
                         }}
+                        OPTIONAL {{
+                            ?song nmm:artist ?artist .
+                            ?artist tracker:hasExternalReference ?artist_id .
+                            ?artist_id tracker:referenceSource
+                                "https://musicbrainz.org/doc/Artist"; .
+                        }}
                         OPTIONAL {{ ?song nie:contentCreated ?date . }}
                         {songs_filter}
                         {location_filter}
@@ -830,7 +838,7 @@ class GrlTrackerWrapper(GObject.GObject):
         query = """
         SELECT
             ?type ?id ?mbRecording ?mbTrack ?url ?title
-            ?artist ?album
+            ?artist ?mbArtist ?album
             ?albumArtist ?duration ?trackNumber ?albumDiscNumber
             ?publicationDate
             nie:usageCounter(?id) AS ?playCount
@@ -847,6 +855,7 @@ class GrlTrackerWrapper(GObject.GObject):
                         nie:isStoredAs(?song) AS ?url
                         nie:title(?song) AS ?title
                         nmm:artistName(nmm:artist(?song)) AS ?artist
+                        tracker:referenceIdentifier(?artist_id) AS ?mbArtist
                         nie:title(nmm:musicAlbum(?song)) AS ?album
                         ?album_artist AS ?albumArtist
                         nfo:duration(?song) AS ?duration
@@ -870,6 +879,12 @@ class GrlTrackerWrapper(GObject.GObject):
                         OPTIONAL { ?song nie:contentCreated ?date . }
                         OPTIONAL { ?album nmm:albumArtist/
                                           nmm:artistName ?album_artist . }
+                        OPTIONAL {
+                            ?song nmm:artist ?artist .
+                            ?artist tracker:hasExternalReference ?artist_id .
+                            ?artist_id tracker:referenceSource
+                                "https://musicbrainz.org/doc/Artist"; .
+                        }
                         FILTER (
                             ?album = <%(album_id)s> &&
                             nmm:setNumber(nmm:musicAlbumDisc(?song)) =