# 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):
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
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])))
+ '/'.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 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):
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.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))
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 }
- for art in queued_artists:
- if art in ret:
- self.log.debug('Removing already queued artist: {0}'.format(art))
- ret = ret - queued_artists
+ # 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 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"""
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]))
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':
home / dev / repositories / mpd-sima.git / blobdiff