X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fhttp.py;h=d253568419b56d82b7033494aa1560a4982bff7b;hb=cfe6dafed6e43714316c39c401475ed840e66a02;hp=8c6dab1bde94a1d9cea5d7fd74eaa13a133deb9d;hpb=bec6761572dc942c0772f955b6a84273e2754c6e;p=mpd-sima.git

diff --git a/sima/lib/http.py b/sima/lib/http.py
index 8c6dab1..d253568 100644
--- a/sima/lib/http.py
+++ b/sima/lib/http.py
@@ -48,6 +48,8 @@ def parse_uri(uri):
 class CacheController(object):
     """An interface to see if request should cached or not.
     """
+    CACHE_ANYWAY = False
+
     def __init__(self, cache=None, cache_etags=True):
         self.cache = cache or DictCache()
         self.cache_etags = cache_etags
@@ -102,7 +104,6 @@ class CacheController(object):
         no_cache = True if 'no-cache' in cc else False
         if 'max-age' in cc and cc['max-age'] == 0:
             no_cache = True
-
         # see if it is in the cache anyways
         in_cache = self.cache.get(cache_url)
         if no_cache or not in_cache:
@@ -229,6 +230,12 @@ class CacheController(object):
             elif 'expires' in resp.headers:
                 if resp.headers['expires']:
                     self.cache.set(cache_url, resp)
+            # Force one month max age if no Cache-Control header is found
+            # Overriding header disappearance on LastFM web service...
+            # https://getsatisfaction.com/lastfm/topics/-web-api-http-cache-control-header
+            elif CacheController.CACHE_ANYWAY:
+                resp.headers['Cache-Control'] = 'max-age=2419200'
+                self.cache.set(cache_url, resp)
 
     def update_cached_response(self, request, response):
         """On a 304 we will get a new set of headers that we want to
@@ -302,10 +309,6 @@ class HttpClient:
             resp = self.controller.update_cached_response(prepreq, resp)
         elif resp.status_code != 200:
             raise WSHTTPError('{0.status_code}: {0.reason}'.format(resp))
-        ratelimit = resp.headers.get('x-ratelimit-remaining', None)
-        if ratelimit and self.stats:
-            minrl = min(int(ratelimit), self.stats.get('minrl'))
-            self.stats.update(minrl=minrl)
         self.controller.cache_response(resp.request, resp)
         return resp