Don't return error messages if missing newsletter files
This commit is contained in:
@@ -161,10 +161,5 @@ def get_newsletter(newsletter_uuid):
|
|||||||
return newsletter
|
return newsletter
|
||||||
except OSError as e:
|
except OSError as e:
|
||||||
logger.error(u"Tautulli NewsletterHandler :: Failed to retrieve newsletter '%s': %s" % (newsletter_uuid, e))
|
logger.error(u"Tautulli NewsletterHandler :: Failed to retrieve newsletter '%s': %s" % (newsletter_uuid, e))
|
||||||
return "Failed to retrieve newsletter"
|
|
||||||
else:
|
else:
|
||||||
logger.warn(u"Tautulli NewsletterHandler :: Newsletter '%s' file is missing." % newsletter_uuid)
|
logger.warn(u"Tautulli NewsletterHandler :: Newsletter '%s' file is missing." % newsletter_uuid)
|
||||||
return "Newsletter no longer exists"
|
|
||||||
else:
|
|
||||||
return "Newsletter does not exist"
|
|
||||||
|
|
||||||
|
@@ -3998,8 +3998,10 @@ class WebInterface(object):
|
|||||||
if args:
|
if args:
|
||||||
img_hash = args[0]
|
img_hash = args[0]
|
||||||
img_info = notification_handler.get_hash_image_info(img_hash=img_hash)
|
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
|
return
|
||||||
|
|
||||||
@@ -5604,7 +5606,10 @@ class WebInterface(object):
|
|||||||
if len(args) >= 2 and args[0] == 'image':
|
if len(args) >= 2 and args[0] == 'image':
|
||||||
if args[1] == 'images':
|
if args[1] == 'images':
|
||||||
resource_dir = os.path.join(str(plexpy.PROG_DIR), 'data/interfaces/default/')
|
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)
|
return self.image(args[1], refresh=True)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user