X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fwebserv.py;h=a1f6d99d36f92cdc069839190249f57fa1021f94;hb=6ec7666214b71dc121a0d9b0fdb9ca7d48bda6d5;hp=36b364ff5abd742ea5b619baa7ac6f85752cceca;hpb=4f3916a06726459104bfa97fe85e4bbf5b48b9ed;p=mpd-sima.git

diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py
index 36b364f..a1f6d99 100644
--- a/sima/lib/webserv.py
+++ b/sima/lib/webserv.py
@@ -226,6 +226,7 @@ class WebService(Plugin):
             return []
         tolookfor = self.player.playlist[-1].Artist
         self.log.info('Looking for artist similar to "{}"'.format(tolookfor))
+        self.log.debug(repr(tolookfor))
         similar = self.ws_similar_artists(tolookfor)
         if not similar:
             self.log.info('Got nothing from {0}!'.format(self.ws.name))
@@ -244,13 +245,13 @@ class WebService(Plugin):
             self.log.warning('Got nothing from music library.')
             self.log.warning('Try running in debug mode to guess why...')
             return []
-        queued_artists = { trk.Artist for trk in self.player.queue }
-        for art in queued_artists:
-            if art in ret:
-                self.log.debug('Removing already queued artist: {0}'.format(art))
-        ret = ret - queued_artists
+        # WARNING:
+        #   * operation on set will not match against aliases
+        #   * composite set w/ mbid set and whitout won't match either
+        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))
+            self.log.debug('Removing already queued artists: '
+                           '{0}'.format(ret & queued_artists))
             ret = ret - queued_artists
         if self.player.current and self.player.current.Artist in ret:
             self.log.debug('Removing current artist: {0}'.format(self.player.current.Artist))
@@ -329,10 +330,8 @@ class WebService(Plugin):
                 titles = [t for t in self.ws.get_toptrack(artist)]
             except WSError as err:
                 self.log.warning('{0}: {1}'.format(self.ws.name, err))
-            if self.ws.ratelimit:
-                self.log.info('{0.name} ratelimit: {0.ratelimit}'.format(self.ws))
             for trk in titles:
-                found = self.player.fuzzy_find_track(artist.name, trk.title)
+                found = self.player.fuzzy_find_track(artist, trk.title)
                 random.shuffle(found)
                 if found:
                     self.log.debug('{0}'.format(found[0]))
@@ -388,7 +387,7 @@ class WebService(Plugin):
         self.queue_mode()
         msg = ' '.join(['{0}: {1:>3d}'.format(k, v) for
                         k, v in sorted(self.ws.stats.items())])
-        self.log.debug(msg)
+        self.log.debug('http stats: ' + msg)
         candidates = self.to_add
         self.to_add = list()
         if self.plugin_conf.get('queue_mode') != 'album':