X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fwebserv.py;h=4996622c028c24da238b06032bb39c79d51d0b03;hb=1c01e4a7aa37eeef825c6918fc90b154a7f4ccc7;hp=79a9b9b01c58abb342c2eb1e4668809b2cf858f6;hpb=40a57f2ddcd2c52318e405383005fe291bd5d9b6;p=mpd-sima.git diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py index 79a9b9b..4996622 100644 --- a/sima/lib/webserv.py +++ b/sima/lib/webserv.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009-2014 Jack Kaliko +# Copyright (c) 2009-2015 Jack Kaliko # # This file is part of sima # @@ -32,7 +32,7 @@ from hashlib import md5 # local import from .plugin import Plugin from .track import Track -from .meta import Artist +from .meta import Artist, MetaContainer from ..utils.utils import WSError, WSNotFound def cache(func): @@ -67,11 +67,9 @@ class WebService(Plugin): self.to_add = list() self._cache = None self._flush_cache() - wrapper = { - 'track': self._track, - 'top': self._top, - 'album': self._album, - } + wrapper = {'track': self._track, + 'top': self._top, + 'album': self._album,} self.queue_mode = wrapper.get(self.plugin_conf.get('queue_mode')) self.ws = None @@ -84,10 +82,8 @@ class WebService(Plugin): self.log.info('{0}: Flushing cache!'.format(name)) else: self.log.info('{0}: Initialising cache!'.format(name)) - self._cache = { - 'asearch': dict(), - 'tsearch': dict(), - } + self._cache = {'asearch': dict(), + 'tsearch': dict(),} def _cleanup_cache(self): """Avoid bloated cache @@ -123,11 +119,11 @@ class WebService(Plugin): 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'): + 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 self.to_add]): + trk.album in [tr.album for tr in self.to_add]): self.log.debug('Found unplayed track ' + - 'but from an album already queued: %s' % (trk)) + 'but from an album already queued: %s', trk) continue candidate.append(trk) if not candidate: @@ -155,7 +151,7 @@ class WebService(Plugin): Look in player library for availability of similar artists in similarities """ - dynamic = self.plugin_conf.getint('max_art') + dynamic = self.plugin_conf.getint('max_art') # pylint: disable=no-member if dynamic <= 0: dynamic = 100 results = list() @@ -168,7 +164,7 @@ class WebService(Plugin): results.append(res) return results - def ws_similar_artists(self, artist=None): + def ws_similar_artists(self, artist): """ Retrieve similar artists from WebServive. """ @@ -179,9 +175,13 @@ class WebService(Plugin): try: [as_art.append(art) for art in as_artists] except WSNotFound as err: - if artist.mbid: - return self.ws_similar_artists(Artist(name=artist.name)) self.log.warning('{}: {}'.format(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)) except WSError as err: self.log.warning('{}: {}'.format(self.ws.name, err)) if as_art: @@ -189,34 +189,38 @@ class WebService(Plugin): return as_art def get_recursive_similar_artist(self): - history = deque(self.history) - history.popleft() - depth = 0 if not self.player.playlist: return - last_trk = self.player.playlist[-1] + history = list(self.history) + history = self.player.queue + history + history = deque(history) + last_trk = history.popleft() # remove extra_arts = list() ret_extra = list() - while depth < self.plugin_conf.getint('depth'): + depth = 0 + while depth < self.plugin_conf.getint('depth'): # pylint: disable=no-member if len(history) == 0: break trk = history.popleft() if (trk.Artist in extra_arts - or trk.Artist == last_trk.Artist): + or trk.Artist == last_trk.Artist): continue extra_arts.append(trk.Artist) depth += 1 - self.log.info('EXTRA ARTS: {}'.format( - '/'.join(map(str, extra_arts)))) + 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)) similar = self.ws_similar_artists(artist=artist) if not similar: - return [] - ret_extra = self.get_artists_from_player(similar) - if last_trk.Artist in ret_extra: - ret_extra.remove(last_trk.Artist) + continue + ret_extra.extend(self.get_artists_from_player(similar)) + + if last_trk.Artist in ret_extra: + ret_extra.remove(last_trk.Artist) + if ret_extra: + self.log.debug('similar artist(s) found: %s', + ' / '.join(map(str, MetaContainer(ret_extra)))) return ret_extra def get_local_similar_artists(self): @@ -231,42 +235,50 @@ class WebService(Plugin): if not similar: self.log.info('Got nothing from {0}!'.format(self.ws.name)) return [] - self.log.info('First five similar artist(s): {}...'.format( - ' / '.join(map(str, list(similar)[:5])))) + self.log.info('First five similar artist(s): %s...', + ' / '.join(map(str, list(similar)[:5]))) self.log.info('Looking availability in music library') - ret = set(self.get_artists_from_player(similar)) + ret = MetaContainer(self.get_artists_from_player(similar)) + if ret: + self.log.debug('regular found in library: %s', + ' / '.join(map(str, ret))) + else: + self.log.debug('Got nothing similar from library!') ret_extra = None if len(self.history) >= 2: - if self.plugin_conf.getint('depth') > 1: + if self.plugin_conf.getint('depth') > 1: # pylint: disable=no-member 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) - # pickup half the number of ret artist - ret_extra = set(ret_extra[:len(ret)//2]) - self.log.debug('Using extra: {}'.format( - ' / '.join(map(str, ret_extra)))) + # tries to pickup less artist from extra art + if len(ret) < 4: + ret_extra = MetaContainer(ret_extra) + else: + ret_extra = MetaContainer(ret_extra[:max(4, len(ret))//2]) + if ret_extra: + self.log.debug('extra found in library: %s', + ' / '.join(map(str, ret_extra))) ret = ret | ret_extra if not ret: self.log.warning('Got nothing from music library.') - self.log.warning('Try running in debug mode to guess why...') return [] - # WARNING: - # * operation on set will not match against aliases - # * composite set w/ mbid set and whitout won't match either - queued_artists = {trk.Artist for trk in self.player.queue} + 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)) if ret & queued_artists: self.log.debug('Removing already queued artists: ' - '{0}'.format(ret & queued_artists)) + '{0}'.format('/'.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 - {self.player.current.Artist} + ret = ret - MetaContainer([self.player.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(' / '.join(map(str, candidates))) + if candidates: + self.log.info(' / '.join(map(str, candidates))) return candidates def _get_album_history(self, artist=None): @@ -282,15 +294,14 @@ class WebService(Plugin): """ self.to_add = list() nb_album_add = 0 - target_album_to_add = self.plugin_conf.getint('album_to_add') + 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: {0:s}'.format( - ' / '.join(albums))) + self.log.debug('Albums candidate: %s', ' / '.join(albums)) else: continue # albums yet in history for this artist albums = set(albums) @@ -308,15 +319,13 @@ class WebService(Plugin): # 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) + self.log.debug('"%s" already queued, skipping!', tracks[0].album) continue album_to_queue = album if not album_to_queue: - self.log.info('No album found for "%s"' % artist) + self.log.info('No album found for "%s"', artist) continue - self.log.info('{2} album candidate: {0} - {1}'.format( - artist, album_to_queue, self.ws.name)) + 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)) if nb_album_add == target_album_to_add: @@ -327,9 +336,8 @@ class WebService(Plugin): find top tracks for artists in artists list. """ self.to_add = list() - nbtracks_target = self.plugin_conf.getint('track_to_add') + nbtracks_target = self.plugin_conf.getint('track_to_add') # pylint: disable=no-member for artist in artists: - artist = Artist(name=artist) if len(self.to_add) == nbtracks_target: return True self.log.info('Looking for a top track for {0}'.format(artist)) @@ -337,12 +345,12 @@ class WebService(Plugin): try: titles = [t for t in self.ws.get_toptrack(artist)] except WSError as err: - self.log.warning('{0}: {1}'.format(self.ws.name, err)) + self.log.warning('%s: %s', self.ws.name, err) for trk in titles: found = self.player.fuzzy_find_track(artist, trk.title) random.shuffle(found) if found: - self.log.debug('{0}'.format(found[0])) + self.log.debug('%s', found[0]) if self.filter_track(found): break @@ -350,10 +358,9 @@ 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') + 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 "{}"'.format( - artist)) + self.log.debug('Trying to find titles to add for "%r"', artist) found = self.player.find_track(artist) random.shuffle(found) if not found: