X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fsimaecho.py;h=fbb60b07fb973305beec2aa2a5a168ca7db8f0ca;hb=4240fefd9d393365932ff04c063cb31fc5dce85c;hp=4bc08b06e14a5c85ec25d02536dbb9ac86b4e13b;hpb=df433543cbd671656aefa77053b88fb7fa448d20;p=mpd-sima.git

diff --git a/sima/lib/simaecho.py b/sima/lib/simaecho.py
index 4bc08b0..fbb60b0 100644
--- a/sima/lib/simaecho.py
+++ b/sima/lib/simaecho.py
@@ -30,12 +30,12 @@ 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:
+if len(ECH.get('apikey')) == 23:  # simple hack allowing imp.reload
     getws(ECH)
 
 # Some definitions
@@ -84,7 +84,7 @@ class Cache():
         return self.elem
 
 
-def purge_cache(self, age=4):
+def purge_cache(age=4):
     now = datetime.utcnow()
     if now.hour == SimaEch.timestamp.hour:
         return
@@ -103,13 +103,14 @@ class SimaEch():
     root_url = 'http://{host}/api/{version}'.format(**ECH)
     cache = {}
     timestamp = datetime.utcnow()
+    ratelimit = None
 
     def __init__(self, cache=True):
         self.artist = None
         self._ressource = None
         self.current_element = None
         self.caching = cache
-        self.purge_cache()
+        purge_cache()
 
     def _fetch(self, payload):
         """Use cached elements or proceed http request"""
@@ -118,7 +119,7 @@ class SimaEch():
             self.current_element = SimaEch.cache.get(url).elem
             return
         try:
-            self._fetch_lfm(payload)
+            self._fetch_ech(payload)
         except Timeout:
             raise EchoTimeout('Failed to reach server within {0}s'.format(
                                SOCKET_TIMEOUT))
@@ -126,12 +127,11 @@ class SimaEch():
             raise EchoError(err)
 
     @Throttle(WAIT_BETWEEN_REQUESTS)
-    def _fetch_lfm(self, payload):
+    def _fetch_ech(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)
         self.current_element = req.json()
@@ -141,7 +141,7 @@ 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')
@@ -164,7 +164,7 @@ class SimaEch():
         else:
            payload.update(name=artist.name)
         payload.update(bucket='id:musicbrainz')
-        payload.update(results=30)
+        payload.update(results=100)
         return payload
 
     def get_similar(self, artist=None):