X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fsimafm.py;h=033556ef24728d2587b23dbeab840d9cab75260a;hb=bdb65c0759f46c8038f46aeb5248e48a3dba6068;hp=5e6ad106e8e969f2c0f03d7e34a118a78d3f72ab;hpb=e8bcefbcb4a56e111af402bdb705436f42cc93e0;p=mpd-sima.git diff --git a/sima/lib/simafm.py b/sima/lib/simafm.py index 5e6ad10..033556e 100644 --- a/sima/lib/simafm.py +++ b/sima/lib/simafm.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + # Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Jack Kaliko # # This program is free software: you can redistribute it and/or modify @@ -20,76 +21,42 @@ Consume Last.fm web service """ -__version__ = '0.5.0' +__version__ = '0.5.1' __author__ = 'Jack Kaliko' -from datetime import datetime, timedelta - -from requests import get, Request, Timeout, ConnectionError from sima import LFM from sima.lib.meta import Artist -from sima.utils.utils import WSError, WSNotFound, WSTimeout, WSHTTPError -from sima.utils.utils import getws, Throttle, Cache, purge_cache +from sima.lib.track import Track + +from sima.lib.http import HttpClient +from sima.utils.utils import WSError, WSNotFound +from sima.utils.utils import getws if len(LFM.get('apikey')) == 43: # simple hack allowing imp.reload getws(LFM) -# Some definitions -WAIT_BETWEEN_REQUESTS = timedelta(0, 1) -SOCKET_TIMEOUT = 6 - class SimaFM: """Last.fm http client """ root_url = 'http://{host}/{version}/'.format(**LFM) - cache = {} - timestamp = datetime.utcnow() name = 'Last.fm' - ratelimit = None + cache = False + stats = {'etag':0, + 'ccontrol':0, + 'total':0} - def __init__(self, cache=True): + def __init__(self): + self.http = HttpClient(cache=self.cache, stats=self.stats) self.artist = None - self._url = self.__class__.root_url - self.current_element = None - self.caching = cache - purge_cache(self.__class__) - def _fetch(self, payload): - """Use cached elements or proceed http request""" - url = Request('GET', self._url, params=payload,).prepare().url - if url in SimaFM.cache: - self.current_element = SimaFM.cache.get(url).elem - return - try: - self._fetch_ws(payload) - except Timeout: - raise WSTimeout('Failed to reach server within {0}s'.format( - SOCKET_TIMEOUT)) - except ConnectionError as err: - raise WSError(err) - - @Throttle(WAIT_BETWEEN_REQUESTS) - def _fetch_ws(self, payload): - """fetch from web service""" - req = get(self._url, params=payload, - timeout=SOCKET_TIMEOUT) - #self.__class__.ratelimit = req.headers.get('x-ratelimit-remaining', None) - if req.status_code is not 200: - raise WSHTTPError('{0.status_code}: {0.reason}'.format(req)) - self.current_element = req.json() - self._controls_answer() - if self.caching: - SimaFM.cache.update({req.url: - Cache(self.current_element)}) - - def _controls_answer(self): + def _controls_answer(self, ans): """Controls answer. """ - if 'error' in self.current_element: - code = self.current_element.get('error') - mess = self.current_element.get('message') + if 'error' in ans: + code = ans.get('error') + mess = ans.get('message') if code == 6: raise WSNotFound('{0}: "{1}"'.format(mess, self.artist)) raise WSError(mess) @@ -99,9 +66,9 @@ class SimaFM: """Build payload """ payloads = dict({'similar': {'method':'artist.getsimilar',}, - 'top': {'method':'artist.gettoptracks',}, - 'track': {'method':'track.getsimilar',}, - 'info': {'method':'artist.getinfo',}, + 'top': {'method':'artist.gettoptracks',}, + 'track': {'method':'track.getsimilar',}, + 'info': {'method':'artist.getinfo',}, }) payload = payloads.get(method) payload.update(api_key=LFM.get('apikey'), format='json') @@ -116,26 +83,47 @@ class SimaFM: payload.update(results=100) if method == 'track': payload.update(track=track) - return payload + # > hashing the URL into a cache key + # return a sorted list of 2-tuple to have consistent cache + return sorted(payload.items(), key=lambda param: param[0]) def get_similar(self, artist=None): """Fetch similar artists """ payload = self._forge_payload(artist) # Construct URL - self._fetch(payload) + ans = self.http(self.root_url, payload) + self._controls_answer(ans.json()) # pylint: disable=no-member # Artist might be found be return no 'artist' list… # cf. "Mulatu Astatqe" vs. "Mulatu Astatqé" with autocorrect=0 # json format is broken IMHO, xml is more consistent IIRC # Here what we got: # >>> {"similarartists":{"#text":"\n","artist":"Mulatu Astatqe"}} # autocorrect=1 should fix it, checking anyway. - simarts = self.current_element.get('similarartists').get('artist') + simarts = ans.json().get('similarartists').get('artist') # pylint: disable=no-member if not isinstance(simarts, list): raise WSError('Artist found but no similarities returned') - for art in self.current_element.get('similarartists').get('artist'): + for art in ans.json().get('similarartists').get('artist'): # pylint: disable=no-member yield Artist(name=art.get('name'), mbid=art.get('mbid', None)) + def get_toptrack(self, artist=None): + """Fetch artist top tracks + """ + payload = self._forge_payload(artist, method='top') + ans = self.http(self.root_url, payload) + self._controls_answer(ans.json()) # pylint: disable=no-member + tops = ans.json().get('toptracks').get('track') # pylint: disable=no-member + art = {'artist': artist.name, + 'musicbrainz_artistid': artist.mbid,} + for song in tops: + for key in ['artist', 'streamable', 'listeners', + 'url', 'image', '@attr']: + if key in song: + song.pop(key) + song.update(art) + song.update(title=song.pop('name')) + song.update(time=song.pop('duration', 0)) + yield Track(**song) # VIM MODLINE # vim: ai ts=4 sw=4 sts=4 expandtab