diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index 3a4ace9c..6e2a32f1 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, page + from plexpy.helpers import cast_to_int, page, short_season from plexpy.common import VIDEO_RESOLUTION_OVERRIDES, AUDIO_CODEC_OVERRIDES, EXTRA_TYPES import plexpy %> @@ -74,6 +74,7 @@ DOCUMENTATION :: END parent_href = page('info', data['parent_rating_key']) grandparent_href = page('info', data['grandparent_rating_key']) user_href = page('user', data['user_id']) if data['user_id'] else '#' + season = short_season(data['parent_title']) %>
${data['year']} % elif data['media_type'] == 'episode': % if data['media_index']: - S${data['parent_media_index']} + ${season} · E${data['media_index']} % else: ${data['originally_available_at']} @@ -490,7 +491,7 @@ DOCUMENTATION :: END % if data['media_type'] == 'movie': ${data['year']} % elif data['media_type'] == 'episode': - S${data['parent_media_index']} + ${season} · E${data['media_index']} % elif data['media_type'] == 'track': ${data['parent_title']} @@ -507,7 +508,7 @@ DOCUMENTATION :: END % elif data['channel_title']: ${data['channel_title']} % if data['media_type'] == 'episode' and data['parent_media_index'] and data['media_index']: - (S${data['parent_media_index']} + (${season} · E${data['media_index']}) % elif data['media_type'] == 'episode' and data['originally_available_at']: (${data['originally_available_at']}) @@ -515,7 +516,7 @@ DOCUMENTATION :: END % else: Channel % if data['media_type'] == 'episode' and data['parent_media_index'] and data['media_index']: - (S${data['parent_media_index']} + (${season} · E${data['media_index']}) % elif data['media_type'] == 'episode' and data['originally_available_at']: (${data['originally_available_at']}) diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index 34cab569..5ac489a9 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 page, get_percent, cast_to_int + from plexpy.helpers import page, get_percent, cast_to_int, short_season # Get audio codec file def af(codec): @@ -81,6 +81,11 @@ DOCUMENTATION :: END <% data = defaultdict(lambda: None, **metadata) media_info = defaultdict(lambda: None, **(data['media_info'][0] if data['media_info'] else {})) + season = '' + if data['media_type'] == 'episode': + season = short_season(data['parent_title']) + elif data['media_type'] == 'season': + season = short_season(data['title']) %>
@@ -105,7 +110,7 @@ DOCUMENTATION :: END % if data['media_index']: -
  • Season ${data['parent_media_index']}
  • +
  • ${data['parent_title']}
  • % else: @@ -125,13 +130,13 @@ DOCUMENTATION :: END
  • ${data['parent_title']}
  • - + % elif data['media_type'] == 'episode': -
  • Season ${data['parent_media_index']}
  • +
  • ${data['parent_title']}
  • % elif data['media_type'] == 'artist': @@ -242,18 +247,18 @@ DOCUMENTATION :: END

    ${data['grandparent_title']}

    ${data['title']}

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

     

    ${data['title']}

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

     

    ${data['parent_title']}

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

    ${data['grandparent_title']}

    ${data['title']}

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

    ${data['parent_title']}

    ${data['title']}

    @@ -705,6 +710,11 @@ DOCUMENTATION :: END % if metadata: <% data = defaultdict(None, **metadata) + season = '' + if data['media_type'] == 'episode': + season = short_season(data['parent_title']) + elif data['media_type'] == 'season': + season = short_season(data['title']) %> @@ -744,9 +754,9 @@ DOCUMENTATION :: END % elif data['media_type'] == 'show': ${data['title']} % elif data['media_type'] == 'season': - ${data['parent_title']}
    S${data['media_index']} + ${data['parent_title']}
    ${data['title']} % elif data['media_type'] == 'episode': - ${data['grandparent_title']}
    ${data['title']}
    S${data['parent_media_index']} · E${data['media_index']} + ${data['grandparent_title']}
    ${data['title']}
    ${season} · E${data['media_index']} % elif data['media_type'] == 'artist': ${data['title']} % elif data['media_type'] == 'album': diff --git a/data/interfaces/default/info_children_list.html b/data/interfaces/default/info_children_list.html index 5be46e83..a0a83960 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 cast_to_int, page + from plexpy.helpers import cast_to_int, page, short_season %> % if data['children_count'] > 0:
    @@ -71,7 +71,7 @@ DOCUMENTATION :: END
    % elif data['children_type'] == 'season': - +

    ${child['parent_title']}

    -

    S${child['media_index']}

    +

    ${short_season(child['title'])}

    @@ -175,7 +175,7 @@ DOCUMENTATION :: END

    ${child['grandparent_title']}

    ${child['title']}

    -

    S${child['parent_media_index']} · E${child['media_index']}

    +

    ${short_season(child['parent_title'])} · E${child['media_index']}

    diff --git a/data/interfaces/default/library_recently_added.html b/data/interfaces/default/library_recently_added.html index f3a355f6..fb53f9a5 100644 --- a/data/interfaces/default/library_recently_added.html +++ b/data/interfaces/default/library_recently_added.html @@ -32,7 +32,8 @@ DOCUMENTATION :: END % if data: <% - from plexpy.helpers import page + from plexpy.helpers import page, short_season + %>
    @@ -77,7 +78,7 @@ DOCUMENTATION :: END ${item['title']}

    - S${item['parent_media_index']} + ${short_season(item['parent_title'])} · E${item['media_index']}

    % elif item['media_type'] == 'movie': diff --git a/data/interfaces/default/recently_added.html b/data/interfaces/default/recently_added.html index f77c5eca..52920817 100644 --- a/data/interfaces/default/recently_added.html +++ b/data/interfaces/default/recently_added.html @@ -32,7 +32,7 @@ DOCUMENTATION :: END % if data != None: <% - from plexpy.helpers import cast_to_int, page + from plexpy.helpers import cast_to_int, page, short_season %> % if data:
    @@ -146,7 +146,7 @@ DOCUMENTATION :: END ${item['title']}

    - S${item['parent_media_index']} + ${short_season(item['parent_title'])} · E${item['media_index']}

    diff --git a/data/interfaces/default/update_metadata.html b/data/interfaces/default/update_metadata.html index 4146c421..fe962e1b 100644 --- a/data/interfaces/default/update_metadata.html +++ b/data/interfaces/default/update_metadata.html @@ -50,13 +50,13 @@ DOCUMENTATION :: END -
  • Season ${query['parent_media_index']}
  • +
  • ${query['parent_title']}
  • % elif query['media_type'] == 'episode': -
  • Season ${query['parent_media_index']}
  • +
  • ${query['parent_title']}
  • Episode ${query['media_index']} - ${query['title']}
  • % elif query['media_type'] == 'artist': @@ -141,6 +141,9 @@ DOCUMENTATION :: END <%def name="modalIncludes()"> % if query: +<% + from plexpy.helpers import short_season +%>