X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fsimaecho.py;h=bbfc11416d8fafd8a4f7eaa4b1e064af924848d5;hb=92860d5ab0d6008fad149eea960de91acd15719a;hp=03892c0a3a7efd3ce1d41167e1a70ccbcccf3c80;hpb=a70e527205631bf656147c04d2ee022aced877d0;p=mpd-sima.git diff --git a/sima/lib/simaecho.py b/sima/lib/simaecho.py index 03892c0..bbfc114 100644 --- a/sima/lib/simaecho.py +++ b/sima/lib/simaecho.py @@ -25,17 +25,16 @@ __version__ = '0.0.1' __author__ = 'Jack Kaliko' -import logging - from datetime import datetime, timedelta -from time import sleep -from requests import get, Timeout, ConnectionError +from requests import get, Request, Timeout, ConnectionError from sima import ECH from sima.lib.meta import Artist -from sima.utils.utils import getws -if len(ECH.get('apikey')) == 23: +from sima.lib.track import Track +from sima.utils.utils import WSError, WSNotFound, WSTimeout, WSHTTPError +from sima.utils.utils import getws, Throttle, Cache, purge_cache +if len(ECH.get('apikey')) == 23: # simple hack allowing imp.reload getws(ECH) # Some definitions @@ -43,60 +42,21 @@ WAIT_BETWEEN_REQUESTS = timedelta(0, 1) SOCKET_TIMEOUT = 4 -class EchoError(Exception): - pass - -class EchoNotFound(EchoError): - pass - -class EchoTimeout(EchoError): - pass - -class EchoHTTPError(EchoError): - pass - -class Throttle(): - def __init__(self, wait): - self.wait = wait - self.last_called = datetime.now() - - def __call__(self, func): - def wrapper(*args, **kwargs): - while self.last_called + self.wait > datetime.now(): - sleep(0.1) - result = func(*args, **kwargs) - self.last_called = datetime.now() - return result - return wrapper - - -class Cache(): - def __init__(self, elem, last=None): - self.elem = elem - self.requestdate = last - if not last: - self.requestdate = datetime.utcnow() - - def created(self): - return self.requestdate - - def get(self): - return self.elem - - -class SimaEch(): - """ +class SimaEch: + """EchoNest http client """ root_url = 'http://{host}/api/{version}'.format(**ECH) cache = {} timestamp = datetime.utcnow() + ratelimit = None + name = 'EchoNest' def __init__(self, cache=True): self.artist = None self._ressource = None self.current_element = None self.caching = cache - self.purge_cache() + purge_cache(self.__class__) def _fetch(self, payload): """Use cached elements or proceed http request""" @@ -105,22 +65,21 @@ class SimaEch(): self.current_element = SimaEch.cache.get(url).elem return try: - self._fetch_lfm(payload) + self._fetch_ws(payload) except Timeout: - raise EchoTimeout('Failed to reach server within {0}s'.format( + raise WSTimeout('Failed to reach server within {0}s'.format( SOCKET_TIMEOUT)) except ConnectionError as err: - raise EchoError(err) + raise WSError(err) @Throttle(WAIT_BETWEEN_REQUESTS) - def _fetch_lfm(self, payload): + def _fetch_ws(self, payload): """fetch from web service""" req = get(self._ressource, params=payload, timeout=SOCKET_TIMEOUT) - if 'x-ratelimit-remaining' in req.headers: - logging.debug('x-ratelimit-remaining {x-ratelimit-remaining}'.format(**req.headers)) + self.__class__.ratelimit = req.headers.get('x-ratelimit-remaining', None) if req.status_code is not 200: - raise EchoHTTPError(req.status_code) + raise WSHTTPError('{0.status_code}: {0.reason}'.format(req)) self.current_element = req.json() self._controls_answer() if self.caching: @@ -128,18 +87,18 @@ class SimaEch(): Cache(self.current_element)}) def _controls_answer(self): - """Controls last.fm answer. + """Controls answer. """ status = self.current_element.get('response').get('status') code = status.get('code') if code is 0: return True if code is 5: - raise EchoNotFound('Artist not found: "{0}"'.format(self.artist)) - raise EchoError(status.get('message')) + raise WSNotFound('Artist not found: "{0}"'.format(self.artist)) + raise WSError(status.get('message')) - def _forge_payload(self, artist): - """ + def _forge_payload(self, artist, top=False): + """Build payload """ payload = {'api_key': ECH.get('apikey')} if not isinstance(artist, Artist): @@ -149,25 +108,22 @@ class SimaEch(): payload.update( id='musicbrainz:artist:{0}'.format(artist.mbid)) else: - payload.update(name=artist.name) + payload.update(name=artist.name) payload.update(bucket='id:musicbrainz') - payload.update(results=30) + payload.update(results=100) + if top: + if artist.mbid: + aid = payload.pop('id') + payload.update(artist_id=aid) + else: + name = payload.pop('name') + payload.update(artist=name) + payload.update(results=100) + payload.update(sort='song_hotttnesss-desc') return payload - def purge_cache(self, age=4): - now = datetime.utcnow() - if now.hour == SimaEch.timestamp.hour: - return - SimaEch.timestamp = datetime.utcnow() - cache = SimaEch.cache - delta = timedelta(hours=age) - for url in list(cache.keys()): - timestamp = cache.get(url).created() - if now - timestamp > delta: - cache.pop(url) - def get_similar(self, artist=None): - """ + """Fetch similar artists """ payload = self._forge_payload(artist) # Construct URL @@ -177,11 +133,30 @@ class SimaEch(): artist = {} mbid = None if 'foreign_ids' in art: - for frgnid in art.get('foreign_ids'): - if frgnid.get('catalog') == 'musicbrainz': - mbid = frgnid.get('foreign_id').lstrip('musicbrainz:artist:') + for frgnid in art.get('foreign_ids'): + if frgnid.get('catalog') == 'musicbrainz': + mbid = frgnid.get('foreign_id' + ).lstrip('musicbrainz:artist:') yield Artist(mbid=mbid, name=art.get('name')) + def get_toptrack(self, artist=None): + """Fetch artist top tracks + """ + payload = self._forge_payload(artist, top=True) + # Construct URL + self._ressource = '{0}/song/search'.format(SimaEch.root_url) + self._fetch(payload) + titles = list() + artist = { + 'artist': artist.name, + 'musicbrainz_artistid': artist.mbid, + } + for song in self.current_element.get('response').get('songs'): + title = song.get('title') + if title not in titles: + titles.append(title) + yield Track(title=title, **artist) + # VIM MODLINE # vim: ai ts=4 sw=4 sts=4 expandtab