Some more cleanup, logs and player calls

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

diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py
index 2ff88d2224f7c59f7fb8b88296207bd9ff82a0b7..2a9b8558ce4ce482d4d97f76438e9ce937461b25 100644 (file)
--- a/sima/lib/webserv.py
+++ b/sima/lib/webserv.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2009-2015 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2009-2019 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2019 sacha <sachahony@gmail.com>
 #
 #  This file is part of sima
 #
@@ -32,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):
@@ -240,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])))
@@ -279,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)))
@@ -315,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)
@@ -342,9 +344,19 @@ 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
-            self.to_add.extend(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
+            # a value of 0 (default) means keep all
+            nbtracks = self.plugin_conf.getint('track_to_add_from_album')
+            if nbtracks > 0:
+                candidates = candidates[0:nbtracks]
+            self.to_add.extend(candidates)
             if nb_album_add == target_album_to_add:
                 return True
 
@@ -364,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])
@@ -375,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)
@@ -391,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