X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fwebserv.py;h=d7fb6faa4558219d1046942328ea6e7f4882b33e;hb=6402445cb58902ab23298df19c020bd453914048;hp=547c9ceb388fed8db27eecb717c0329de657a49d;hpb=2eb13c85fe72ade75193b589748920615fbb22d2;p=mpd-sima.git diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py index 547c9ce..d7fb6fa 100644 --- a/sima/lib/webserv.py +++ b/sima/lib/webserv.py @@ -32,15 +32,15 @@ from hashlib import md5 # local import from .plugin import Plugin from .track import Track -from .meta import Artist -from ..utils.utils import WSError +from .meta import Artist, MetaContainer +from ..utils.utils import WSError, WSNotFound def cache(func): """Caching decorator""" def wrapper(*args, **kwargs): #pylint: disable=W0212,C0111 cls = args[0] - similarities = [art for art in args[1]] + similarities = [art.name for art in args[1]] hashedlst = md5(''.join(similarities).encode('utf-8')).hexdigest() if hashedlst in cls._cache.get('asearch'): cls.log.debug('cached request') @@ -140,19 +140,14 @@ class WebService(Plugin): Move around items in artists_list in order to play first not recently played artists """ - # TODO: move to utils as a decorator + hist = list() duration = self.daemon_conf.getint('sima', 'history_duration') - art_in_hist = list() - for trk in self.sdb.get_history(duration=duration, artists=alist): - if trk[0] not in art_in_hist: - art_in_hist.append(trk[0]) - art_in_hist.reverse() - art_not_in_hist = [ar for ar in alist if ar not in art_in_hist] - random.shuffle(art_not_in_hist) - art_not_in_hist.extend(art_in_hist) - self.log.info('{}'.format( - ' / '.join(art_not_in_hist))) - return art_not_in_hist + 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): @@ -166,9 +161,11 @@ class WebService(Plugin): results = list() similarities.reverse() while (len(results) < dynamic - and len(similarities) > 0): + and len(similarities) > 0): art_pop = similarities.pop() - results.extend(self.player.fuzzy_find_artist(art_pop)) + res = self.player.search_artist(art_pop) + if res: + results.append(res) return results def ws_similar_artists(self, artist=None): @@ -177,46 +174,54 @@ 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)) + as_artists = self.ws.get_similar(artist=artist) + self.log.debug('Requesting {} for {!r}'.format(self.ws.name, artist)) try: - # TODO: let's propagate Artist type - [as_art.append(str(art)) for art in as_artists] + [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)) except WSError as err: - self.log.warning('{0}: {1}'.format(self.ws.name, err)) + self.log.warning('{}: {}'.format(self.ws.name, err)) if as_art: - self.log.debug('Fetched {0} artist(s)'.format(len(as_art))) + self.log.debug('Fetched {} artist(s)'.format(len(as_art))) return as_art def get_recursive_similar_artist(self): - ret_extra = list() - history = deque(self.history) - history.popleft() - depth = 0 if not self.player.playlist: - return ret_extra - last_trk = self.player.playlist[-1] + return + 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]))) + '/'.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 + 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) fond: {}...'.format( + ' / '.join(map(str, ret_extra)))) + if last_trk.Artist in ret_extra: + ret_extra.remove(last_trk.Artist) return ret_extra def get_local_similar_artists(self): @@ -226,41 +231,54 @@ class WebService(Plugin): return [] tolookfor = self.player.playlist[-1].Artist self.log.info('Looking for artist similar to "{}"'.format(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)) return [] self.log.info('First five similar artist(s): {}...'.format( - ' / '.join([a 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)) 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) + # pickup half the number of ret artist + ret_extra = MetaContainer(ret_extra[:len(ret)//2]) + self.log.debug('Using extra: {}'.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 [] - queued_artists = { trk.artist for trk in self.player.queue } + # WARNING: + # * operation on set will not match against aliases + # * composite set w/ mbid set and whitout won't match either + queued_artists = MetaContainer([trk.Artist for trk in self.player.queue]) if ret & queued_artists: - self.log.debug('Removing already queued artist: {0}'.format(ret & queued_artists)) + self.log.debug('Removing already queued artists: ' + '{0}'.format('/'.join(map(str, ret & queued_artists)))) ret = ret - queued_artists - if self.player.current.artist in ret: - self.log.debug('Removing current artist: {0}'.format(self.player.current.artist)) - ret = ret - {self.player.current.artist} + 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]) # 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""" duration = self.daemon_conf.getint('sima', 'history_duration') albums_list = set() - for trk in self.sdb.get_history(artist=artist, duration=duration): + for trk in self.sdb.get_history(artist=artist.name, duration=duration): albums_list.add(trk[1]) return albums_list @@ -272,7 +290,7 @@ class WebService(Plugin): target_album_to_add = self.plugin_conf.getint('album_to_add') for artist in artists: self.log.info('Looking for an album to add for "%s"...' % artist) - albums = self.player.find_albums(artist) + albums = self.player.search_albums(artist) # str conversion while Album type is not propagated albums = [str(album) for album in albums] if albums: @@ -315,7 +333,6 @@ class WebService(Plugin): """ self.to_add = list() nbtracks_target = self.plugin_conf.getint('track_to_add') - webserv = self.ws() for artist in artists: artist = Artist(name=artist) if len(self.to_add) == nbtracks_target: @@ -323,13 +340,11 @@ class WebService(Plugin): self.log.info('Looking for a top track for {0}'.format(artist)) titles = deque() try: - titles = [t for t in webserv.get_toptrack(artist)] + 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])) @@ -354,8 +369,7 @@ class WebService(Plugin): if len(self.to_add) == nbtracks_target: break if not self.to_add: - self.log.debug('Found no tracks to queue, is your ' + - 'history getting too large?') + 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)) @@ -386,7 +400,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':