X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fwebserv.py;h=c8ab86ec5ba7378bb2a711c8d51c847e7e55dc2e;hb=d0232dae194becb33696266083df400a54afbd27;hp=cd28128978a9f6981e40486789e8f898d1446750;hpb=80162143f725cbe604f7241e4dfc4929833470e5;p=mpd-sima.git diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py index cd28128..c8ab86e 100644 --- a/sima/lib/webserv.py +++ b/sima/lib/webserv.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009-2015 Jack Kaliko +# Copyright (c) 2009-2020 kaliko +# Copyright (c) 2019 sacha # # This file is part of sima # @@ -30,10 +31,9 @@ from hashlib import md5 # third parties components # local import -from .plugin import Plugin -from .track import Track +from .plugin import AdvancedPlugin from .meta import Artist, MetaContainer -from ..utils.utils import WSError, WSNotFound +from ..utils.utils import WSError, WSNotFound, WSTimeout def cache(func): """Caching decorator""" @@ -54,15 +54,13 @@ def cache(func): return wrapper -class WebService(Plugin): +class WebService(AdvancedPlugin): """similar artists webservice """ # pylint: disable=bad-builtin def __init__(self, daemon): - Plugin.__init__(self, daemon) - self.daemon_conf = daemon.config - self.sdb = daemon.sdb + super().__init__(daemon) self.history = daemon.short_history ## self.to_add = list() @@ -70,9 +68,10 @@ class WebService(Plugin): self._flush_cache() wrapper = {'track': self._track, 'top': self._top, - 'album': self._album,} + 'album': self._album} self.queue_mode = wrapper.get(self.plugin_conf.get('queue_mode')) self.ws = None + self.ws_retry = 0 def _flush_cache(self): """ @@ -80,11 +79,11 @@ class WebService(Plugin): """ name = self.__class__.__name__ if isinstance(self._cache, dict): - self.log.info('{0}: Flushing cache!'.format(name)) + self.log.info('%s: Flushing cache!', name) else: - self.log.info('{0}: Initialising cache!'.format(name)) + self.log.info('%s: Initialising cache!', name) self._cache = {'asearch': dict(), - 'tsearch': dict(),} + 'tsearch': dict()} def _cleanup_cache(self): """Avoid bloated cache @@ -94,61 +93,6 @@ class WebService(Plugin): while len(val) > 150: val.popitem() - def get_history(self, artist): - """Constructs list of Track for already played titles for an artist. - """ - duration = self.daemon_conf.getint('sima', 'history_duration') - tracks_from_db = self.sdb.get_history(duration=duration, artist=artist) - # Construct Track() objects list from database history - played_tracks = [Track(artist=tr[-1], album=tr[1], title=tr[2], - file=tr[3]) for tr in tracks_from_db] - return played_tracks - - def filter_track(self, tracks): - """ - Extract one unplayed track from a Track object list. - * not in history - * not already in the queue - * not blacklisted - """ - artist = tracks[0].artist - if self.player.playmode.get('random'): - black_list = self.player.playlist + self.to_add - else: - black_list = self.player.queue + self.to_add - not_in_hist = list(set(tracks) - set(self.get_history(artist=artist))) - if self.plugin_conf.get('queue_mode') != 'top' and not not_in_hist: - self.log.debug('All tracks already played for "%s"', artist) - random.shuffle(not_in_hist) - candidate = [] - for trk in [_ for _ in not_in_hist if _ not in black_list]: - # Should use albumartist heuristic as well - if self.plugin_conf.getboolean('single_album'): # pylint: disable=no-member - if (trk.album == self.player.current.album or - trk.album in [tr.album for tr in black_list]): - self.log.debug('Found unplayed track ' + - 'but from an album already queued: %s', trk) - continue - candidate.append(trk) - if not candidate: - return False - self.to_add.append(random.choice(candidate)) - return True - - def _get_artists_list_reorg(self, alist): - """ - Move around items in artists_list in order to play first not recently - played artists - """ - hist = list() - duration = self.daemon_conf.getint('sima', 'history_duration') - for art in self.sdb.get_artists_history(alist, duration=duration): - if art not in hist: - hist.insert(0, art) - reorg = [art for art in alist if art not in hist] - reorg.extend(hist) - return reorg - @cache def get_artists_from_player(self, similarities): """ @@ -175,29 +119,39 @@ class WebService(Plugin): # initialize artists deque list to construct from DB as_art = deque() as_artists = self.ws.get_similar(artist=artist) - self.log.debug('Requesting {} for {!r}'.format(self.ws.name, artist)) + self.log.debug('Requesting %s for %r', self.ws.name, artist) try: [as_art.append(art) for art in as_artists] except WSNotFound as err: - self.log.warning('{}: {}'.format(self.ws.name, err)) + self.log.warning('%s: %s', self.ws.name, err) if artist.mbid: self.log.debug('Trying without MusicBrainzID') try: return self.ws_similar_artists(Artist(name=artist.name)) except WSNotFound as err: - self.log.debug('{}: {}'.format(self.ws.name, err)) + self.log.debug('%s: %s', self.ws.name, err) + except WSTimeout as err: + self.log.warning('%s: %s', self.ws.name, err) + if self.ws_retry < 3: + self.ws_retry += 1 + self.log.warning('%s: retrying', self.ws.name) + as_art = self.ws_similar_artists(artist) + else: + self.log.warning('%s: stop retrying', self.ws.name) + self.ws_retry = 0 except WSError as err: - self.log.warning('{}: {}'.format(self.ws.name, err)) + self.log.warning('%s: %s', self.ws.name, err) if as_art: - self.log.debug('Fetched {} artist(s)'.format(len(as_art))) + self.log.debug('Fetched %d artist(s)', len(as_art)) return as_art def get_recursive_similar_artist(self): """Check against local player for similar artists (recursive w/ history) """ if not self.player.playlist: - return + return [] history = list(self.history) + # In random play mode use complete playlist to filter if self.player.playmode.get('random'): history = self.player.playlist + history else: @@ -219,7 +173,7 @@ class WebService(Plugin): self.log.debug('EXTRA ARTS: %s', '/'.join(map(str, extra_arts))) for artist in extra_arts: self.log.debug('Looking for artist similar ' - 'to "{}" as well'.format(artist)) + 'to "%s" as well', artist) similar = self.ws_similar_artists(artist=artist) if not similar: continue @@ -238,11 +192,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.debug(repr(tolookfor)) + self.log.info('Looking for artist similar to "%s"', tolookfor) + self.log.debug('%r', 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]))) @@ -259,7 +213,7 @@ class WebService(Plugin): ret_extra = self.get_recursive_similar_artist() if ret_extra: # get them reorg to pick up best element - ret_extra = self._get_artists_list_reorg(ret_extra) + ret_extra = self.get_reorg_artists_list(ret_extra) # tries to pickup less artist from extra art if len(ret) < 4: ret_extra = MetaContainer(ret_extra) @@ -272,33 +226,36 @@ class WebService(Plugin): if not ret: self.log.warning('Got nothing from music library.') return [] + # In random play mode use complete playlist to filter if self.player.playmode.get('random'): 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))) - candidates = self._get_artists_list_reorg(list(ret)) + self.log.info('Got %d artists in library', len(ret)) + candidates = self.get_reorg_artists_list(list(ret)) if candidates: 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() - for trk in self.sdb.get_history(artist=artist.name, duration=duration): - albums_list.add(trk[1]) + for trk in self.get_history(artist=artist.name): + if not trk.album: + continue + albums_list.add(trk.album) return albums_list def find_album(self, artists): @@ -306,44 +263,19 @@ 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) - # 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() - random.shuffle(albums_not_in_hist) - for album in albums_not_in_hist: - tracks = self.player.find_album(artist, album) - # Look if one track of the album is already queued - # Good heuristic, at least enough to guess if the whole album is - # already queued. - if tracks[0] in self.player.queue: - self.log.debug('"%s" already queued, skipping!', tracks[0].album) - continue - if tracks[0] in self.player.playlist: - if self.player.playmode.get('random'): - self.log.debug('"%s" already in playlist, skipping!', tracks[0].album) - continue - album_to_queue = album - 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) + album = self.album_candidate(artist) nb_album_add += 1 - self.to_add.extend(self.player.find_album(artist, album_to_queue)) + 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 + # 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 @@ -355,42 +287,46 @@ class WebService(Plugin): nbtracks_target = self.plugin_conf.getint('track_to_add') # pylint: disable=no-member for artist in artists: if len(self.to_add) == nbtracks_target: - return True - self.log.info('Looking for a top track for {0}'.format(artist)) + return + self.log.info('Looking for a top track for %s', artist) titles = deque() try: titles = [t for t in self.ws.get_toptrack(artist)] except WSError as err: self.log.warning('%s: %s', self.ws.name, err) + continue for trk in titles: - found = self.player.fuzzy_find_track(artist, trk.title) - random.shuffle(found) + found = self.player.search_track(artist, trk.title) if found: - self.log.debug('%s', found[0]) - if self.filter_track(found): + random.shuffle(found) + top_trk = self.filter_track(found) + if top_trk: + self.to_add.append(top_trk) break def _track(self): """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) + track_candidate = self.filter_track(found) + if track_candidate: + self.to_add.append(track_candidate) if len(self.to_add) == nbtracks_target: break if not self.to_add: 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 @@ -404,7 +340,7 @@ class WebService(Plugin): artists = self.get_local_similar_artists() self.find_top(artists) for track in self.to_add: - self.log.info('{1} candidates: {0!s}'.format(track, self.ws.name)) + self.log.info('%s candidates: %s', self.ws.name, track) def callback_need_track(self): self._cleanup_cache()