X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fsimafm.py;h=a5f19d08593ef36055e67110a31d33fdc474e620;hb=251934a89e7796fb21bb223c4ae04d757082a89b;hp=6cff45f1d997541338c0dd7d647b8a425213ac12;hpb=6ec7666214b71dc121a0d9b0fdb9ca7d48bda6d5;p=mpd-sima.git diff --git a/sima/lib/simafm.py b/sima/lib/simafm.py index 6cff45f..a5f19d0 100644 --- a/sima/lib/simafm.py +++ b/sima/lib/simafm.py @@ -43,9 +43,13 @@ class SimaFM: root_url = 'http://{host}/{version}/'.format(**LFM) name = 'Last.fm' cache = False + """HTTP cache to use, in memory or persitent. + + :param BaseCache cache: Set a cache, defaults to `False`. + """ stats = {'etag':0, - 'ccontrol':0, - 'total':0} + 'ccontrol':0, + 'total':0} def __init__(self): self.http = HttpClient(cache=self.cache, stats=self.stats) @@ -66,9 +70,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') @@ -87,36 +91,40 @@ class SimaFM: # 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): + def get_similar(self, artist): """Fetch similar artists + + :param sima.lib.meta.Artist artist: `Artist` to fetch similar artists from + :returns: generator of :class:`sima.lib.meta.Artist` """ payload = self._forge_payload(artist) # Construct URL ans = self.http(self.root_url, payload) - self._controls_answer(ans.json()) + 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 = ans.json().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 ans.json().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): + def get_toptrack(self, artist): """Fetch artist top tracks + + :param sima.lib.meta.Artist artist: `Artist` to fetch top tracks from + :returns: generator of :class:`sima.lib.track.Track` """ payload = self._forge_payload(artist, method='top') ans = self.http(self.root_url, payload) - self._controls_answer(ans.json()) - tops = ans.json().get('toptracks').get('track') - art = { - 'artist': artist.name, - 'musicbrainz_artistid': artist.mbid, - } + 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']: @@ -124,7 +132,7 @@ class SimaFM: song.pop(key) song.update(art) song.update(title=song.pop('name')) - song.update(time=song.pop('duration')) + song.update(time=song.pop('duration', 0)) yield Track(**song) # VIM MODLINE