From ca55900d40e969da7a037f2aa6c54c9fb540b3ae Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sun, 16 Feb 2020 16:23:58 -0800 Subject: [PATCH] Update info page for Live TV --- .../default/current_activity_instance.html | 30 ++++++--- data/interfaces/default/info.html | 67 +++++++++++++++++-- plexpy/webserve.py | 2 +- 3 files changed, 81 insertions(+), 18 deletions(-) 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
    - % if data['media_type'] in ('movie', 'collection'): + % if media_info['live']: +
  • Live TV
    • + + % if data['media_type'] == 'movie': +
  • ${data['title']}
    • + % elif data['media_type'] == 'episode': + + + % if data['media_index']: +
  • Season ${data['parent_media_index']}
    • + +
  • Episode ${data['media_index']} - ${data['title']}
    • + % else: +
  • ${data['title']}
    • + % endif + % endif + % elif data['media_type'] in ('movie', 'collection'):
  • ${data['library_name']}
  • ${data['title']}
    • @@ -134,6 +154,13 @@ DOCUMENTATION :: END % else: % endif + % if media_info['live']: +
    +
    + +
    +
    + % else: % if data['media_type'] == 'episode':
    @@ -162,10 +189,21 @@ DOCUMENTATION :: END % endif % endif + % endif
    - % if data['media_type'] in ('movie', 'show', 'artist', 'collection'): + % if media_info['live']: + % if data['media_type'] == 'movie': +

     

    ${data['title']}

    + % elif data['media_type'] == 'eipsode': +

    ${data['grandparent_title']}

    +

    ${data['title']}

    + % if data['media_index']: + + % endif + % endif + % elif data['media_type'] in ('movie', 'show', 'artist', 'collection'):

     

    ${data['title']}

    % elif data['media_type'] == 'season':

     

    ${data['parent_title']}

    @@ -187,7 +225,7 @@ DOCUMENTATION :: END
    - % if data['media_type'] == 'movie': + % if data['media_type'] == 'movie' or media_info['live']: % if data['tagline']:
    @@ -474,6 +519,10 @@ DOCUMENTATION :: END <%def name="modalIncludes()"> +% if metadata: +<% + data = defaultdict(None, **metadata) +%>
    +% endif <%def name="javascriptIncludes()"> @@ -558,7 +608,10 @@ DOCUMENTATION :: END -% if data: +% if metadata: +<% + data = defaultdict(None, **metadata) +%> % if data['media_type'] in ('show', 'artist'):