github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-12 00:06:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Live TV artwork on activity card

Browse source
This commit is contained in:
JonnyWong16 2020-02-16 19:02:29 -08:00
parent ca55900d40
commit d0cd2672dd
4 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
data/interfaces/default/current_activity_instance.html
View file

@ -80,7 +80,8 @@ DOCUMENTATION :: END
<div class="dashboard-activity-container"> <div class="dashboard-activity-container">
<% <%
if data['live']: 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' 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'
elif data['channel_stream'] == 0: 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' background_url = 'pms_image_proxy?img=' + data['art'] + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=art&refresh=true'
else: else:
@ -348,7 +349,7 @@ DOCUMENTATION :: END
% if data['media_type'] != 'photo': % if data['media_type'] != 'photo':
<div class="dashboard-activity-info-time"> <div class="dashboard-activity-info-time">
% if data['live']: % if data['live']:
<br />Live <br />${data['channel_call_sign']} ${data['channel_identifier']}
% elif data['view_offset']: % elif data['view_offset']:
ETA: ETA:
<span id="stream-eta-${sk}"> <span id="stream-eta-${sk}">
@ -437,7 +438,7 @@ DOCUMENTATION :: END
<div class="dashboard-activity-metadata-subtitle-container"> <div class="dashboard-activity-metadata-subtitle-container">
% if data['live']: % if data['live']:
<div id="media-type-${sk}" class="dashboard-activity-metadata-media_type-icon" title="Live TV"> <div id="media-type-${sk}" class="dashboard-activity-metadata-media_type-icon" title="Live TV">
<i class="fa fa-fw broadcast-tower"></i>&nbsp; <i class="fa fa-fw fa-broadcast-tower"></i>&nbsp;
</div> </div>
% elif data['channel_stream'] == 0: % elif data['channel_stream'] == 0:
<div id="media-type-${sk}" class="dashboard-activity-metadata-media_type-icon" title="${data['media_type'].capitalize()}"> <div id="media-type-${sk}" class="dashboard-activity-metadata-media_type-icon" title="${data['media_type'].capitalize()}">
@ -463,16 +464,14 @@ DOCUMENTATION :: END
% if data['media_type'] == 'movie': % if data['media_type'] == 'movie':
<span title="${data['year']}" class="sub-heading">${data['year']}</span> <span title="${data['year']}" class="sub-heading">${data['year']}</span>
% elif data['media_type'] == 'episode': % elif data['media_type'] == 'episode':
% if data['media_index']:
<a href="${href}" title="Season ${data['parent_media_index']}" class="sub-heading">S${data['parent_media_index']}</a> <a href="${href}" title="Season ${data['parent_media_index']}" class="sub-heading">S${data['parent_media_index']}</a>
&middot; <a href="${href}" title="Episode ${data['media_index']}" class="sub-heading">E${data['media_index']}</a> &middot; <a href="${href}" title="Episode ${data['media_index']}" class="sub-heading">E${data['media_index']}</a>
% endif
<span title="Live TV" class="sub-heading">Live TV</span>
% else: % else:
<span title="Live TV" class="sub-heading">Live TV</span> <span title="Live TV" class="sub-heading">Live TV</span>
% endif % endif
% if data['channel_identifier']:
<span class="thumb-tooltip" data-toggle="popover" data-img="${data['channel_thumb']}" data-height="40" data-width="40">
<span title="${data['channel_call_sign']} ${data['channel_identifier']}" class="sub-heading">(${data['channel_call_sign']} ${data['channel_identifier']})</span>
</span>
% endif
% elif data['channel_stream'] == 0: % elif data['channel_stream'] == 0:
% if data['media_type'] == 'movie': % if data['media_type'] == 'movie':
<span title="${data['year']}" class="sub-heading">${data['year']}</span> <span title="${data['year']}" class="sub-heading">${data['year']}</span>

2
plexpy/common.py
View file

@ -46,7 +46,7 @@ DEFAULT_IMAGES = {
'cover': DEFAULT_COVER_THUMB, 'cover': DEFAULT_COVER_THUMB,
'art': DEFAULT_ART, 'art': DEFAULT_ART,
'poster-live': DEFAULT_LIVE_TV_POSTER_THUMB, 'poster-live': DEFAULT_LIVE_TV_POSTER_THUMB,
'poster-art': DEFAULT_LIVE_TV_ART 'art-live': DEFAULT_LIVE_TV_ART
} }
MEDIA_TYPE_HEADERS = { MEDIA_TYPE_HEADERS = {

6
plexpy/notification_handler.py
View file

@ -1246,7 +1246,7 @@ def get_img_info(img=None, rating_key=None, title='', width=1000, height=1500,
return img_info return img_info
if rating_key and not img: if rating_key and not img:
if fallback == 'art': if fallback in ('art', 'art-live'):
img = '/library/metadata/{}/art'.format(rating_key) img = '/library/metadata/{}/art'.format(rating_key)
else: else:
img = '/library/metadata/{}/thumb'.format(rating_key) img = '/library/metadata/{}/thumb'.format(rating_key)
@ -1263,7 +1263,7 @@ def get_img_info(img=None, rating_key=None, title='', width=1000, height=1500,
elif service == 'cloudinary': elif service == 'cloudinary':
if fallback == 'cover': if fallback == 'cover':
w, h = 1000, 1000 w, h = 1000, 1000
elif fallback == 'art': elif fallback in ('art', 'art-live'):
w, h = 1920, 1080 w, h = 1920, 1080
else: else:
w, h = 1000, 1500 w, h = 1000, 1500
@ -1347,7 +1347,7 @@ def set_hash_image_info(img=None, rating_key=None, width=750, height=1000,
return fallback return fallback
if rating_key and not img: if rating_key and not img:
if fallback == 'art': if fallback in ('art', 'art-live'):
img = '/library/metadata/{}/art'.format(rating_key) img = '/library/metadata/{}/art'.format(rating_key)
else: else:
img = '/library/metadata/{}/thumb'.format(rating_key) img = '/library/metadata/{}/thumb'.format(rating_key)

2
plexpy/webserve.py
View file

@ -4053,7 +4053,7 @@ class WebInterface(object):
return_hash = (kwargs.get('return_hash') == 'true') return_hash = (kwargs.get('return_hash') == 'true')
if rating_key and not img: if rating_key and not img:
if fallback == 'art': if fallback in ('art', 'art-live'):
img = '/library/metadata/{}/art'.format(rating_key) img = '/library/metadata/{}/art'.format(rating_key)
else: else:
img = '/library/metadata/{}/thumb'.format(rating_key) img = '/library/metadata/{}/thumb'.format(rating_key)