Browse Source

Catch urlerrors. closes #1154

pull/1143/merge
Ruud 13 years ago
parent
commit
4bffb299af
  1. 4
      couchpotato/core/plugins/base.py
  2. 8
      couchpotato/core/providers/movie/themoviedb/main.py

4
couchpotato/core/plugins/base.py

@ -241,9 +241,11 @@ class Plugin(object):
self.setCache(cache_key, data, timeout = cache_timeout) self.setCache(cache_key, data, timeout = cache_timeout)
return data return data
except: except:
if not kwargs.get('show_error'): if not kwargs.get('show_error', True):
raise raise
return ''
def setCache(self, cache_key, value, timeout = 300): def setCache(self, cache_key, value, timeout = 300):
log.debug('Setting cache %s', cache_key) log.debug('Setting cache %s', cache_key)
Env.get('cache').set(cache_key, value, timeout) Env.get('cache').set(cache_key, value, timeout)

8
couchpotato/core/providers/movie/themoviedb/main.py

@ -3,6 +3,7 @@ from couchpotato.core.helpers.encoding import simplifyString, toUnicode
from couchpotato.core.logger import CPLog from couchpotato.core.logger import CPLog
from couchpotato.core.providers.movie.base import MovieProvider from couchpotato.core.providers.movie.base import MovieProvider
from libs.themoviedb import tmdb from libs.themoviedb import tmdb
import traceback
log = CPLog(__name__) log = CPLog(__name__)
@ -61,7 +62,12 @@ class TheMovieDb(MovieProvider):
if not results: if not results:
log.debug('Searching for movie: %s', q) log.debug('Searching for movie: %s', q)
raw = tmdb.search(search_string)
raw = None
try:
raw = tmdb.search(search_string)
except:
log.error('Failed searching TMDB for "%s": %s', (search_string, traceback.format_exc()))
results = [] results = []
if raw: if raw:

Loading…
Cancel
Save