diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index 30ffb207..e6c1ab0b 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -79,7 +79,7 @@ DOCUMENTATION :: END data-rating_key="${data['rating_key']}" data-parent_rating_key="${data['parent_rating_key']}" data-grandparent_rating_key="${data['grandparent_rating_key']}">
<% - if data['live'] == 1: + if data['live']: 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' @@ -91,8 +91,18 @@ DOCUMENTATION :: END % if data['media_type'] == 'track':
% endif - % if data['live'] == 1: + % if data['live']: + % if data['media_type'] == 'movie': + +
+
+ % elif data['media_type'] == 'episode': + +
+
+ % else:
+ % endif % elif data['channel_stream'] == 0: % if data['media_type'] == 'movie': @@ -337,7 +347,7 @@ DOCUMENTATION :: END
% if data['media_type'] != 'photo':
- % if data['live'] == 1: + % if data['live']:
Live % elif data['view_offset']: ETA: @@ -367,7 +377,7 @@ DOCUMENTATION :: END
- % if data['live'] == 1: + % if data['live']:
Live
% else:
${data['transcode_progress']}%
@@ -391,12 +401,12 @@ DOCUMENTATION :: END % endif
- % if data['live'] == 1: + % if data['live']: % if data['media_type'] == 'movie': - ${data['title']} + ${data['title']} % elif data['media_type'] == 'episode': - ${data['grandparent_title']} - - ${data['title']} + ${data['grandparent_title']} + - ${data['title']} % else: ${data['title']} % endif @@ -453,8 +463,8 @@ DOCUMENTATION :: END % if data['media_type'] == 'movie': ${data['year']} % elif data['media_type'] == 'episode': - S${data['parent_media_index']} - · E${data['media_index']} + S${data['parent_media_index']} + · E${data['media_index']} % else: Live TV % endif diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index a2bb4d2b..1b0ce616 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -36,6 +36,7 @@ DOCUMENTATION :: END <%! + from collections import defaultdict import re from plexpy import notifiers @@ -68,8 +69,11 @@ DOCUMENTATION :: END <%def name="body()"> -% if data: -<% media_info = data['media_info'][0] if data['media_info'] else {} %> +% if metadata: +<% + data = defaultdict(lambda: None, **metadata) + media_info = defaultdict(lambda: None, **(data['media_info'][0] if data['media_info'] else {})) +%>
@@ -81,7 +85,23 @@ DOCUMENTATION :: END