% elif stat_id == 'top_libraries':
- % if row0['thumb'].startswith('http'):
-
+ % if row0['library_thumb'].startswith('http'):
+
% endif
% elif stat_id == 'top_users':
<% user_href = page('user', row0['user_id']) if row0['user_id'] else '#' %>
@@ -145,7 +148,8 @@ DOCUMENTATION :: END
data-rating_key="${row.get('rating_key')}" data-grandparent_rating_key="${row.get('grandparent_rating_key')}" data-guid="${row.get('guid')}" data-title="${row.get('title')}"
data-art="${row.get('art')}" data-thumb="${row.get('thumb')}" data-platform="${row.get('platform_name')}" data-library-type="${row.get('section_type')}"
data-user_id="${row.get('user_id')}" data-user="${row.get('user')}" data-friendly_name="${row.get('friendly_name')}" data-user_thumb="${row.get('user_thumb')}"
- data-last_watch="${row.get('last_watch')}" data-started="${row.get('started')}" data-live="${row.get('live')}">
+ data-last_watch="${row.get('last_watch')}" data-started="${row.get('started')}" data-live="${row.get('live')}"
+ data-library_art="${row.get('library_art', '')}" data-library_thumb="${row.get('library_thumb', '')}">
@@ -320,6 +298,8 @@
$('#currentActivityHeader-bandwidth-tooltip').tooltip({ container: 'body', placement: 'right', delay: 50 });
+ var title = document.title;
+
function getCurrentActivity() {
activity_ready = false;
@@ -390,6 +370,8 @@
$('#currentActivityHeader').show();
+ document.title = stream_count + ' stream' + (stream_count > 1 ? 's' : '') + ' | ' + title;
+
sessions.forEach(function (session) {
var s = (typeof Proxy === "function") ? new Proxy(session, defaultHandler) : session;
var key = s.session_key;
@@ -483,8 +465,8 @@
var video_decision = '';
if (['movie', 'episode', 'clip'].indexOf(s.media_type) > -1 && s.stream_video_decision) {
- var v_bd = (s.video_dynamic_range === 'HDR') ? ' ' + s.video_dynamic_range : '';
- var sv_bd = (s.video_dynamic_range === 'HDR') ? ' ' + s.stream_video_dynamic_range : '';
+ var v_bd = (s.video_dynamic_range !== 'SDR') ? ' ' + s.video_dynamic_range : '';
+ var sv_bd = (s.stream_video_dynamic_range !== 'SDR' || v_bd) ? ' ' + s.stream_video_dynamic_range : '';
var v_res= '';
switch (s.video_resolution.toLowerCase()) {
case 'sd':
@@ -523,14 +505,15 @@
var audio_decision = '';
if (['movie', 'episode', 'clip', 'track'].indexOf(s.media_type) > -1 && s.stream_audio_decision) {
+ var audio_language = (s.media_type !== 'track') ? (s.audio_language || 'Unknown') + ' - ' : '';
var a_codec = (s.audio_codec === 'truehd') ? 'TrueHD' : s.audio_codec.toUpperCase();
var sa_codec = (s.stream_audio_codec === 'truehd') ? 'TrueHD' : s.stream_audio_codec.toUpperCase();
if (s.stream_audio_decision === 'transcode') {
- audio_decision = 'Transcode (' + a_codec + ' ' + capitalizeFirstLetter(s.audio_channel_layout.split('(')[0]) + '
' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
+ audio_decision = 'Transcode (' + audio_language + a_codec + ' ' + capitalizeFirstLetter(s.audio_channel_layout.split('(')[0]) + '
' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
} else if (s.stream_audio_decision === 'copy') {
- audio_decision = 'Direct Stream (' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
+ audio_decision = 'Direct Stream (' + audio_language + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
} else {
- audio_decision = 'Direct Play (' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
+ audio_decision = 'Direct Play (' + audio_language + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
}
}
$('#audio_decision-' + key).html(audio_decision);
@@ -539,13 +522,13 @@
if (['movie', 'episode', 'clip'].indexOf(s.media_type) > -1 && s.subtitles === 1) {
var subtitle_codec = (s.stream_subtitle_codec && s.stream_subtitle_transient) ? 'None' : s.subtitle_codec.toUpperCase();
if (s.stream_subtitle_decision === 'transcode') {
- subtitle_decision = 'Transcode (' + subtitle_codec + '
' + s.stream_subtitle_codec.toUpperCase() + ')';
+ subtitle_decision = 'Transcode ('+ (s.subtitle_language || 'Unknown')+ ' - ' + subtitle_codec + '
' + s.stream_subtitle_codec.toUpperCase() + ')';
} else if (s.stream_subtitle_decision === 'copy') {
- subtitle_decision = 'Direct Stream (' + subtitle_codec + ')';
+ subtitle_decision = 'Direct Stream ('+ (s.subtitle_language || 'Unknown')+ ' - ' + subtitle_codec + ')';
} else if (s.stream_subtitle_decision === 'burn') {
- subtitle_decision = 'Burn (' + subtitle_codec + ')';
+ subtitle_decision = 'Burn ('+ (s.subtitle_language || 'Unknown')+ ' - ' + subtitle_codec + ')';
} else {
- subtitle_decision = 'Direct Play (' + ((s.synced_version === '1') ? subtitle_codec : s.stream_subtitle_codec.toUpperCase()) + ')';
+ subtitle_decision = 'Direct Play ('+ (s.subtitle_language || 'Unknown')+ ' - ' + ((s.synced_version === '1') ? subtitle_codec : s.stream_subtitle_codec.toUpperCase()) + ')';
}
}
$('#subtitle_decision-' + key).html(subtitle_decision);
@@ -583,6 +566,7 @@
// Update the stream progress times
$('#stream-eta-' + key).html(moment().add(parseInt(s.duration) - parseInt(s.view_offset), 'milliseconds').format(time_format));
+ $('#stream-duration-' + key).html(millisecondsToMinutes(parseInt(s.stream_duration), false));
var stream_view_offset = $('#stream-view-offset-' + key);
stream_view_offset.data('state', s.state);
if (stream_view_offset.data('last_view_offset') !== s.view_offset) {
@@ -590,8 +574,10 @@
}
// Update the progress bars
- $('#buffer-bar-' + key).css({width: parseInt(s.transcode_progress) + '%'}).html(s.transcode_progress + '%')
- .attr('data-original-title', 'Transcoder Progress ' + s.transcode_progress + '%');
+ var duration = parseInt(s.duration);
+ var transcode_progress = duration ? Math.round(s.transcode_max_offset_available * 1000 / duration * 100) : s.transcode_progress;
+ $('#buffer-bar-' + key).css({width: parseInt(transcode_progress) + '%'}).html(transcode_progress + '%')
+ .attr('data-original-title', 'Transcoder Progress ' + transcode_progress + '%');
if (s.live !== 1) {
var progress_bar = $('#progress-bar-' + key);
progress_bar.data('state', s.state);
@@ -618,6 +604,8 @@
} else {
$('#currentActivityHeader').hide();
$('#currentActivity').html('
Nothing is currently being played.
');
+
+ document.title = title;
}
activity_ready = true;
@@ -701,7 +689,10 @@
$('#currentActivity').on('click', '.external_ip-modal', function () {
$.get('get_ip_address_details', {
- ip_address: $(this).data('ip')
+ ip_address: $(this).data('ip'),
+ location: $(this).data('location'),
+ secure: $(this).data('secure'),
+ relayed: $(this).data('relayed')
}).then(function (jqXHR) {
$("#ip-info-modal").html(jqXHR);
});
@@ -791,6 +782,8 @@
var grandparent_rating_key = $(elem).data('grandparent_rating_key');
var guid = $(elem).data('guid');
var live = $(elem).data('live');
+ var library_art = $(elem).data('library_art');
+ var library_thumb = $(elem).data('library_thumb');
var [height, fallback_poster, fallback_art] = [450, 'poster', 'art'];
if ($.inArray(stat_id, ['top_music', 'popular_music']) > -1) {
[height, fallback_poster, fallback_art] = [300, 'cover', 'art'];
@@ -802,18 +795,18 @@
if (stat_id === 'most_concurrent') {
return
} else if (stat_id === 'top_libraries') {
- $('#stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art, null, 500, 280, 40, '282828', 3, fallback_art) + ')');
+ $('#stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art || library_art, null, 500, 280, 40, '282828', 3, fallback_art) + ')');
$('#stats-thumb-' + stat_id).removeClass(function (index, className) {
return (className.match (/(^|\s)svg-icon library-\S+/g) || []).join(' ')});
- if (thumb.startsWith('http')) {
- $('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', thumb, null, 300, 300, null, null, null, 'cover') + ')');
+ if (library_thumb.startsWith('http')) {
+ $('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', library_thumb, null, 100, 100, null, null, null, 'cover') + ')');
} else {
$('#stats-thumb-' + stat_id).css('background-image', '')
.addClass('svg-icon library-' + library_type);
}
} else if (stat_id === 'top_users') {
- loadBlurHash($('#stats-background-' + stat_id), page('pms_image_proxy', user_thumb || 'interfaces/default/images/gravatar-default.png', null, 80, 80, 40, '282828', 0, 'user'));
- $('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', user_thumb || 'interfaces/default/images/gravatar-default.png', null, 80, 80, null, null, null, 'user') + ')');
+ loadBlurHash($('#stats-background-' + stat_id), page('pms_image_proxy', user_thumb || 'interfaces/default/images/gravatar-default.png', null, 100, 100, 40, '282828', 0, 'user'));
+ $('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', user_thumb || 'interfaces/default/images/gravatar-default.png', null, 100, 100, null, null, null, 'user') + ')');
if (user_id) {
href = page('user', user_id);
}
@@ -838,7 +831,7 @@
$('#stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art, img_rating_key, 500, 280, 40, '282828', 3, fallback_art) + ')');
$('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', thumb, img_rating_key, 300, height, null, null, null, fallback_poster) + ')');
$('#stats-thumb-' + stat_id + '-bg').css('background-image', 'url(' + page('pms_image_proxy', thumb, img_rating_key, 300, height, 60, '282828', 3, fallback_poster) + ')');
- $('#library-stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art, img_rating_key, 500, 280, 40, '282828', 3, fallback_art) + ')');
+ $('#library-stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art || library_art, img_rating_key, 500, 280, 40, '282828', 3, library_art || fallback_art) + ')');
if (thumb.startsWith('http')) {
$('#library-stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', thumb, img_rating_key, 300, 300, null, null, null, 'cover') + ')')
.removeClass('svg-icon library-' + stat_id);
@@ -949,10 +942,14 @@
count: recently_added_count,
media_type: recently_added_type
},
+ beforeSend: function () {
+ $(".dashboard-recent-media-row").animate({ scrollLeft: 0 }, 1000);
+ },
complete: function (xhr, status) {
$("#recentlyAdded").html(xhr.responseText);
$('#ajaxMsg').fadeOut();
- highlightAddedScrollerButton();
+ highlightScrollerButton("#recently-added");
+ paginateScroller("#recently-added", ".paginate-added");
}
});
}
@@ -968,57 +965,11 @@
recentlyAdded(recently_added_count, recently_added_type);
}
- function highlightAddedScrollerButton() {
- var scroller = $("#recently-added-row-scroller");
- var numElems = scroller.find("li:visible").length;
- scroller.width(numElems * 175);
- if (scroller.width() > $("body").find(".container-fluid").width()) {
- $("#recently-added-page-right").removeClass("disabled");
- } else {
- $("#recently-added-page-right").addClass("disabled");
- }
- }
-
- $(window).resize(function () {
- highlightAddedScrollerButton();
- });
-
- function resetScroller() {
- leftTotal = 0;
- $("#recently-added-row-scroller").animate({ left: leftTotal }, 1000);
- $("#recently-added-page-left").addClass("disabled").blur();
- }
-
- var leftTotal = 0;
- $(".paginate").click(function (e) {
- e.preventDefault();
- var scroller = $("#recently-added-row-scroller");
- var containerWidth = $("body").find(".container-fluid").width();
- var scrollAmount = $(this).data("id") * parseInt((containerWidth - 15) / 175) * 175;
- var leftMax = Math.min(-parseInt(scroller.width()) + Math.abs(scrollAmount), 0);
-
- leftTotal = Math.max(Math.min(leftTotal + scrollAmount, 0), leftMax);
- scroller.animate({ left: leftTotal }, 250);
-
- if (leftTotal === 0) {
- $("#recently-added-page-left").addClass("disabled").blur();
- } else {
- $("#recently-added-page-left").removeClass("disabled");
- }
-
- if (leftTotal === leftMax) {
- $("#recently-added-page-right").addClass("disabled").blur();
- } else {
- $("#recently-added-page-right").removeClass("disabled");
- }
- });
-
$('#recently-added-toggles').on('change', function () {
$('#recently-added-toggles > label').removeClass('active');
selected_filter = $('input[name=recently-added-toggle]:checked', '#recently-added-toggles');
$(selected_filter).closest('label').addClass('active');
recently_added_type = $(selected_filter).val();
- resetScroller();
setLocalStorage('home_stats_recently_added_type', recently_added_type);
recentlyAdded(recently_added_count, recently_added_type);
});
@@ -1026,7 +977,6 @@
$('#recently-added-count').change(function () {
forceMinMax($(this));
recently_added_count = $(this).val();
- resetScroller();
setLocalStorage('home_stats_recently_added_count', recently_added_count);
recentlyAdded(recently_added_count, recently_added_type);
});
@@ -1058,16 +1008,4 @@
});
% endif
-% if _session['user_group'] == 'admin':
-
-% endif
-
\ No newline at end of file
+
diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index 5212d4dd..ead534a1 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -12,8 +12,10 @@ data :: Usable parameters (if not applicable for media type, blank value will be
== Global keys ==
rating_key Returns the unique identifier for the media item.
media_type Returns the type of media. Either 'movie', 'show', 'season', 'episode', 'artist', 'album', or 'track'.
+sub_media_type Returns the subtype of media. Either 'movie', 'show', 'season', 'episode', 'artist', 'album', or 'track'.
art Returns the location of the item's artwork
title Returns the name of the movie, show, episode, artist, album, or track.
+edition_title Returns the edition title of a movie.
duration Returns the standard runtime of the media.
content_rating Returns the age rating for the media.
summary Returns a brief description of the media plot.
@@ -71,7 +73,7 @@ DOCUMENTATION :: END
<%inherit file="base.html"/>
<%def name="headIncludes()">
-
+
@@ -212,8 +214,8 @@ DOCUMENTATION :: END
% if _session['user_group'] == 'admin':
% endif
- % elif data['media_type'] in ('artist', 'album', 'track', 'playlist', 'photo_album', 'photo', 'clip'):
-
+ % elif data['media_type'] in ('artist', 'album', 'track', 'playlist', 'photo_album', 'photo', 'clip') or data['sub_media_type'] in ('artist', 'album', 'track'):
+
@@ -229,6 +231,9 @@ DOCUMENTATION :: END
+ % if data['media_type'] == 'collection' and data['smart']:
+
+ % endif
% if _session['user_group'] == 'admin':
@@ -263,7 +268,7 @@ DOCUMENTATION :: END
${data['title']}
% elif data['media_type'] == 'track':
-
+
T${data['media_index']}
% elif data['media_type'] in ('photo', 'clip'):
@@ -279,14 +284,14 @@ DOCUMENTATION :: END
padding_height = ''
if data['media_type'] == 'movie' or data['live']:
padding_height = 'height: 305px;'
- elif data['media_type'] in ('show', 'season', 'collection'):
- padding_height = 'height: 270px;'
- elif data['media_type'] == 'episode':
- padding_height = 'height: 70px;'
- elif data['media_type'] in ('artist', 'album', 'playlist', 'photo_album', 'photo'):
+ elif data['media_type'] in ('artist', 'album', 'playlist', 'photo_album', 'photo') or data['sub_media_type'] in ('artist', 'album', 'track'):
padding_height = 'height: 150px;'
elif data['media_type'] in ('track', 'clip'):
padding_height = 'height: 180px;'
+ elif data['media_type'] == 'episode':
+ padding_height = 'height: 70px;'
+ elif data['media_type'] in ('show', 'season', 'collection'):
+ padding_height = 'height: 270px;'
%>
% if data['media_type'] in ('movie', 'episode', 'track', 'clip'):
@@ -365,6 +370,11 @@ DOCUMENTATION :: END
Studio ${data['studio']}
% endif
+
+ % if data['media_type'] == 'track' and data['original_title']:
+ Track Artists ${data['original_title']}
+ % endif
+
% if data['media_type'] == 'movie':
Year ${data['year']}
@@ -376,7 +386,7 @@ DOCUMENTATION :: END
Released ${data['year']}
% elif data['media_type'] in ('photo', 'clip'):
Taken ${data['originally_available_at']}
- % elif data['media_type'] == 'collection':
+ % elif data['media_type'] == 'collection' and data['min_year'] and data['max_year']:
Year ${data['min_year']} - ${data['max_year']}
% elif data['year']:
Year ${data['year']}
@@ -387,24 +397,32 @@ DOCUMENTATION :: END
Runtime ${data['duration']}
% endif
+ % if data['edition_title']:
+
+ Edition ${data['edition_title']}
+
+ % endif
% if data['content_rating']:
Rated ${data['content_rating']}
% endif
- % if media_info['channel_identifier']:
- Channel ${media_info['channel_call_sign']} ${media_info['channel_identifier']}
+ % if media_info['channel_vcn']:
+ Channel ${media_info['channel_title'] or (media_info['channel_vcn'] + ' ' + media_info['channel_call_sign'])}
% endif
% if data['tagline']:
-
-
${data['tagline']}
+
% endif
-
-
${data['summary'] | br, n}
+
+
${data['summary'] | br, n}
+
+
@@ -536,8 +554,36 @@ DOCUMENTATION :: END