[gnome-music/wip/mschraal/core: 61/92] Move trackerer wrapper out of CoreGrilo

[Marinus Schraal <mschraal src gnome org>]

commit b2378a71da1297e7008ad68206728952f1f09b86
Author: Marinus Schraal <mschraal gnome org>
Date:   Wed May 15 22:49:10 2019 +0200

    Move trackerer wrapper out of CoreGrilo

 gnomemusic/coregrilo.py                      | 177 +-----------------------
 gnomemusic/coremodel.py                      |   2 +-
 gnomemusic/grilowrappers/__init__.py         |   0
 gnomemusic/grilowrappers/grltrackersource.py | 192 +++++++++++++++++++++++++++
 4 files changed, 199 insertions(+), 172 deletions(-)
---
diff --git a/gnomemusic/coregrilo.py b/gnomemusic/coregrilo.py
index cd26c374..43bce9fd 100644
--- a/gnomemusic/coregrilo.py
+++ b/gnomemusic/coregrilo.py
@@ -5,41 +5,20 @@ from gi.repository import Grl, GObject
 from gnomemusic import log
 from gnomemusic.corealbum import CoreAlbum
 from gnomemusic.coresong import CoreSong
+from gnomemusic.grilowrappers.grltrackersource import GrlTrackerSource
 
 
 class CoreGrilo(GObject.GObject):
 
-    __gsignals__ = {
-        "media-removed": (GObject.SignalFlags.RUN_FIRST, None, (Grl.Media,))
-    }
-
-    METADATA_KEYS = [
-        Grl.METADATA_KEY_ALBUM,
-        Grl.METADATA_KEY_ALBUM_ARTIST,
-        Grl.METADATA_KEY_ALBUM_DISC_NUMBER,
-        Grl.METADATA_KEY_ARTIST,
-        Grl.METADATA_KEY_CREATION_DATE,
-        Grl.METADATA_KEY_COMPOSER,
-        Grl.METADATA_KEY_DURATION,
-        Grl.METADATA_KEY_FAVOURITE,
-        Grl.METADATA_KEY_ID,
-        Grl.METADATA_KEY_LYRICS,
-        Grl.METADATA_KEY_PLAY_COUNT,
-        Grl.METADATA_KEY_THUMBNAIL,
-        Grl.METADATA_KEY_TITLE,
-        Grl.METADATA_KEY_TRACK_NUMBER,
-        Grl.METADATA_KEY_URL
-    ]
-
     def __repr__(self):
         return "<CoreGrilo>"
 
-    def __init__(self, model, table, url_hash, albums_model):
+    def __init__(self, model, _hash, url_hash, albums_model):
         super().__init__()
 
         self._model = model
         self._albums_model = albums_model
-        self._table = table
+        self._hash = _hash
         # Only way to figure out removed items
         self._url_table = url_hash
 
@@ -60,154 +39,10 @@ class CoreGrilo(GObject.GObject):
     def _on_source_added(self, registry, source):
         print(source.props.source_id)
         if source.props.source_id == "grl-tracker-source":
+            self._tracker_source = GrlTrackerSource(
+                source, self._hash, self._model, self._albums_model)
             self._tracker_source = source
-            self._tracker_initial_fill(source)
-            self._initial_albums_fill(source)
             print(self._tracker_source, "added")
-            self._tracker_source.connect(
-                "content-changed", self._on_content_changed)
-
-    def _on_content_changed(self, source, medias, change_type, loc_unknown):
-        # print("Content changed")
-
-        for media in medias:
-            if change_type == Grl.SourceChangeType.CHANGED:
-                print("CHANGED", media.get_id())
-                self._requery_media(media.get_id())
-            if change_type == Grl.SourceChangeType.REMOVED:
-                # print("REMOVED", media.get_id(), media.get_title(), media.get_url())
-                # print(self._table[media.get_id()])
-                self.emit("media-removed", media)
-                # print(self._table[media.get_id()])
-
-    def _requery_media(self, grilo_id):
-        query = """
-            SELECT DISTINCT
-                rdf:type(?song)
-                ?song AS ?tracker_urn
-                nie:title(?song) AS ?title
-                tracker:id(?song) AS ?id
-                ?song
-                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
-                nie:usageCounter(?song) AS ?play_count
-                nmm:trackNumber(?song) AS ?track_number
-                nmm:setNumber(nmm:musicAlbumDisc(?song)) AS ?album_disc_number
-                ?tag AS ?favourite
-            WHERE {
-                ?song a nmm:MusicPiece .
-                OPTIONAL {
-                    ?song nao:hasTag ?tag .
-                    FILTER (?tag = nao:predefined-tag-favorite)
-                }
-                FILTER ( tracker:id(?song) = %(grilo_id)s )
-            }
-        """.replace('\n', ' ').strip() % {
-            'grilo_id': grilo_id
-        }
-
-        # print("query", query)
-        print("grilo id", grilo_id)
-
-        options = self._fast_options.copy()
-
-        self._tracker_source.query(
-            query, self.METADATA_KEYS, options, self._update_media)
-
-    def _update_media(self, source, op_id, media, user_data, error):
-        if error:
-            print("ERROR", error)
-            return
-
-        if not media:
-            print("NO MEDIA", source, op_id, media, error)
-            return
-
-        self._table[media.get_id()].update(media)
 
     def _on_source_removed(self, registry, source):
