X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fsimaecho.py;h=393d723f62e216d7a6027d02c33a363b5f9a2d40;hb=251934a89e7796fb21bb223c4ae04d757082a89b;hp=beaf420dae63757b3bfa108b415c04764e289a7e;hpb=6ec7666214b71dc121a0d9b0fdb9ca7d48bda6d5;p=mpd-sima.git diff --git a/sima/lib/simaecho.py b/sima/lib/simaecho.py index beaf420..393d723 100644 --- a/sima/lib/simaecho.py +++ b/sima/lib/simaecho.py @@ -50,6 +50,10 @@ class SimaEch: root_url = 'http://{host}/api/{version}'.format(**ECH) name = 'EchoNest' cache = False + """HTTP cache to use, in memory or persitent. + + :param BaseCache cache: Set a cache, defaults to `False`. + """ stats = {'etag':0, 'ccontrol':0, 'minrl':120, @@ -76,8 +80,7 @@ class SimaEch: if not isinstance(artist, Artist): raise TypeError('"{0!r}" not an Artist object'.format(artist)) if artist.mbid: - payload.update( - id='musicbrainz:artist:{0}'.format(artist.mbid)) + payload.update(id='musicbrainz:artist:{0}'.format(artist.mbid)) else: payload.update(name=artist.name) payload.update(bucket='id:musicbrainz') @@ -95,32 +98,36 @@ class SimaEch: # 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 ressource = '{0}/artist/similar'.format(SimaEch.root_url) ans = self.http(ressource, payload) - self._controls_answer(ans.json()) - for art in ans.json().get('response').get('artists'): + self._controls_answer(ans.json()) # pylint: disable=no-member + for art in ans.json().get('response').get('artists'): # pylint: disable=no-member mbid = get_mbid(art) yield Artist(mbid=mbid, name=art.get('name')) - 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, top=True) # Construct URL ressource = '{0}/song/search'.format(SimaEch.root_url) ans = self.http(ressource, payload) - self._controls_answer(ans.json()) + self._controls_answer(ans.json()) # pylint: disable=no-member titles = list() - art = { - 'artist': artist.name, - 'musicbrainz_artistid': artist.mbid, - } - for song in ans.json().get('response').get('songs'): + art = {'artist': artist.name, + 'musicbrainz_artistid': artist.mbid,} + for song in ans.json().get('response').get('songs'): # pylint: disable=no-member title = song.get('title') if not art.get('musicbrainz_artistid'): art['musicbrainz_artistid'] = get_mbid(song, 'artist_foreign_ids')