From 090ff79e8fb0d2a38bd0dcfcebbb1da6430d66a2 Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Thu, 27 Oct 2016 22:31:58 -0500 Subject: [PATCH] Move catch except to _common.py --- resources/lib/objects/_common.py | 15 +++++++++++++++ resources/lib/objects/movies.py | 4 ++-- resources/lib/objects/music.py | 4 ++-- resources/lib/objects/musicvideos.py | 4 ++-- resources/lib/objects/tvshows.py | 4 ++-- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/resources/lib/objects/_common.py b/resources/lib/objects/_common.py index 1c91484e..8c2fe7e1 100644 --- a/resources/lib/objects/_common.py +++ b/resources/lib/objects/_common.py @@ -20,6 +20,21 @@ log = logging.getLogger("EMBY."+__name__) ################################################################################################## +def catch_except(errors=(Exception, ), default_value=False): +# Will wrap method with try/except and print parameters for easier debugging + def decorator(func): + def wrapper(*args, **kwargs): + try: + return func(*args, **kwargs) + except errors as error: + log.exception(error) + log.error("function: %s \n args: %s \n kwargs: %s", + func.__name__, args, kwargs) + return default_value + + return wrapper + return decorator + class Items(object): diff --git a/resources/lib/objects/movies.py b/resources/lib/objects/movies.py index 8bee89a3..07690bcb 100644 --- a/resources/lib/objects/movies.py +++ b/resources/lib/objects/movies.py @@ -8,8 +8,8 @@ import urllib import api import embydb_functions as embydb import _kodi_movies -from _common import Items -from utils import window, settings, language as lang, catch_except +from _common import Items, catch_except +from utils import window, settings, language as lang ################################################################################################## diff --git a/resources/lib/objects/music.py b/resources/lib/objects/music.py index 167a92e3..dc560481 100644 --- a/resources/lib/objects/music.py +++ b/resources/lib/objects/music.py @@ -9,8 +9,8 @@ import api import embydb_functions as embydb import musicutils import _kodi_music -from _common import Items -from utils import window, settings, language as lang, catch_except +from _common import Items, catch_except +from utils import window, settings, language as lang ################################################################################################## diff --git a/resources/lib/objects/musicvideos.py b/resources/lib/objects/musicvideos.py index eede7c13..12b69242 100644 --- a/resources/lib/objects/musicvideos.py +++ b/resources/lib/objects/musicvideos.py @@ -8,8 +8,8 @@ import urllib import api import embydb_functions as embydb import _kodi_musicvideos -from _common import Items -from utils import window, settings, language as lang, catch_except +from _common import Items, catch_except +from utils import window, settings, language as lang ################################################################################################## diff --git a/resources/lib/objects/tvshows.py b/resources/lib/objects/tvshows.py index 7ea9a1ce..7153182f 100644 --- a/resources/lib/objects/tvshows.py +++ b/resources/lib/objects/tvshows.py @@ -9,8 +9,8 @@ from ntpath import dirname import api import embydb_functions as embydb import _kodi_tvshows -from _common import Items -from utils import window, settings, language as lang, catch_except +from _common import Items, catch_except +from utils import window, settings, language as lang ##################################################################################################