-        print("removed", source.props.source_id)
-
-    def _tracker_initial_fill(self, source):
-        query = """
-            SELECT
-                rdf:type(?song)
-                ?song AS ?tracker_urn
-                nie:title(?song) AS ?title
-                tracker:id(?song) AS ?id
-                ?song
-                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
-                nie:usageCounter(?song) AS ?play_count
-                nmm:trackNumber(?song) AS ?track_number
-                nmm:setNumber(nmm:musicAlbumDisc(?song)) AS ?album_disc_number
-                ?tag AS ?favourite
-            WHERE {
-                ?song a nmm:MusicPiece .
-                OPTIONAL {
-                    ?song nao:hasTag ?tag .
-                    FILTER (?tag = nao:predefined-tag-favorite)
-                }
-            }
-        """.replace('\n', ' ').strip()
-
-        print(query)
-
-        options = self._fast_options.copy()
-
-        self._tracker_source.query(
-            query, self.METADATA_KEYS, options, self._add_to_model)
-
-    def _add_to_model(self, source, op_id, media, user_data, error):
-        if error:
-            print("ERROR", error)
-            return
-
-        if not media:
-            print("NO MEDIA", source, op_id, media, error)
-            return
-
-        song = CoreSong(media)
-        self._model.append(song)
-        self._table[media.get_id()] = song
-        self._url_table[media.get_url()] = song
-
-        # print(song.props.title, song.props.url)
-
-    @log
-    def _initial_albums_fill(self, source):
-        query = """
-        SELECT
-            rdf:type(?album)
-            tracker:id(?album) AS ?id
-            nmm:artistName(?album_artist) AS ?album_artist
-            nie:title(?album) as ?title
-        {
-            ?album a nmm:MusicAlbum .
-            OPTIONAL { ?album nmm:albumArtist ?albumArtist . }
-        }
-        """.replace('\n', ' ').strip()
-
-        options = self._fast_options.copy()
-
-        source.query(
-            query, self.METADATA_KEYS, options, self._add_to_albums_model)
-
-    @log
-    def _add_to_albums_model(self, source, op_id, media, user_data, error):
-        if error:
-            print("ERROR", error)
-            return
-
-        if not media:
-            print("NO MEDIA", source, op_id, media, error)
-            return
-
-        album = CoreAlbum(media)
-        self._albums_model.append(album)
+        print("removed,", source.props.source_id)
diff --git a/gnomemusic/coremodel.py b/gnomemusic/coremodel.py
index cd0e8775..73b658f9 100644
--- a/gnomemusic/coremodel.py
+++ b/gnomemusic/coremodel.py
@@ -24,7 +24,7 @@ class CoreModel(GObject.GObject):
 
         self._grilo = CoreGrilo(
             self._model, self._hash, self._url_hash, self._album_model)
-        self._grilo.connect("media-removed", self._on_media_removed)
+        # self._grilo.connect("media-removed", self._on_media_removed)
 
     @log
     def get_model(self):
