X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fwebserv.py;h=c6a906fce7f5a92091f426a18f266856e6d04d42;hb=ee218f16c2a449c6d72d550807114676e1e96d94;hp=44131d40d4c09c3561a6625b58c821e5876a4cda;hpb=6ce8e09e316f315d437377ab0850da045cb0f041;p=mpd-sima.git diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py index 44131d4..c6a906f 100644 --- a/sima/lib/webserv.py +++ b/sima/lib/webserv.py @@ -34,7 +34,7 @@ from hashlib import md5 from .plugin import Plugin from .track import Track from .meta import Artist, MetaContainer -from ..utils.utils import WSError, WSNotFound +from ..utils.utils import WSError, WSNotFound, WSTimeout def cache(func): """Caching decorator""" @@ -71,9 +71,10 @@ class WebService(Plugin): 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): """ @@ -81,11 +82,11 @@ class WebService(Plugin): """ 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 @@ -111,6 +112,7 @@ class WebService(Plugin): * 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 @@ -125,7 +127,7 @@ class WebService(Plugin): 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 ' + @@ -177,28 +179,37 @@ 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)) + 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'): @@ -222,7 +233,7 @@ class WebService(Plugin): 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 @@ -242,7 +253,7 @@ class WebService(Plugin): return [] tolookfor = self.player.playlist[-1].Artist self.log.info('Looking for artist similar to "%s"', tolookfor) - self.log.debug(repr(tolookfor)) + self.log.debug('%r', tolookfor) similar = self.ws_similar_artists(tolookfor) if not similar: self.log.info('Got nothing from %s!', self.ws.name) @@ -292,7 +303,7 @@ class WebService(Plugin): 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))) @@ -300,10 +311,11 @@ class WebService(Plugin): 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): @@ -363,18 +375,18 @@ class WebService(Plugin): 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 @@ -412,7 +424,7 @@ class WebService(Plugin): 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()