X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fwebserv.py;h=6c53d03f6b5814c2503abf70b0394fa383f6fe8f;hb=ab24a35394310bdae5072c5bc91826feb38902ec;hp=10ed2b95bbc8cbbd672f38386f38fa3631b2279b;hpb=e86c25ed9e97c5dd3e0672d5b17bed01d4a23fdf;p=mpd-sima.git

diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py
index 10ed2b9..6c53d03 100644
--- a/sima/lib/webserv.py
+++ b/sima/lib/webserv.py
@@ -81,8 +81,8 @@ class WebService(AdvancedPlugin):
             self.log.info('%s: Flushing cache!', name)
         else:
             self.log.info('%s: Initialising cache!', name)
-        self._cache = {'asearch': dict(),
-                       'tsearch': dict()}
+        self._cache = {'asearch': {},
+                       'tsearch': {}}
 
     def _cleanup_cache(self):
         """Avoid bloated cache
@@ -101,9 +101,9 @@ class WebService(AdvancedPlugin):
         dynamic = self.plugin_conf.getint('max_art')
         if dynamic <= 0:
             dynamic = 100
-        results = list()
+        results = []
         similarities.reverse()
-        while (len(results) < dynamic and similarities):
+        while (len(results) < dynamic+1 and similarities):
             art_pop = similarities.pop()
             res = self.player.search_artist(art_pop)
             if res:
@@ -123,7 +123,7 @@ class WebService(AdvancedPlugin):
         except WSNotFound as err:
             self.log.warning('%s: %s', self.ws.name, err)
             if artist.mbid:
-                self.log.debug('Trying without MusicBrainzID')
+                self.log.info('Trying without MusicBrainzID')
                 try:
                     return self.ws_similar_artists(Artist(name=artist.name))
                 except WSNotFound as err:
@@ -156,8 +156,8 @@ class WebService(AdvancedPlugin):
             history = self.player.queue + history
         history = deque(history)
         last_trk = history.popleft()  # remove
-        extra_arts = list()
-        ret_extra = list()
+        extra_arts = []
+        ret_extra = []
         depth = 0
         while depth < self.plugin_conf.getint('depth'):
             if not history:
@@ -250,7 +250,7 @@ class WebService(AdvancedPlugin):
     def find_album(self, artists):
         """Find albums to queue.
         """
-        to_add = list()
+        to_add = []
         nb_album_add = 0
         target_album_to_add = self.plugin_conf.getint('album_to_add')
         for artist in artists:
@@ -277,7 +277,7 @@ class WebService(AdvancedPlugin):
         """
         find top tracks for artists in artists list.
         """
-        to_add = list()
+        to_add = []
         nbtracks_target = self.plugin_conf.getint('track_to_add')
         for artist in artists:
             if len(to_add) == nbtracks_target:
@@ -285,7 +285,7 @@ class WebService(AdvancedPlugin):
             self.log.info('Looking for a top track for %s', artist)
             titles = deque()
             try:
-                titles = [t for t in self.ws.get_toptrack(artist)]
+                titles = list(self.ws.get_toptrack(artist))
             except WSError as err:
                 self.log.warning('%s: %s', self.ws.name, err)
                 continue
@@ -353,7 +353,7 @@ class WebService(AdvancedPlugin):
             self.log.debug(repr(self.player.current))
             return None
         candidates = self.queue_mode()
-        msg = ' '.join(['{0}: {1:>3d}'.format(k, v) for
+        msg = ' '.join([f'{k}: {v:>3d}' for
                         k, v in sorted(self.ws.stats.items())])
         self.log.debug('http stats: ' + msg)
         if not candidates: