X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fwebserv.py;h=0a04ddb5c505ae69464285d75aaf9209e70cca9b;hb=64f927d489fa6f0edfe47e9c6105198c7f2a1c89;hp=c05b86d971a2b2a870532b54121f23a2b0ad8c3c;hpb=41048503e9b3cf0fdc58e14f35f483889a0b05ae;p=mpd-sima.git diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py index c05b86d..0a04ddb 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): @@ -147,7 +147,6 @@ class WebService(Plugin): hist.insert(0, art) reorg = [art for art in alist if art not in hist] reorg.extend(hist) - self.log.info('{}'.format(' / '.join([a.name for a in reorg]))) return reorg @cache @@ -169,7 +168,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. """ @@ -180,9 +179,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: @@ -190,33 +193,39 @@ 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() + depth = 0 while depth < self.plugin_conf.getint('depth'): 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([art.name for art in extra_arts]))) + self.log.debug('EXTRA ARTS: {}'.format( + '/'.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 = set(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: {}'.format( + ' / '.join(map(str, MetaContainer(ret_extra))))) return ret_extra def get_local_similar_artists(self): @@ -232,34 +241,48 @@ class WebService(Plugin): self.log.info('Got nothing from {0}!'.format(self.ws.name)) return [] self.log.info('First five similar artist(s): {}...'.format( - ' / '.join([a.name for a in list(similar)[0:5]]))) + ' / '.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: {}'.format( + ' / '.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: ret_extra = self.get_recursive_similar_artist() if ret_extra: - ret = set(ret) | set(ret_extra) + # get them reorg to pick up best element + ret_extra = self._get_artists_list_reorg(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: {}'.format( + ' / '.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]) 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))) - return self._get_artists_list_reorg(list(ret)) + candidates = self._get_artists_list_reorg(list(ret)) + if candidates: + self.log.info(' / '.join(map(str, candidates))) + return candidates def _get_album_history(self, artist=None): """Retrieve album history""" @@ -321,7 +344,6 @@ class WebService(Plugin): self.to_add = list() nbtracks_target = self.plugin_conf.getint('track_to_add') 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)) @@ -330,10 +352,8 @@ class WebService(Plugin): titles = [t for t in self.ws.get_toptrack(artist)] except WSError as err: self.log.warning('{0}: {1}'.format(self.ws.name, err)) - if self.ws.ratelimit: - self.log.info('{0.name} ratelimit: {0.ratelimit}'.format(self.ws)) for trk in titles: - found = self.player.fuzzy_find_track(artist.name, trk.title) + found = self.player.fuzzy_find_track(artist, trk.title) random.shuffle(found) if found: self.log.debug('{0}'.format(found[0])) @@ -389,7 +409,7 @@ class WebService(Plugin): self.queue_mode() msg = ' '.join(['{0}: {1:>3d}'.format(k, v) for k, v in sorted(self.ws.stats.items())]) - self.log.debug(msg) + self.log.debug('http stats: ' + msg) candidates = self.to_add self.to_add = list() if self.plugin_conf.get('queue_mode') != 'album':