From a9a08a959c3b9d9c1bfdabe0ebc36c656bed165c Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Wed, 21 Mar 2018 12:14:18 -0700 Subject: [PATCH] Don't return error messages if missing newsletter files --- plexpy/newsletter_handler.py | 5 ----- plexpy/webserve.py | 11 ++++++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plexpy/newsletter_handler.py b/plexpy/newsletter_handler.py index 72243364..56a2f264 100644 --- a/plexpy/newsletter_handler.py +++ b/plexpy/newsletter_handler.py @@ -161,10 +161,5 @@ def get_newsletter(newsletter_uuid): return newsletter except OSError as e: logger.error(u"Tautulli NewsletterHandler :: Failed to retrieve newsletter '%s': %s" % (newsletter_uuid, e)) - return "Failed to retrieve newsletter" else: logger.warn(u"Tautulli NewsletterHandler :: Newsletter '%s' file is missing." % newsletter_uuid) - return "Newsletter no longer exists" - else: - return "Newsletter does not exist" - diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 8ab71acb..99c9f59b 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -3998,8 +3998,10 @@ class WebInterface(object): if args: img_hash = args[0] img_info = notification_handler.get_hash_image_info(img_hash=img_hash) - kwargs.update(img_info) - return self.real_pms_image_proxy(**kwargs) + + if img_info: + kwargs.update(img_info) + return self.real_pms_image_proxy(**kwargs) return @@ -5604,7 +5606,10 @@ class WebInterface(object): if len(args) >= 2 and args[0] == 'image': if args[1] == 'images': resource_dir = os.path.join(str(plexpy.PROG_DIR), 'data/interfaces/default/') - return serve_file(path=os.path.join(resource_dir, *args[1:]), content_type='image/png') + try: + return serve_file(path=os.path.join(resource_dir, *args[1:]), content_type='image/png') + except NotFound: + return return self.image(args[1], refresh=True)