# local import
from .plugin import Plugin
from .track import Track
-from .meta import Artist, Album, MetaContainer
-from ..utils.utils import WSError, WSNotFound
+from .meta import Artist, MetaContainer
+from ..utils.utils import WSError, WSNotFound, WSTimeout
def cache(func):
"""Caching decorator"""
self._flush_cache()
wrapper = {'track': self._track,
'top': self._top,
- 'album': self._album,}
+ 'album': self._album}
self.queue_mode = wrapper.get(self.plugin_conf.get('queue_mode'))
self.ws = None
+ self.ws_retry = 0
def _flush_cache(self):
"""
"""
name = self.__class__.__name__
if isinstance(self._cache, dict):
- self.log.info('{0}: Flushing cache!'.format(name))
+ self.log.info('%s: Flushing cache!', name)
else:
- self.log.info('{0}: Initialising cache!'.format(name))
+ self.log.info('%s: Initialising cache!', name)
self._cache = {'asearch': dict(),
- 'tsearch': dict(),}
+ 'tsearch': dict()}
def _cleanup_cache(self):
"""Avoid bloated cache
* not in history
* not already in the queue
* not blacklisted
+ Then add to candidates in self.to_add
"""
artist = tracks[0].artist
# In random play mode use complete playlist to filter
candidate = []
for trk in [_ for _ in not_in_hist if _ not in black_list]:
# Should use albumartist heuristic as well
- if self.plugin_conf.getboolean('single_album'): # pylint: disable=no-member
+ if self.plugin_conf.getboolean('single_album'): # pylint: disable=no-member
if (trk.album == self.player.current.album or
trk.album in [tr.album for tr in black_list]):
self.log.debug('Found unplayed track ' +
# 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))
+ self.log.debug('Requesting %s for %r', self.ws.name, artist)
try:
[as_art.append(art) for art in as_artists]
except WSNotFound as err:
- self.log.warning('{}: {}'.format(self.ws.name, err))
+ self.log.warning('%s: %s', 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))
+ self.log.debug('%s: %s', self.ws.name, err)
+ except WSTimeout as err:
+ self.log.warning('%s: %s', self.ws.name, err)
+ if self.ws_retry < 3:
+ self.ws_retry += 1
+ self.log.warning('%s: retrying', self.ws.name)
+ as_art = self.ws_similar_artists(artist)
+ else:
+ self.log.warning('%s: stop retrying', self.ws.name)
+ self.ws_retry = 0
except WSError as err:
- self.log.warning('{}: {}'.format(self.ws.name, err))
+ self.log.warning('%s: %s', self.ws.name, err)
if as_art:
- self.log.debug('Fetched {} artist(s)'.format(len(as_art)))
+ self.log.debug('Fetched %d artist(s)', len(as_art))
return as_art
def get_recursive_similar_artist(self):
"""Check against local player for similar artists (recursive w/ history)
"""
if not self.player.playlist:
- return
+ return []
history = list(self.history)
# In random play mode use complete playlist to filter
if self.player.playmode.get('random'):
self.log.debug('EXTRA ARTS: %s', '/'.join(map(str, extra_arts)))
for artist in extra_arts:
self.log.debug('Looking for artist similar '
- 'to "{}" as well'.format(artist))
+ 'to "%s" as well', artist)
similar = self.ws_similar_artists(artist=artist)
if not similar:
continue
ret = ret - MetaContainer([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)))
+ self.log.info('Got %d artists in library', len(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):
+ def _get_album_history(self, artist):
"""Retrieve album history"""
- duration = self.daemon_conf.getint('sima', 'history_duration')
albums_list = set()
- for trk in self.sdb.get_history(artist=artist.name, duration=duration):
- albums_list.add(trk[1])
+ for trk in self.get_history(artist=artist.name):
+ if not trk.album:
+ continue
+ albums_list.add(trk.album)
return albums_list
def find_album(self, artists):
"""
self.to_add = list()
nb_album_add = 0
- target_album_to_add = self.plugin_conf.getint('album_to_add') # pylint: disable=no-member
+ target_album_to_add = self.plugin_conf.getint('album_to_add') # pylint: disable=no-member
for artist in artists:
self.log.info('Looking for an album to add for "%s"...' % artist)
albums = self.player.search_albums(artist)
- # str conversion while Album type is not propagated
- albums = [str(album) for album in albums]
if not albums:
continue
- self.log.debug('Albums candidate: %s', ' / '.join(albums))
- # albums yet in history for this artist
- albums = set(albums)
- albums_yet_in_hist = albums & self._get_album_history(artist=artist)
- albums_not_in_hist = list(albums - albums_yet_in_hist)
+ self.log.debug('Albums candidate: %s', albums)
+ albums_hist = self._get_album_history(artist)
+ albums_not_in_hist = [a for a in albums if a.name not in albums_hist]
# Get to next artist if there are no unplayed albums
if not albums_not_in_hist:
self.log.info('No unplayed album found for "%s"' % artist)
continue
- album_to_queue = str()
+ album_to_queue = []
random.shuffle(albums_not_in_hist)
for album in albums_not_in_hist:
# Controls the album found is not already queued
self.log.info('%s album candidate: %s - %s', self.ws.name,
artist, album_to_queue)
nb_album_add += 1
- candidates = self.player.find_tracks(Album(name=album_to_queue,
- artist=artist))
+ candidates = self.player.find_tracks(album)
if self.plugin_conf.getboolean('shuffle_album'):
random.shuffle(candidates)
# this allows to select a maximum number of track from the album
nbtracks_target = self.plugin_conf.getint('track_to_add') # pylint: disable=no-member
for artist in artists:
if len(self.to_add) == nbtracks_target:
- return True
- self.log.info('Looking for a top track for {0}'.format(artist))
+ return
+ self.log.info('Looking for a top track for %s', artist)
titles = deque()
try:
titles = [t for t in self.ws.get_toptrack(artist)]
except WSError as err:
self.log.warning('%s: %s', self.ws.name, err)
+ continue
for trk in titles:
found = self.player.search_track(artist, trk.title)
- random.shuffle(found)
if found:
- self.log.debug('%s', found[0])
+ random.shuffle(found)
if self.filter_track(found):
break
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))
+ self.log.info('%s candidates: %s', self.ws.name, track)
def callback_need_track(self):
self._cleanup_cache()
home / dev / repositories / mpd-sima.git / blobdiff