[gnome-music/wip/jfelder/songeditor-gtk4: 10/32] grltrackerwrapper: Retrieve musicbrainz track id for songs

[Jean Felder <jfelder src gnome org>]

commit cce1825770524f3b48fc25fe45c60f021a2543ca
Author: Jean Felder <jfelder src gnome org>
Date:   Wed Jul 29 12:51:12 2020 +0200

    grltrackerwrapper: Retrieve musicbrainz track id for songs

 gnomemusic/grilowrappers/grltrackerwrapper.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/gnomemusic/grilowrappers/grltrackerwrapper.py b/gnomemusic/grilowrappers/grltrackerwrapper.py
index a9c38f3f4..ed33d5561 100644
--- a/gnomemusic/grilowrappers/grltrackerwrapper.py
+++ b/gnomemusic/grilowrappers/grltrackerwrapper.py
@@ -70,6 +70,7 @@ class GrlTrackerWrapper(GObject.GObject):
         Grl.METADATA_KEY_FAVOURITE,
         Grl.METADATA_KEY_ID,
         Grl.METADATA_KEY_MB_RECORDING_ID,
+        Grl.METADATA_KEY_MB_TRACK_ID,
         Grl.METADATA_KEY_PLAY_COUNT,
         Grl.METADATA_KEY_TITLE,
         Grl.METADATA_KEY_TRACK_NUMBER,
@@ -425,7 +426,7 @@ class GrlTrackerWrapper(GObject.GObject):
         miner_fs_busname = self._tracker_wrapper.props.miner_fs_busname
         query = " ".join(f"""
         SELECT
-            ?type ?urn ?title ?id ?mbRecording ?url
+            ?type ?urn ?title ?id ?mbRecording ?mbTrack ?url
             ?artist ?album
             ?duration ?trackNumber
             ?albumDiscNumber ?publicationDate
@@ -441,6 +442,7 @@ class GrlTrackerWrapper(GObject.GObject):
                         ?song AS ?id
                         tracker:referenceIdentifier(?recording_id)
                             AS ?mbRecording
+                        tracker:referenceIdentifier(?track_id) AS ?mbTrack
                         nie:isStoredAs(?song) AS ?url
                         nmm:artistName(nmm:artist(?song)) AS ?artist
                         nie:title(nmm:musicAlbum(?song)) AS ?album
@@ -456,6 +458,11 @@ class GrlTrackerWrapper(GObject.GObject):
                             ?recording_id tracker:referenceSource
                                 "https://musicbrainz.org/doc/Recording"; .
                         }}
+                        OPTIONAL {{
+                            ?song tracker:hasExternalReference ?track_id .
+                            ?track_id tracker:referenceSource
+                                "https://musicbrainz.org/doc/Track"; .
+                        }}
                         OPTIONAL {{ ?song nie:contentCreated ?date . }}
                         {songs_filter}
                         {location_filter}
@@ -820,7 +827,7 @@ class GrlTrackerWrapper(GObject.GObject):
 
         query = """
         SELECT
-            ?type ?id ?mbRecording ?url ?title
+            ?type ?id ?mbRecording ?mbTrack ?url ?title
             ?artist ?album
             ?duration ?trackNumber ?albumDiscNumber
             ?publicationDate
@@ -834,6 +841,7 @@ class GrlTrackerWrapper(GObject.GObject):
                         ?song AS ?id
                         tracker:referenceIdentifier(?recording_id)
                             AS ?mbRecording
+                        tracker:referenceIdentifier(?track_id) AS ?mbTrack
                         nie:isStoredAs(?song) AS ?url
                         nie:title(?song) AS ?title
                         nmm:artistName(nmm:artist(?song)) AS ?artist
@@ -851,6 +859,11 @@ class GrlTrackerWrapper(GObject.GObject):
                             ?recording_id tracker:referenceSource
                                 "https://musicbrainz.org/doc/Recording"; .
                         }
+                        OPTIONAL {
+                            ?song tracker:hasExternalReference ?track_id .
+                            ?track_id tracker:referenceSource
+                                "https://musicbrainz.org/doc/Track"; .
+                        }
                         OPTIONAL { ?song nie:contentCreated ?date . }
                         FILTER (
                             ?album = <%(album_id)s> &&