From 73f8f83658117a19c25c3f4ac4125c6a5cfad5a5 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sun, 16 Feb 2020 20:06:35 -0800 Subject: [PATCH] Fallback pms_image_proxy when no image imput received --- data/interfaces/default/current_activity_instance.html | 3 +-- plexpy/webserve.py | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index ba9bf6be..84ea0c7c 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -80,8 +80,7 @@ DOCUMENTATION :: END
<% if data['live']: - art = ('img=' + data['art']) if data['art'] else ('rating_key=' + data['rating_key']) - background_url = 'pms_image_proxy?' + art + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=art-live&refresh=true' + background_url = 'pms_image_proxy?img=' + data['art'] + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=art-live&refresh=true' elif data['channel_stream'] == 0: background_url = 'pms_image_proxy?img=' + data['art'] + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=art&refresh=true' else: diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 6469f8d2..9cb1f167 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -4047,6 +4047,10 @@ class WebInterface(object): ``` """ if not img and not rating_key: + if fallback in common.DEFAULT_IMAGES: + fbi = common.DEFAULT_IMAGES[fallback] + fp = os.path.join(plexpy.PROG_DIR, 'data', fbi) + return serve_file(path=fp, content_type='image/png') logger.warn('No image input received.') return