[gnome-music] Make Grilo metadata calls consistent

[Marinus Schraal <mschraal src gnome org>]

commit 4d278e3a5e2364b3f2b72a32f229fe42a0be4785
Author: Marinus Schraal <mschraal src gnome org>
Date:   Mon May 16 09:54:08 2016 +0200

    Make Grilo metadata calls consistent
    
    Make the Grilo metadata retrieval use the domainspecific API calls
    only.

 gnomemusic/mpris.py   |    5 ++---
 gnomemusic/view.py    |   31 +++++++++----------------------
 gnomemusic/widgets.py |   11 +++--------
 3 files changed, 14 insertions(+), 33 deletions(-)
---
diff --git a/gnomemusic/mpris.py b/gnomemusic/mpris.py
index c2f34a4..91b9c1c 100644
--- a/gnomemusic/mpris.py
+++ b/gnomemusic/mpris.py
@@ -30,7 +30,6 @@ from gnomemusic.playlists import Playlists
 
 from gettext import gettext as _
 from gi.repository import GLib
-from gi.repository import Grl
 from gi.repository import Gio
 from gnomemusic import log
 import logging
@@ -309,7 +308,7 @@ class MediaPlayer2Service(Server):
             assert album is not None
         except:
             try:
-                album = media.get_string(Grl.METADATA_KEY_ALBUM)
+                album = media.get_album()
                 assert album is not None
             except:
                 album = _("Unknown Album")
@@ -321,7 +320,7 @@ class MediaPlayer2Service(Server):
             assert artist is not None
         except:
             try:
-                artist = media.get_string(Grl.METADATA_KEY_ARTIST)
+                artist = media.get_artist()
                 assert artist is not None
             except:
                 try:
diff --git a/gnomemusic/view.py b/gnomemusic/view.py
index 4092d90..14315c1 100644
--- a/gnomemusic/view.py
+++ b/gnomemusic/view.py
@@ -214,9 +214,7 @@ class ViewContainer(Gtk.Stack):
             return
 
         self._offset += 1
-        artist = item.get_string(Grl.METADATA_KEY_ARTIST)\
-            or item.get_artist() \
-            or _("Unknown Artist")
+        artist = item.get_artist() or _("Unknown Artist")
         title = albumArtCache.get_media_title(item)
         # item.set_title(title)
 
@@ -474,9 +472,7 @@ class Songs(ViewContainer):
             return
         self._offset += 1
         item.set_title(albumArtCache.get_media_title(item))
-        artist = item.get_string(Grl.METADATA_KEY_ARTIST)\
-            or item.get_artist() \
-            or _("Unknown Artist")
+        artist = item.get_artist() or _("Unknown Artist")
         if item.get_url() is None:
             return
         self.model.insert_with_valuesv(
@@ -574,7 +570,7 @@ class Songs(ViewContainer):
     def _on_list_widget_type_render(self, coll, cell, model, _iter, data):
         item = model.get_value(_iter, 5)
         if item:
-            cell.set_property('text', item.get_string(Grl.METADATA_KEY_ALBUM) or _("Unknown Album"))
+            cell.set_property('text', item.get_album() or _("Unknown Album"))
 
     def _on_list_widget_icon_render(self, col, cell, model, _iter, data):
         if not self.player.currentTrackUri:
@@ -728,9 +724,7 @@ class Artists (ViewContainer):
                 self.view.show()
             return
         self._offset += 1
-        artist = item.get_string(Grl.METADATA_KEY_ARTIST)\
-            or item.get_artist()\
-            or _("Unknown Artist")
+        artist = item.get_artist() or _("Unknown Artist")
         if not artist.casefold() in self._artists:
             _iter = self.model.insert_with_valuesv(-1, [2], [artist])
             self._artists[artist.casefold()] = {'iter': _iter, 'albums': [], 'widget': None}
@@ -988,7 +982,7 @@ class Playlist(ViewContainer):
 
         item = model.get_value(_iter, 5)
         if item:
-            cell.set_property('text', item.get_string(Grl.METADATA_KEY_ALBUM) or _("Unknown Album"))
+            cell.set_property('text', item.get_album() or _("Unknown Album"))
 
     def _on_list_widget_icon_render(self, col, cell, model, _iter, data):
         if not self.player.currentTrackUri:
@@ -1161,9 +1155,7 @@ class Playlist(ViewContainer):
         self._offset += 1
         title = albumArtCache.get_media_title(item)
         item.set_title(title)
-        artist = item.get_string(Grl.METADATA_KEY_ARTIST)\
-            or item.get_artist()\
-            or _("Unknown Artist")
+        artist = item.get_artist() or _("Unknown Artist")
         model.insert_with_valuesv(
             -1,
             [2, 3, 5, 9],
@@ -1453,11 +1445,8 @@ class Search(ViewContainer):
         if data != self.model:
             return
 
-        artist = item.get_string(Grl.METADATA_KEY_ARTIST) \
-            or item.get_artist() \
-            or _("Unknown Artist")
-        album = item.get_string(Grl.METADATA_KEY_ALBUM) \
-            or _("Unknown Album")
+        artist = item.get_artist() or _("Unknown Artist")
+        album = item.get_album() or _("Unknown Album")
 
         key = '%s-%s' % (artist, album)
         if key not in self._albums:
@@ -1505,9 +1494,7 @@ class Search(ViewContainer):
         self._offset += 1
         title = albumArtCache.get_media_title(item)
         item.set_title(title)
-        artist = item.get_string(Grl.METADATA_KEY_ARTIST) \
-            or item.get_artist() \
-            or _("Unknown Artist")
+        artist = item.get_artist() or _("Unknown Artist")
 
         group = 3
         try:
diff --git a/gnomemusic/widgets.py b/gnomemusic/widgets.py
index 4d8624f..1401f9b 100644
--- a/gnomemusic/widgets.py
+++ b/gnomemusic/widgets.py
@@ -31,8 +31,7 @@
 # delete this exception statement from your version.
 
 
-from gi.repository import Gtk, Gdk, Gd, GLib, GObject, Pango, Gio
-from gi.repository import GdkPixbuf, Grl
+from gi.repository import Gtk, Gdk, Gd, GLib, GObject, Pango, Gio, GdkPixbuf
 from gettext import gettext as _, ngettext
 from gnomemusic.grilo import grilo
 from gnomemusic.albumArtCache import AlbumArtCache
@@ -244,9 +243,7 @@ class AlbumWidget(Gtk.EventBox):
         self.selection_toolbar = selection_toolbar
         self.header_bar = header_bar
         self.album = album
-        real_artist = item.get_string(Grl.METADATA_KEY_ARTIST)\
-            or item.get_artist()\
-            or _("Unknown Artist")
+        real_artist = item.get_artist() or _("Unknown Artist")
         self.ui.get_object('cover').set_from_pixbuf(self.loadingIcon)
         ALBUM_ART_CACHE.lookup(item, 256, 256, self._on_look_up, None, real_artist, album)
 
@@ -656,9 +653,7 @@ class ArtistAlbumWidget(Gtk.Box):
 
     @log
     def _update_album_art(self):
-        real_artist = self.album.get_string(Grl.METADATA_KEY_ARTIST)\
-            or self.album.get_artist() \
-            or _("Unknown Artist")
+        real_artist = self.album.get_artist() or _("Unknown Artist")
         ALBUM_ART_CACHE.lookup(
             self.album, 128, 128, self._get_album_cover, None,
             real_artist, self.album.get_title())