diff --git a/couchpotato/core/plugins/base.py b/couchpotato/core/plugins/base.py index bd3e066..035ccab 100644 --- a/couchpotato/core/plugins/base.py +++ b/couchpotato/core/plugins/base.py @@ -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: diff --git a/couchpotato/core/providers/movie/imdbapi/main.py b/couchpotato/core/providers/movie/imdbapi/main.py index 568b413..933538c 100644 --- a/couchpotato/core/providers/movie/imdbapi/main.py +++ b/couchpotato/core/providers/movie/imdbapi/main.py @@ -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)