From 5fad0a1d9753350907342065c64858357d20e840 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Thu, 20 Feb 2020 09:00:10 -0800 Subject: [PATCH] Refactor page helper functions --- .../default/current_activity_instance.html | 38 ++++++------- data/interfaces/default/home_stats.html | 14 ++--- data/interfaces/default/index.html | 6 +- data/interfaces/default/info.html | 34 ++++++------ .../default/info_children_list.html | 36 ++++++------ .../default/info_collection_list.html | 16 +++--- .../default/info_search_results_list.html | 34 ++++++------ data/interfaces/default/js/script.js | 55 +++++++++++-------- .../default/js/tables/history_table.js | 12 ++-- .../default/js/tables/history_table_modal.js | 12 ++-- .../interfaces/default/js/tables/libraries.js | 12 ++-- .../default/js/tables/media_info_table.js | 20 +++---- data/interfaces/default/js/tables/user_ips.js | 12 ++-- data/interfaces/default/js/tables/users.js | 12 ++-- data/interfaces/default/library.html | 4 +- .../default/library_recently_added.html | 30 +++++----- data/interfaces/default/library_stats.html | 4 +- data/interfaces/default/recently_added.html | 44 +++++++-------- .../default/user_recently_watched.html | 38 ++++++------- plexpy/helpers.py | 53 +++++++++++------- 20 files changed, 254 insertions(+), 232 deletions(-) diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index cbd5d85e..115d796e 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.helpers import cast_to_int, pms_image_proxy, info_page + from plexpy.helpers import cast_to_int, page from plexpy.common import VIDEO_RESOLUTION_OVERRIDES, AUDIO_CODEC_OVERRIDES, EXTRA_TYPES import plexpy %> @@ -70,9 +70,9 @@ DOCUMENTATION :: END data = defaultdict(lambda: 'Unknown', **session) sk = data['session_key'] - href = info_page(data['rating_key']) - parent_href = info_page(data['parent_rating_key']) - grandparent_href = info_page(data['grandparent_rating_key']) + href = page('info', data['rating_key']) + parent_href = page('info', data['parent_rating_key']) + grandparent_href = page('info', data['grandparent_rating_key']) user_href = 'user?user_id={}'.format(data['user_id']) if data['user_id'] else '#' %>
<% if data['live']: - background_url = pms_image_proxy(data['art'], data['rating_key'], 500, 280, 40, '282828', 3, fallback='art-live', refresh=True) + background_url = page('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(data['art'], data['rating_key'], 500, 280, 40, '282828', 3, fallback='art', refresh=True) + background_url = page('pms_image_proxy', data['art'], data['rating_key'], 500, 280, 40, '282828', 3, fallback='art', refresh=True) else: - background_url = pms_image_proxy(data['art'] or data['thumb'], data['rating_key'], 500, 280, 40, '282828', 3, fallback='art', refresh=True, clip=True) + background_url = page('pms_image_proxy', data['art'] or data['thumb'], data['rating_key'], 500, 280, 40, '282828', 3, fallback='art', refresh=True, clip=True) %>
diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html index c5083ef1..f64e4267 100644 --- a/data/interfaces/default/home_stats.html +++ b/data/interfaces/default/home_stats.html @@ -53,7 +53,7 @@ DOCUMENTATION :: END <%! - from plexpy.helpers import cast_to_int, pms_image_proxy + from plexpy.helpers import cast_to_int, page # Human readable duration def hd(seconds): @@ -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(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) + ')'); + $('#stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art, rating_key, 500, 280, 40, '282828', 3, fallback_art) + ')'); + $('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', thumb, rating_key, 300, height, null, null, null, fallback_poster) + ')'); + $('#stats-thumb-' + stat_id + '-bg').css('background-image', 'url(' + page('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 0b3033a7..6c3c98b9 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(s.art, s.rating_key, 500, 280, 40, '282828', 3, 'art', true) + ')'); + $('#background-' + key).css('background-image', 'url(' + page('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(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-' + key).css('background-image', 'url(' + page('pms_image_proxy', s.parent_thumb, s.parent_rating_key, 300, 300, null, null, null, 'poster', true) + ')'); + $('#poster-' + key + '-bg').css('background-image', 'url(' + page('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 a7a33088..a07a9fb4 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -41,7 +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, info_page + from plexpy.helpers import page # Get audio codec file def af(codec): @@ -77,7 +77,7 @@ DOCUMENTATION :: END %>
-
+
% if _session['user_group'] == 'admin': % endif @@ -113,15 +113,15 @@ DOCUMENTATION :: END % elif data['media_type'] == 'season': -
  • ${data['parent_title']}
    • +
  • ${data['parent_title']}
  • Season ${data['media_index']}
    • % elif data['media_type'] == 'episode': - + -
  • Season ${data['parent_media_index']}
    • +
  • Season ${data['parent_media_index']}
  • Episode ${data['media_index']} - ${data['title']}
    • % elif data['media_type'] == 'artist': @@ -131,15 +131,15 @@ DOCUMENTATION :: END % elif data['media_type'] == 'album': -
  • ${data['parent_title']}
    • +
  • ${data['parent_title']}
  • ${data['title']}
    • % elif data['media_type'] == 'track': - + -
  • ${data['parent_title']}
    • +
  • ${data['parent_title']}
  • Track ${data['media_index']} - ${data['title']}
    • % endif @@ -156,14 +156,14 @@ DOCUMENTATION :: END % endif % if data['live']: -
    +
    % else: % if data['media_type'] == 'episode': -
    +
    @@ -172,7 +172,7 @@ DOCUMENTATION :: END % endif % elif data['media_type'] == 'artist' or data['media_type'] == 'album' or data['media_type'] == 'track': -
    +
    @@ -181,7 +181,7 @@ DOCUMENTATION :: END % endif % else: -
    +
    @@ -209,18 +209,18 @@ DOCUMENTATION :: END % elif data['media_type'] in ('movie', 'show', 'artist', 'collection'):

     

    ${data['title']}

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

     

    ${data['parent_title']}

    +

     

    ${data['parent_title']}

    % elif data['media_type'] == 'episode': -

    ${data['grandparent_title']}

    +

    ${data['grandparent_title']}

    ${data['title']}

    % elif data['media_type'] == 'album': -

    ${data['parent_title']}

    +

    ${data['parent_title']}

    ${data['title']}

    % elif data['media_type'] == 'track': -

    ${data['original_title'] or data['grandparent_title']}

    -

    ${data['parent_title']} - ${data['title']}

    +

    ${data['original_title'] or data['grandparent_title']}

    +

    ${data['parent_title']} - ${data['title']}

    % endif
    diff --git a/data/interfaces/default/info_children_list.html b/data/interfaces/default/info_children_list.html index 300e0fdd..0aa9da04 100644 --- a/data/interfaces/default/info_children_list.html +++ b/data/interfaces/default/info_children_list.html @@ -28,7 +28,7 @@ DOCUMENTATION :: END % if data != None: <% - from plexpy.helpers import pms_image_proxy, info_page + from plexpy.helpers import page %> % if data['children_count'] > 0:
    @@ -41,9 +41,9 @@ DOCUMENTATION :: END
  • % endif % if data['children_type'] == 'movie': - +
    -
    +
    % if _session['user_group'] == 'admin': % endif @@ -51,14 +51,14 @@ DOCUMENTATION :: END

    - ${child['title']} + ${child['title']}

    ${child['year']}

    % elif data['children_type'] == 'show': - +
    -
    +
    % if _session['user_group'] == 'admin': % endif @@ -66,16 +66,16 @@ DOCUMENTATION :: END

    - ${child['title']} + ${child['title']}

    % elif data['children_type'] == 'season': - +
    % if child['thumb']: -
    +
    % else: -
    +
    % endif
    @@ -89,9 +89,9 @@ DOCUMENTATION :: END
    % elif data['children_type'] == 'episode': - +
    -
    +
    Episode ${child['media_index'] or child['originally_available_at']} @@ -105,13 +105,13 @@ DOCUMENTATION :: END

    - ${child['title']} + ${child['title']}

    % elif data['children_type'] == 'album': - +
    -
    +
    % if _session['user_group'] == 'admin': % endif @@ -119,14 +119,14 @@ DOCUMENTATION :: END

    - ${child['title']} + ${child['title']}

    % elif data['children_type'] == 'track': % if loop.index % 2 == 0:
     ${child['media_index']} - ${child['title']} + ${child['title']} % if child['original_title']: - ${child['original_title']} % endif @@ -138,7 +138,7 @@ DOCUMENTATION :: END % else:
     ${child['media_index']} - ${child['title']} + ${child['title']} % if child['original_title']: - ${child['original_title']} % endif diff --git a/data/interfaces/default/info_collection_list.html b/data/interfaces/default/info_collection_list.html index d625f249..e4b675b5 100644 --- a/data/interfaces/default/info_collection_list.html +++ b/data/interfaces/default/info_collection_list.html @@ -29,7 +29,7 @@ DOCUMENTATION :: END % if data != None: <% from plexpy.common import MEDIA_TYPE_HEADERS - from plexpy.helpers import pms_image_proxy, info_page + from plexpy.helpers import page types = ('movie', 'show', 'artist', 'album') %> % for media_type in types: @@ -46,12 +46,12 @@ DOCUMENTATION :: END