dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/develop'

Browse Source
This commit is contained in:
Ruud
2012-04-29 00:00:14 +02:00
parent ca87f2c231 c161bdd762
commit e3cc15d2b6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
couchpotato/core/plugins/base.py
View File

@@ -198,7 +198,7 @@ class Plugin(object):
log.error("Something went wrong when finishing the plugin function. Could not find the 'is_running' key")
def getCache(self, cache_key, url = None, timeout = 300):
def getCache(self, cache_key, url = None, timeout = 300, url_timeout = 10):
cache = Env.get('cache').get(cache_key)
if cache:
if not Env.get('dev'): log.debug('Getting cache %s' % cache_key)
@@ -206,7 +206,7 @@ class Plugin(object):
if url:
try:
data = self.urlopen(url)
data = self.urlopen(url, timeout = url_timeout)
self.setCache(cache_key, data, timeout = timeout)
return data
except:

4
couchpotato/core/providers/movie/imdbapi/main.py
View File

@@ -31,7 +31,7 @@ class IMDBAPI(MovieProvider):
return []
cache_key = 'imdbapi.cache.%s' % q
cached = self.getCache(cache_key, self.urls['search'] % tryUrlencode({'t': name_year.get('name'), 'y': name_year.get('year', '')}))
cached = self.getCache(cache_key, self.urls['search'] % tryUrlencode({'t': name_year.get('name'), 'y': name_year.get('year', '')}), url_timeout = 3)
if cached:
result = self.parseMovie(cached)
@@ -49,7 +49,7 @@ class IMDBAPI(MovieProvider):
return {}
cache_key = 'imdbapi.cache.%s' % identifier
cached = self.getCache(cache_key, self.urls['info'] % identifier)
cached = self.getCache(cache_key, self.urls['info'] % identifier, url_timeout = 3)
if cached:
result = self.parseMovie(cached)