X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fwebserv.py;h=c84c78cc26f2d0fe79cf9a94bfe14773f6cbd6c4;hb=766b97a00129b73970d998976ee952f913130d68;hp=c4118c0f83c5689e874bcdc08843fe584bb70073;hpb=63563d000f2646724c1ff91eb6fcca01f5201d23;p=mpd-sima.git diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py index c4118c0..c84c78c 100644 --- a/sima/lib/webserv.py +++ b/sima/lib/webserv.py @@ -208,17 +208,16 @@ class WebService(Plugin): if len(history) == 0: break trk = history.popleft() - if (trk.artist in [trk.artist for trk in extra_arts] - or trk.artist == current.artist): + if (trk.get_artist() in extra_arts + or trk.get_artist() == current.get_artist()): continue - extra_arts.append(trk) + extra_arts.append(trk.get_artist()) depth += 1 self.log.info('EXTRA ARTS: {}'.format( - '/'.join([trk.artist for trk in extra_arts]))) + '/'.join([art.name for art in extra_arts]))) for artist in extra_arts: - self.log.debug( - 'Looking for artist similar to "{0.artist}" as well'.format( - artist)) + self.log.debug('Looking for artist similar ' + 'to "{}" as well'.format(artist)) similar = self.ws_similar_artists(artist=artist) if not similar: return ret_extra @@ -381,7 +380,9 @@ class WebService(Plugin): self.log.debug(repr(self.player.current)) return None self.queue_mode() - self.log.debug(self.ws.stats) + msg = ' '.join(['{0}: {1:>3d}'.format(k, v) for + k, v in sorted(self.ws.stats.items())]) + self.log.debug(msg) candidates = self.to_add self.to_add = list() if self.plugin_conf.get('queue_mode') != 'album':