X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fsimafm.py;h=bd203f74f3330f1da06a0d7abd5d1f0c741e8a0b;hb=37dd60538984a3917354b794a5c96b0a025f8e95;hp=18fe084a3b8aacfcd3e211c40a19e62313663972;hpb=f755e5c13bd8d761979393db7c40757f02c79163;p=mpd-sima.git diff --git a/sima/lib/simafm.py b/sima/lib/simafm.py index 18fe084..bd203f7 100644 --- a/sima/lib/simafm.py +++ b/sima/lib/simafm.py @@ -25,7 +25,6 @@ __version__ = '0.5.1' __author__ = 'Jack Kaliko' - from sima import LFM from sima.lib.meta import Artist from sima.lib.track import Track @@ -47,9 +46,9 @@ class SimaFM: :param BaseCache cache: Set a cache, defaults to `False`. """ - stats = {'etag':0, - 'ccontrol':0, - 'total':0} + stats = {'etag': 0, + 'ccontrol': 0, + 'total': 0} def __init__(self): self.http = HttpClient(cache=self.cache, stats=self.stats) @@ -69,11 +68,11 @@ class SimaFM: def _forge_payload(self, artist, method='similar', track=None): """Build payload """ - payloads = dict({'similar': {'method':'artist.getsimilar',}, - 'top': {'method':'artist.gettoptracks',}, - 'track': {'method':'track.getsimilar',}, - 'info': {'method':'artist.getinfo',}, - }) + payloads = dict({'similar': {'method': 'artist.getsimilar',}, + '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') if not isinstance(artist, Artist): @@ -102,20 +101,20 @@ class SimaFM: ans = self.http(self.root_url, payload) try: ans.json() - except ValueError as err: + except ValueError: # Corrupted/malformed cache? cf. gitlab issue #35 raise WSError('Malformed json, try purging the cache: %s') - self._controls_answer(ans.json()) # pylint: disable=no-member + self._controls_answer(ans.json()) # pylint: disable=no-member # Artist might be found but 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') # pylint: disable=no-member + 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'): # pylint: disable=no-member + 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): @@ -126,8 +125,8 @@ class SimaFM: """ 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 + 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: