# TODO: move to utils as a decorator
duration = self.daemon_conf.getint('sima', 'history_duration')
art_in_hist = list()
- for trk in self.sdb.get_history(duration=duration,
- artists=alist):
+ 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()
"""
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 {} for {!r}'.format(self.ws.name,artist))
try:
# TODO: let's propagate Artist type
[as_art.append(str(art)) for art in as_artists]
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.get_artist() in extra_arts
- or trk.get_artist() == current.get_artist()):
+ or trk.get_artist() == last_trk.get_artist()):
continue
extra_arts.append(trk.get_artist())
depth += 1
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.ws_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)))
+ 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)
+ if self.player.current.artist in ret:
+ self.log.debug('Removing current artist: {0}'.format(self.player.current.artist))
+ ret = list(ret - {self.player.current.artist})
# Move around similars items to get in unplayed|not recently played
# artist first.
return self._get_artists_list_reorg(ret)
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):
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
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()
home / dev / repositories / mpd-sima.git / blobdiff