Cleanup some logger calls

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

diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py
index 9800b92f32beca530b79502d13f65f5d45fceef0..38339f2aecb772d310308757c15bc2ca8008bee2 100644 (file)
--- a/sima/lib/webserv.py
+++ b/sima/lib/webserv.py
@@ -33,7 +33,7 @@ from hashlib import md5
 # local import
 from .plugin import Plugin
 from .track import Track
-from .meta import Artist, MetaContainer
+from .meta import Artist, Album, MetaContainer
 from ..utils.utils import WSError, WSNotFound
 
 def cache(func):
@@ -241,11 +241,11 @@ class WebService(Plugin):
         if not self.player.playlist:
             return []
         tolookfor = self.player.playlist[-1].Artist
-        self.log.info('Looking for artist similar to "{}"'.format(tolookfor))
+        self.log.info('Looking for artist similar to "%s"', 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))
+            self.log.info('Got nothing from %s!', self.ws.name)
             return []
         self.log.info('First five similar artist(s): %s...',
                       ' / '.join(map(str, list(similar)[:5])))
@@ -280,15 +280,16 @@ class WebService(Plugin):
             queued_artists = MetaContainer([trk.Artist for trk in self.player.playlist])
         else:
             queued_artists = MetaContainer([trk.Artist for trk in self.player.queue])
-        self.log.trace('Already queued: {}'.format(queued_artists))
-        self.log.trace('Candidate: {}'.format(ret))
+        self.log.trace('Already queued: %s', queued_artists)
+        self.log.trace('Candidate: %s', ret)
         if ret & queued_artists:
             self.log.debug('Removing already queued artists: '
-                           '{0}'.format('/'.join(map(str, ret & queued_artists))))
+                           '%s', '/'.join(map(str, 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))
-            ret = ret -  MetaContainer([self.player.current.Artist])
+        current = self.player.current
+        if current and current.Artist in ret:
+            self.log.debug('Removing current artist: %s', current.Artist)
+            ret = ret - MetaContainer([current.Artist])
         # Move around similars items to get in unplayed|not recently played
         # artist first.
         self.log.info('Got {} artists in library'.format(len(ret)))
@@ -343,9 +344,11 @@ class WebService(Plugin):
             if not album_to_queue:
                 self.log.info('No album found for "%s"', artist)
                 continue
-            self.log.info('%s album candidate: %s - %s', self.ws.name, artist, album_to_queue)
+            self.log.info('%s album candidate: %s - %s', self.ws.name,
+                          artist, album_to_queue)
             nb_album_add += 1
-            candidates = self.player.find_album(artist, album_to_queue)
+            candidates = self.player.find_tracks(Album(name=album_to_queue,
+                                                       artist=artist))
             if self.plugin_conf.getboolean('shuffle_album'):
                 random.shuffle(candidates)
             # this allows to select a maximum number of track from the album
@@ -373,7 +376,7 @@ class WebService(Plugin):
             except WSError as err:
                 self.log.warning('%s: %s', self.ws.name, err)
             for trk in titles:
-                found = self.player.fuzzy_find_track(artist, trk.title)
+                found = self.player.search_track(artist, trk.title)
                 random.shuffle(found)
                 if found:
                     self.log.debug('%s', found[0])