X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fwebserv.py;h=44131d40d4c09c3561a6625b58c821e5876a4cda;hb=6ce8e09e316f315d437377ab0850da045cb0f041;hp=0304dd639c1cd9866abb64026720e49a8ef3aec8;hpb=751e07b3e43a4812c29f1c89f03e58023278b634;p=mpd-sima.git diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py index 0304dd6..44131d4 100644 --- a/sima/lib/webserv.py +++ b/sima/lib/webserv.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009-2019 Jack Kaliko +# Copyright (c) 2009-2020 kaliko # Copyright (c) 2019 sacha # # This file is part of sima @@ -33,7 +33,7 @@ from hashlib import md5 # local import from .plugin import Plugin from .track import Track -from .meta import Artist, Album, MetaContainer +from .meta import Artist, 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))) @@ -297,7 +298,7 @@ class WebService(Plugin): self.log.info(' / '.join(map(str, candidates))) return candidates - def _get_album_history(self, artist=None): + def _get_album_history(self, artist): """Retrieve album history""" duration = self.daemon_conf.getint('sima', 'history_duration') albums_list = set() @@ -310,24 +311,20 @@ class WebService(Plugin): """ self.to_add = list() nb_album_add = 0 - target_album_to_add = self.plugin_conf.getint('album_to_add') # pylint: disable=no-member + target_album_to_add = self.plugin_conf.getint('album_to_add') # pylint: disable=no-member for artist in artists: self.log.info('Looking for an album to add for "%s"...' % artist) 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 - # albums yet in history for this artist - albums = set(albums) - albums_yet_in_hist = albums & self._get_album_history(artist=artist) - albums_not_in_hist = list(albums - albums_yet_in_hist) + if not albums: + continue + self.log.debug('Albums candidate: %s', albums) + albums_hist = self._get_album_history(artist) + albums_not_in_hist = [a for a in albums if a.name not in albums_hist] # Get to next artist if there are no unplayed albums if not albums_not_in_hist: self.log.info('No unplayed album found for "%s"' % artist) continue - album_to_queue = str() + album_to_queue = [] random.shuffle(albums_not_in_hist) for album in albums_not_in_hist: # Controls the album found is not already queued @@ -343,10 +340,10 @@ 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_tracks(Album(name=album_to_queue, - artist=artist)) + candidates = self.player.find_tracks(album) if self.plugin_conf.getboolean('shuffle_album'): random.shuffle(candidates) # this allows to select a maximum number of track from the album @@ -385,13 +382,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) @@ -401,7 +398,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