diff --git a/gnomemusic/grilowrappers/__init__.py b/gnomemusic/grilowrappers/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/gnomemusic/grilowrappers/grltrackersource.py b/gnomemusic/grilowrappers/grltrackersource.py
new file mode 100644
index 00000000..22baf7ee
--- /dev/null
+++ b/gnomemusic/grilowrappers/grltrackersource.py
@@ -0,0 +1,192 @@
+import gi
+gi.require_version('Grl', '0.3')
+from gi.repository import Grl, GObject
+
+from gnomemusic.corealbum import CoreAlbum
+from gnomemusic.coresong import CoreSong
+
+
+class GrlTrackerSource(GObject.GObject):
+
+    METADATA_KEYS = [
+        Grl.METADATA_KEY_ALBUM,
+        Grl.METADATA_KEY_ALBUM_ARTIST,
+        Grl.METADATA_KEY_ALBUM_DISC_NUMBER,
+        Grl.METADATA_KEY_ARTIST,
+        Grl.METADATA_KEY_CREATION_DATE,
+        Grl.METADATA_KEY_COMPOSER,
+        Grl.METADATA_KEY_DURATION,
+        Grl.METADATA_KEY_FAVOURITE,
+        Grl.METADATA_KEY_ID,
+        Grl.METADATA_KEY_LYRICS,
+        Grl.METADATA_KEY_PLAY_COUNT,
+        Grl.METADATA_KEY_THUMBNAIL,
+        Grl.METADATA_KEY_TITLE,
+        Grl.METADATA_KEY_TRACK_NUMBER,
+        Grl.METADATA_KEY_URL
+    ]
+
+    def __repr__(self):
+        return "<GrlTrackerSource>"
+
+    def __init__(self, source, _hash, model, albums_model):
+        super().__init__()
+
+        self._source = source
+        self._model = model
+        self._albums_model = albums_model
+        self._hash = _hash
+        # self._table = table
+        # Only way to figure out removed items
+        # self._url_table = url_hash
+
+        Grl.init(None)
+
+        self._fast_options = Grl.OperationOptions()
+        self._fast_options.set_resolution_flags(
+            Grl.ResolutionFlags.FAST_ONLY | Grl.ResolutionFlags.IDLE_RELAY)
+
+        self._full_options = Grl.OperationOptions()
+        self._full_options.set_resolution_flags(
+            Grl.ResolutionFlags.FULL | Grl.ResolutionFlags.IDLE_RELAY)
+
+        self._initial_fill(self._source)
+        self._initial_albums_fill(self._source)
+
+        self._source.connect("content-changed", self._on_content_changed)
+
+    def _on_content_changed(self, source, medias, change_type, loc_unknown):
+        for media in medias:
+            if change_type == Grl.SourceChangeType.ADDED:
+                self._add_media(media)
+            if change_type == Grl.SourceChangeType.CHANGED:
+                self._requery_media(media.get_id())
+            if change_type == Grl.SourceChangeType.REMOVED:
+                self.emit("media-removed", media)
+
+    def _requery_media(self, grilo_id):
+        query = """
+            SELECT DISTINCT
+                rdf:type(?song)
+                ?song AS ?tracker_urn
+                nie:title(?song) AS ?title
+                tracker:id(?song) AS ?id
+                ?song
+                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
+                nie:usageCounter(?song) AS ?play_count
+                nmm:trackNumber(?song) AS ?track_number
+                nmm:setNumber(nmm:musicAlbumDisc(?song)) AS ?album_disc_number
+                ?tag AS ?favourite
+            WHERE {
+                ?song a nmm:MusicPiece .
+                OPTIONAL {
+                    ?song nao:hasTag ?tag .
+                    FILTER (?tag = nao:predefined-tag-favorite)
+                }
+                FILTER ( tracker:id(?song) = %(grilo_id)s )
+            }
+        """.replace('\n', ' ').strip() % {
+            'grilo_id': grilo_id
+        }
+
+        options = self._fast_options.copy()
+
+        self._source.query(
+            query, self.METADATA_KEYS, options, self._update_media)
+
+    def _add_media(self, media):
+        song = CoreSong(media)
+        self._model.append(song)
+        self._requery_media(media.get_id())
+
+    def _update_media(self, source, op_id, media, user_data, error):
+        if error:
+            print("ERROR", error)
+            return
+
+        if not media:
+            print("NO MEDIA", source, op_id, media, error)
+            return
+
+        self._hash[media.get_id()].update(media)
+
+    def _on_source_removed(self, registry, source):
+        print("removed", source.props.source_id)
+
+    def _initial_fill(self, source):
+        options = self._fast_options.copy()
+        query = """
+            SELECT
+                rdf:type(?song)
+                ?song AS ?tracker_urn
+                nie:title(?song) AS ?title
+                tracker:id(?song) AS ?id
+                ?song
+                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
+                nie:usageCounter(?song) AS ?play_count
+                nmm:trackNumber(?song) AS ?track_number
+                nmm:setNumber(nmm:musicAlbumDisc(?song)) AS ?album_disc_number
+                ?tag AS ?favourite
+            WHERE {
+                ?song a nmm:MusicPiece .
+                OPTIONAL {
+                    ?song nao:hasTag ?tag .
+                    FILTER (?tag = nao:predefined-tag-favorite)
+                }
+            }
+        """.replace('\n', ' ').strip()
+
+        self._source.query(
+            query, self.METADATA_KEYS, options, self._add_to_model)
+
+    def _add_to_model(self, source, op_id, media, user_data, error):
+        if error:
+            print("ERROR", error)
+            return
+
+        if not media:
+            print("NO MEDIA", source, op_id, media, error)
+            return
+
+        song = CoreSong(media)
+        self._model.append(song)
+        self._hash[media.get_id()] = song
+        # self._url_table[media.get_url()] = song
+
+    def _initial_albums_fill(self, source):
+        query = """
+        SELECT
+            rdf:type(?album)
+            tracker:id(?album) AS ?id
+            nmm:artistName(?album_artist) AS ?album_artist
+            nie:title(?album) as ?title
+        {
+            ?album a nmm:MusicAlbum .
+            OPTIONAL { ?album nmm:albumArtist ?albumArtist . }
+        }
+        """.replace('\n', ' ').strip()
+
+        options = self._fast_options.copy()
+
+        source.query(
+            query, self.METADATA_KEYS, options, self._add_to_albums_model)
+
+    def _add_to_albums_model(self, source, op_id, media, user_data, error):
+        if error:
+            print("ERROR", error)
+            return
+
+        if not media:
+            print("NO MEDIA", source, op_id, media, error)
+            return
+
+        album = CoreAlbum(media)
+        self._albums_model.append(album)