diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index e09cfd55..9ea2b1b8 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -62,7 +62,7 @@ DOCUMENTATION :: END % if session is not None: <% from collections import defaultdict - from plexpy import helpers + from plexpy.helpers import cast_to_int, pms_image_proxy from plexpy.common import VIDEO_RESOLUTION_OVERRIDES, AUDIO_CODEC_OVERRIDES, EXTRA_TYPES import plexpy %> @@ -80,56 +80,56 @@ DOCUMENTATION :: END
<% if data['live']: - background_url = 'pms_image_proxy?img=' + data['art'] + '&rating_key=' + data['rating_key'] + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=art-live&refresh=true' + background_url = pms_image_proxy(data['art'], data['rating_key'], 500, 280, 40, '282828', 3, fallback='art-live', refresh=True) elif data['channel_stream'] == 0: - background_url = 'pms_image_proxy?img=' + data['art'] + '&rating_key=' + data['rating_key'] + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=art&refresh=true' + background_url = pms_image_proxy(data['art'], data['rating_key'], 500, 280, 40, '282828', 3, fallback='art', refresh=True) else: - background_url = 'pms_image_proxy?img=' + (data['art'] or data['thumb']) + '&rating_key=' + data['rating_key'] + '&width=500&height=280&fallback=art&refresh=true&clip=true' + background_url = pms_image_proxy(data['art'] or data['thumb'], data['rating_key'], 500, 280, 40, '282828', 3, fallback='art', refresh=True, clip=True) %>
@@ -163,7 +163,7 @@ DOCUMENTATION :: END
% if data['media_type'] != 'photo' and data['quality_profile'] != 'Unknown': <% - br = helpers.cast_to_int(data['stream_bitrate']) or '' + br = cast_to_int(data['stream_bitrate']) or '' if br: if br > 1000: br = '(' + str(round(br / 1000.0, 1)) + ' Mbps)' @@ -329,7 +329,7 @@ DOCUMENTATION :: END
% if data['media_type'] != 'photo' and data['bandwidth'] != 'Unknown': <% - bw = helpers.cast_to_int(data['bandwidth']) + bw = cast_to_int(data['bandwidth']) if bw > 1000000: bw = str(round(bw / 1000000.0, 1)) + ' Gbps' elif bw > 1000: diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html index ea8e07a9..c5083ef1 100644 --- a/data/interfaces/default/home_stats.html +++ b/data/interfaces/default/home_stats.html @@ -53,11 +53,11 @@ DOCUMENTATION :: END <%! - from plexpy import helpers + from plexpy.helpers import cast_to_int, pms_image_proxy # Human readable duration def hd(seconds): - m, s = divmod(helpers.cast_to_int(seconds), 60) + m, s = divmod(cast_to_int(seconds), 60) h, m = divmod(m, 60) return str(h).zfill(1) + ':' + str(m).zfill(2) %> @@ -73,7 +73,7 @@ DOCUMENTATION :: END
% if stat_id in ('top_movies', 'popular_movies', 'top_tv', 'popular_tv', 'top_music', 'popular_music', 'last_watched'): <% fallback = 'art-live' if row0['live'] else 'art' %> -
+
% elif stat_id == 'top_platforms':
% else: @@ -82,7 +82,7 @@ DOCUMENTATION :: END % if stat_id in ('top_movies', 'popular_movies', 'top_tv', 'popular_tv', 'top_music', 'popular_music', 'last_watched'): % elif stat_id == 'top_users': @@ -222,9 +222,9 @@ DOCUMENTATION :: END } } $('#stats-thumb-url-' + stat_id).attr('href', href).prop('title', $(elem).data('title')); - $('#stats-background-' + stat_id).css('background-image', 'url(pms_image_proxy?img=' + art + '&rating_key=' + rating_key + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=' + fallback_art + ')'); - $('#stats-thumb-' + stat_id).css('background-image', 'url(pms_image_proxy?img=' + thumb + '&rating_key=' + rating_key + '&width=300&height=' + height + '&fallback=' + fallback_poster + ')'); - $('#stats-thumb-' + stat_id + '-bg').css('background-image', 'url(pms_image_proxy?img=' + thumb + '&rating_key=' + rating_key + '&width=300&height=' + height + '&opacity=60&background=282828&blur=3&fallback=' + fallback_poster + ')'); + $('#stats-background-' + stat_id).css('background-image', 'url(' + pms_image_proxy(art, rating_key, 500, 280, 40, '282828', 3, fallback_art) + ')'); + $('#stats-thumb-' + stat_id).css('background-image', 'url(' + pms_image_proxy(thumb, rating_key, 300, height, null, null, null, fallback_poster) + ')'); + $('#stats-thumb-' + stat_id + '-bg').css('background-image', 'url(' + pms_image_proxy(thumb, rating_key, 300, height, 60, '282828', 3, fallback_poster) + ')'); } } diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index 317e8a4d..0b3033a7 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -384,7 +384,7 @@ if (s.media_type === 'track') { // Update if artist changed if (s.grandparent_rating_key !== instance.data('grandparent_rating_key').toString()) { - $('#background-' + key).css('background-image', 'url(pms_image_proxy?img=' + s.art + '&rating_key=' + s.rating_key + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=art&refresh=true)'); + $('#background-' + key).css('background-image', 'url(' + pms_image_proxy(s.art, s.rating_key, 500, 280, 40, '282828', 3, 'art', true) + ')'); $('#metadata-grandparent_title-' + key) .attr('href', 'info?rating_key=' + s.grandparent_rating_key) .attr('title', s.original_title || s.grandparent_title) @@ -392,8 +392,8 @@ } // Update cover if album changed if (s.parent_rating_key !== instance.data('parent_rating_key').toString()) { - $('#poster-' + key).css('background-image', 'url(pms_image_proxy?img=' + s.parent_thumb + '&rating_key=' + s.parent_rating_key + '&width=300&height=300&fallback=poster&refresh=true)'); - $('#poster-' + key + '-bg').css('background-image', 'url(pms_image_proxy?img=' + s.parent_thumb + '&rating_key=' + s.parent_rating_key + '&width=300&height=300&opacity=60&background=282828&blur=3&fallback=poster&refresh=true)'); + $('#poster-' + key).css('background-image', 'url(' + pms_image_proxy(s.parent_thumb, s.parent_rating_key, 300, 300, null, null, null, 'poster', true) + ')'); + $('#poster-' + key + '-bg').css('background-image', 'url(' + pms_image_proxy(s.parent_thumb, s.parent_rating_key, 300, 300, 60, '282828', 3, 'poster', true) + ')'); $('#poster-url-' + key) .attr('href', 'info?rating_key=' + s.parent_rating_key) .attr('title', s.parent_title); diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index 73277984..4925302c 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -41,6 +41,7 @@ DOCUMENTATION :: END from plexpy import notifiers from plexpy.common import MEDIA_TYPE_HEADERS, MEDIA_FLAGS_AUDIO, MEDIA_FLAGS_VIDEO + from plexpy.helpers import pms_image_proxy # Get audio codec file def af(codec): @@ -76,7 +77,7 @@ DOCUMENTATION :: END %>
-
+
% if _session['user_group'] == 'admin': % endif @@ -155,14 +156,14 @@ DOCUMENTATION :: END % endif % if data['live']: -
+
% else: % if data['media_type'] == 'episode': -
+
@@ -171,7 +172,7 @@ DOCUMENTATION :: END % endif % elif data['media_type'] == 'artist' or data['media_type'] == 'album' or data['media_type'] == 'track': -
+
@@ -180,7 +181,7 @@ DOCUMENTATION :: END % endif % else: -
+
diff --git a/data/interfaces/default/info_children_list.html b/data/interfaces/default/info_children_list.html index ba343d09..08501340 100644 --- a/data/interfaces/default/info_children_list.html +++ b/data/interfaces/default/info_children_list.html @@ -27,6 +27,9 @@ DOCUMENTATION :: END % if data != None: +<% + from plexpy.helpers import pms_image_proxy +%> % if data['children_count'] > 0: