New, slightly enhanced, meta Objects.

[mpd-sima.git] / sima / lib / webserv.py

diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py
index a4fb056eca87cb820768779b0d697f6b0b9eae4a..547c9ceb388fed8db27eecb717c0329de657a49d 100644 (file)
--- a/sima/lib/webserv.py
+++ b/sima/lib/webserv.py
@@ -201,10 +201,10 @@ class WebService(Plugin):
             if len(history) == 0:
                 break
             trk = history.popleft()
-            if (trk.get_artist() in extra_arts
-                or trk.get_artist() == last_trk.get_artist()):
+            if (trk.Artist in extra_arts
+                or trk.Artist == last_trk.Artist):
                 continue
-            extra_arts.append(trk.get_artist())
+            extra_arts.append(trk.Artist)
             depth += 1
         self.log.info('EXTRA ARTS: {}'.format(
             '/'.join([art.name for art in extra_arts])))
@@ -224,7 +224,7 @@ class WebService(Plugin):
         """
         if not self.player.playlist:
             return []
-        tolookfor = self.player.playlist[-1].get_artist()
+        tolookfor = self.player.playlist[-1].Artist
         self.log.info('Looking for artist similar to "{}"'.format(tolookfor))
         similar = self.ws_similar_artists(tolookfor)
         if not similar:
@@ -244,17 +244,17 @@ class WebService(Plugin):
             self.log.warning('Got nothing from music library.')
             self.log.warning('Try running in debug mode to guess why...')
             return []
-        self.log.info('Got {} artists in library'.format(len(ret)))
         queued_artists = { trk.artist for trk in self.player.queue }
         if ret & queued_artists:
             self.log.debug('Removing already queued artist: {0}'.format(ret & queued_artists))
-            ret = list(ret - queued_artists)
+            ret = ret - queued_artists
         if self.player.current.artist in ret:
             self.log.debug('Removing current artist: {0}'.format(self.player.current.artist))
-            ret = list(ret - {self.player.current.artist})
+            ret = ret - {self.player.current.artist}
         # Move around similars items to get in unplayed|not recently played
         # artist first.
-        return self._get_artists_list_reorg(ret)
+        self.log.info('Got {} artists in library'.format(len(ret)))
+        return self._get_artists_list_reorg(list(ret))
 
     def _get_album_history(self, artist=None):
         """Retrieve album history"""