]> kaliko git repositories - mpd-sima.git/commitdiff
Fixed other inconsistencies
authorkaliko <kaliko@azylum.org>
Sun, 23 Nov 2014 17:46:03 +0000 (18:46 +0100)
committerkaliko <kaliko@azylum.org>
Sun, 23 Nov 2014 17:46:03 +0000 (18:46 +0100)
sima/lib/webserv.py

index a4fb056eca87cb820768779b0d697f6b0b9eae4a..699385d7587c09d22f8553f71047880bb2cd22fc 100644 (file)
@@ -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"""