Private GIT

Skip to content
Snippets Groups Projects
Commit 4bffb299 authored by Ruud's avatar Ruud
Browse files

Catch urlerrors. closes #1154

parent a2c41195
Branches
Tags
No related merge requests found
...@@ -241,9 +241,11 @@ class Plugin(object): ...@@ -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)
......
...@@ -3,6 +3,7 @@ from couchpotato.core.helpers.encoding import simplifyString, toUnicode ...@@ -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): ...@@ -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 = None
try:
raw = tmdb.search(search_string) 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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment