X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fwebserv.py;h=2a9b8558ce4ce482d4d97f76438e9ce937461b25;hb=31b3f50c99aa088bf21a3ac2ad6e8a974dfb4105;hp=38339f2aecb772d310308757c15bc2ca8008bee2;hpb=5f1dd8bdf50cd25c049e5c20742be87b461e6385;p=mpd-sima.git diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py index 38339f2..2a9b855 100644 --- a/sima/lib/webserv.py +++ b/sima/lib/webserv.py @@ -317,9 +317,9 @@ class WebService(Plugin): albums = self.player.search_albums(artist) # str conversion while Album type is not propagated albums = [str(album) for album in albums] - if albums: - self.log.debug('Albums candidate: %s', ' / '.join(albums)) - else: continue + if not albums: + continue + self.log.debug('Albums candidate: %s', ' / '.join(albums)) # albums yet in history for this artist albums = set(albums) albums_yet_in_hist = albums & self._get_album_history(artist=artist) @@ -387,13 +387,13 @@ class WebService(Plugin): """Get some tracks for track queue mode """ artists = self.get_local_similar_artists() - nbtracks_target = self.plugin_conf.getint('track_to_add') # pylint: disable=no-member + nbtracks_target = self.plugin_conf.getint('track_to_add') # pylint: disable=no-member for artist in artists: self.log.debug('Trying to find titles to add for "%r"', artist) - found = self.player.find_track(artist) + found = self.player.find_tracks(artist) random.shuffle(found) if not found: - self.log.debug('Found nothing to queue for {0}'.format(artist)) + self.log.debug('Found nothing to queue for %s', artist) continue # find tracks not in history for artist self.filter_track(found) @@ -403,7 +403,7 @@ class WebService(Plugin): self.log.debug('Found no tracks to queue!') return None for track in self.to_add: - self.log.info('{1} candidates: {0!s}'.format(track, self.ws.name)) + self.log.info('%s candidates: %s', track, self.ws.name) def _album(self): """Get albums for album queue mode