X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fwebserv.py;h=f1afd55a41b7e2f279fed0d3ec0d02bd28ec6594;hb=a6a2ea116e050cd0f1c3f81a392878bcd22a5960;hp=291c4c4e3cccdb2c097f73ef04a14be908dd7ed8;hpb=78a694ddcd2a6ecc8b2b1fd3c74ee2d938707305;p=mpd-sima.git diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py index 291c4c4..f1afd55 100644 --- a/sima/lib/webserv.py +++ b/sima/lib/webserv.py @@ -92,7 +92,7 @@ class WebService(Plugin): def _cleanup_cache(self): """Avoid bloated cache """ - for _ , val in self._cache.items(): + for _, val in self._cache.items(): if isinstance(val, dict): while len(val) > 150: val.popitem() @@ -117,19 +117,11 @@ class WebService(Plugin): artist = tracks[0].artist black_list = self.player.queue + self.to_add not_in_hist = list(set(tracks) - set(self.get_history(artist=artist))) - if not not_in_hist: + if self.plugin_conf.get('queue_mode') != 'top' and not not_in_hist: self.log.debug('All tracks already played for "{}"'.format(artist)) random.shuffle(not_in_hist) - #candidate = [ trk for trk in not_in_hist if trk not in black_list - #if not self.sdb.get_bl_track(trk, add_not=True)] candidate = [] for trk in [_ for _ in not_in_hist if _ not in black_list]: - if self.sdb.get_bl_track(trk, add_not=True): - self.log.info('Blacklisted: {0}: '.format(trk)) - continue - if self.sdb.get_bl_album(trk, add_not=True): - self.log.info('Blacklisted album: {0}: '.format(trk)) - continue # Should use albumartist heuristic as well if self.plugin_conf.getboolean('single_album'): if (trk.album == self.player.current.album or @@ -139,10 +131,9 @@ class WebService(Plugin): continue candidate.append(trk) if not candidate: - self.log.debug('Unable to find title to add' + - ' for "%s".' % artist) - return None + return False self.to_add.append(random.choice(candidate)) + return True def _get_artists_list_reorg(self, alist): """ @@ -157,10 +148,10 @@ class WebService(Plugin): 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 ] + 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.debug('history ordered: {}'.format( + self.log.info('{}'.format( ' / '.join(art_not_in_hist))) return art_not_in_hist @@ -181,22 +172,15 @@ class WebService(Plugin): results.extend(self.player.fuzzy_find_artist(art_pop)) return results - def lfm_similar_artists(self, artist=None): + def ws_similar_artists(self, artist=None): """ Retrieve similar artists from WebServive. """ - if artist is None: - curr = self.player.current.__dict__ - name = curr.get('artist') - mbid = curr.get('musicbrainz_artistid', None) - current = Artist(name=name, mbid=mbid) - else: - current = artist # initialize artists deque list to construct from DB as_art = deque() - as_artists = self.ws().get_similar(artist=current) - self.log.debug('Requesting {1} for "{0}"'.format(current, - self.ws.name)) + as_artists = self.ws().get_similar(artist=artist) + self.log.debug('Requesting {1} for "{0}"'.format(artist, + self.ws.name)) try: # TODO: let's propagate Artist type [as_art.append(str(art)) for art in as_artists] @@ -204,8 +188,6 @@ class WebService(Plugin): self.log.warning('{0}: {1}'.format(self.ws.name, err)) if as_art: self.log.debug('Fetched {0} artist(s)'.format(len(as_art))) - if self.ws.ratelimit: - self.log.info('{0.name} ratelimit: {0.ratelimit}'.format(self.ws)) return as_art def get_recursive_similar_artist(self): @@ -213,56 +195,62 @@ class WebService(Plugin): history = deque(self.history) history.popleft() depth = 0 - current = self.player.current + if not self.player.playlist: + return ret_extra + last_trk = self.player.playlist[-1] extra_arts = list() while depth < self.plugin_conf.getint('depth'): if len(history) == 0: break trk = history.popleft() - if (trk.artist in [trk.artist for trk in extra_arts] - or trk.artist == current.artist): + if (trk.get_artist() in extra_arts + or trk.get_artist() == last_trk.get_artist()): continue - extra_arts.append(trk) + extra_arts.append(trk.get_artist()) depth += 1 self.log.info('EXTRA ARTS: {}'.format( - '/'.join([trk.artist for trk in extra_arts]))) + '/'.join([art.name for art in extra_arts]))) for artist in extra_arts: - self.log.debug( - 'Looking for artist similar to "{0.artist}" as well'.format( - artist)) - similar = self.lfm_similar_artists(artist=artist) + 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 ret_extra.extend(self.get_artists_from_player(similar)) - if current.artist in ret_extra: - ret_extra.remove(current.artist) + if last_trk.artist in ret_extra: + ret_extra.remove(last_trk.artist) return ret_extra def get_local_similar_artists(self): """Check against local player for similar artists """ - current = self.player.current - self.log.info('Looking for artist similar to "{0.artist}"'.format(current)) - similar = self.lfm_similar_artists() + if not self.player.playlist: + return [] + tolookfor = self.player.playlist[-1].get_artist() + self.log.info('Looking for artist similar to "{}"'.format(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]]))) self.log.info('Looking availability in music library') - ret = self.get_artists_from_player(similar) + ret = set(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 = list(set(ret) | set(ret_extra)) + ret = set(ret) | set(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 [] self.log.info('Got {} artists in library'.format(len(ret))) - self.log.info(' / '.join(ret)) + queued_artists = { trk.artist for trk in self.player.queue } + if ret & queued_artists: + self.log.debug('Removing already queued artist: {0}'.format(ret & queued_artists)) + ret = list(ret - queued_artists) # Move around similars items to get in unplayed|not recently played # artist first. return self._get_artists_list_reorg(ret) @@ -285,7 +273,7 @@ class WebService(Plugin): self.log.info('Looking for an album to add for "%s"...' % artist) albums = self.player.find_albums(artist) # str conversion while Album type is not propagated - albums = [ str(album) for album in albums] + albums = [str(album) for album in albums] if albums: self.log.debug('Albums candidate: {0:s}'.format( ' / '.join(albums))) @@ -320,6 +308,33 @@ class WebService(Plugin): if nb_album_add == target_album_to_add: return True + def find_top(self, artists): + """ + find top tracks for artists in artists list. + """ + 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: + return True + self.log.info('Looking for a top track for {0}'.format(artist)) + titles = deque() + try: + titles = [t for t in webserv.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) + random.shuffle(found) + if found: + self.log.debug('{0}'.format(found[0])) + if self.filter_track(found): + break + def _track(self): """Get some tracks for track queue mode """ @@ -329,6 +344,10 @@ class WebService(Plugin): self.log.debug('Trying to find titles to add for "{}"'.format( artist)) found = self.player.find_track(artist) + random.shuffle(found) + if not found: + self.log.debug('Found nothing to queue for {0}'.format(artist)) + continue # find tracks not in history for artist self.filter_track(found) if len(self.to_add) == nbtracks_target: @@ -349,19 +368,24 @@ class WebService(Plugin): def _top(self): """Get some tracks for top track queue mode """ - #artists = self.get_local_similar_artists() - pass + 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)) def callback_need_track(self): self._cleanup_cache() - if not self.player.current: - self.log.info('No current track, cannot queue') + if len(self.player.playlist) == 0: + self.log.info('No last track, cannot queue') return None - if not self.player.current.artist: - self.log.warning('No artist set for the current track') + if not self.player.playlist[-1].artist: + self.log.warning('No artist set for the last track in queue') self.log.debug(repr(self.player.current)) return None self.queue_mode() + msg = ' '.join(['{0}: {1:>3d}'.format(k, v) for + k, v in sorted(self.ws.stats.items())]) + self.log.debug(msg) candidates = self.to_add self.to_add = list() if self.plugin_conf.get('queue_mode') != 'album':