Fixed type issue with depth/recursion

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

diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py
index b805b916396740adb5213cbf77accf1258088635..c84c78cc26f2d0fe79cf9a94bfe14773f6cbd6c4 100644 (file)
--- a/sima/lib/webserv.py
+++ b/sima/lib/webserv.py
@@ -92,7 +92,7 @@ class WebService(Plugin):
     def _cleanup_cache(self):
         """Avoid bloated cache
         """
-        for _ , val in self._cache.items():
+        for _, val in self._cache.items():
             if isinstance(val, dict):
                 while len(val) > 150:
                     val.popitem()
@@ -148,7 +148,7 @@ class WebService(Plugin):
             if trk[0] not in art_in_hist:
                 art_in_hist.append(trk[0])
         art_in_hist.reverse()
-        art_not_in_hist = [ ar for ar in alist if ar not in art_in_hist ]
+        art_not_in_hist = [ar for ar in alist if ar not in art_in_hist]
         random.shuffle(art_not_in_hist)
         art_not_in_hist.extend(art_in_hist)
         self.log.info('{}'.format(
@@ -195,8 +195,6 @@ class WebService(Plugin):
             self.log.warning('{0}: {1}'.format(self.ws.name, err))
         if as_art:
             self.log.debug('Fetched {0} artist(s)'.format(len(as_art)))
-        if self.ws.ratelimit:
-            self.log.info('{0.name} ratelimit: {0.ratelimit}'.format(self.ws))
         return as_art
 
     def get_recursive_similar_artist(self):
@@ -210,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
@@ -275,7 +272,7 @@ class WebService(Plugin):
             self.log.info('Looking for an album to add for "%s"...' % artist)
             albums = self.player.find_albums(artist)
             # str conversion while Album type is not propagated
-            albums = [ str(album) for album in albums]
+            albums = [str(album) for album in albums]
             if albums:
                 self.log.debug('Albums candidate: {0:s}'.format(
                                ' / '.join(albums)))
@@ -345,6 +342,9 @@ class WebService(Plugin):
             self.log.debug('Trying to find titles to add for "{}"'.format(
                            artist))
             found = self.player.find_track(artist)
+            if not found:
+                self.log.debug('Found nothing to queue for {0}'.format(artist))
+                continue
             # find tracks not in history for artist
             self.filter_track(found)
             if len(self.to_add) == nbtracks_target:
@@ -366,7 +366,6 @@ class WebService(Plugin):
         """Get some tracks for top track queue mode
         """
         artists = self.get_local_similar_artists()
-        nbtracks_target = self.plugin_conf.getint('track_to_add')
         self.find_top(artists)
         for track in self.to_add:
             self.log.info('{1} candidates: {0!s}'.format(track, self.ws.name))
@@ -381,6 +380,9 @@ class WebService(Plugin):
             self.log.debug(repr(self.player.current))
             return None
         self.queue_mode()
+        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':