Browse Source

Don't cache post requests

pull/2756/head
Ruud 11 years ago
parent
commit
18c64e493b
  1. 16
      couchpotato/core/plugins/base.py
  2. 4
      couchpotato/core/providers/base.py

16
couchpotato/core/plugins/base.py

@ -244,11 +244,15 @@ class Plugin(object):
log.error("Something went wrong when finishing the plugin function. Could not find the 'is_running' key") log.error("Something went wrong when finishing the plugin function. Could not find the 'is_running' key")
def getCache(self, cache_key, url = None, **kwargs): def getCache(self, cache_key, url = None, **kwargs):
cache_key_md5 = md5(cache_key)
cache = Env.get('cache').get(cache_key_md5) use_cache = not len(kwargs.get('data', {})) > 0 and not kwargs.get('files')
if cache:
if not Env.get('dev'): log.debug('Getting cache %s', cache_key) if use_cache:
return cache cache_key_md5 = md5(cache_key)
cache = Env.get('cache').get(cache_key_md5)
if cache:
if not Env.get('dev'): log.debug('Getting cache %s', cache_key)
return cache
if url: if url:
try: try:
@ -259,7 +263,7 @@ class Plugin(object):
del kwargs['cache_timeout'] del kwargs['cache_timeout']
data = self.urlopen(url, **kwargs) data = self.urlopen(url, **kwargs)
if data and cache_timeout > 0: if data and cache_timeout > 0 and use_cache:
self.setCache(cache_key, data, timeout = cache_timeout) self.setCache(cache_key, data, timeout = cache_timeout)
return data return data
except: except:

4
couchpotato/core/providers/base.py

@ -64,7 +64,7 @@ class Provider(Plugin):
def getJsonData(self, url, decode_from = None, **kwargs): def getJsonData(self, url, decode_from = None, **kwargs):
cache_key = '%s%s' % (md5(url), md5('%s' % kwargs.get('params', {}))) cache_key = md5(url)
data = self.getCache(cache_key, url, **kwargs) data = self.getCache(cache_key, url, **kwargs)
if data: if data:
@ -81,7 +81,7 @@ class Provider(Plugin):
def getRSSData(self, url, item_path = 'channel/item', **kwargs): def getRSSData(self, url, item_path = 'channel/item', **kwargs):
cache_key = '%s%s' % (md5(url), md5('%s' % kwargs.get('params', {}))) cache_key = md5(url)
data = self.getCache(cache_key, url, **kwargs) data = self.getCache(cache_key, url, **kwargs)
if data and len(data) > 0: if data and len(data) > 0:

Loading…
Cancel
Save