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

Testing more detailed activity pane

Browse source
This commit is contained in:
JonnyWong16 2017-02-28 22:27:07 -08:00
parent 3166b91cb7
commit 83c1ca195f
3 changed files with 55 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
data/interfaces/default/css/plexpy.css
View file

@ -779,10 +779,13 @@ a .users-poster-face:hover {
color: #fff; color: #fff;
font-weight: normal; font-weight: normal;
} }
.dashboard-activity-info-details-transcode-state {
line-height: 22px;
}
.dashboard-activity-info-platform { .dashboard-activity-info-platform {
width: 100%; width: 100%;
height: 50px; height: 50px;
margin-bottom: 10px; margin-bottom: 5px;
} }
.dashboard-activity-info-platform-box { .dashboard-activity-info-platform-box {
float: left; float: left;

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

@ -125,17 +125,21 @@ DOCUMENTATION :: END
<strong>${data['player']}</strong><br /> <strong>${data['player']}</strong><br />
<span id="overlay-play-state-${data['session_key']}"> <span id="overlay-play-state-${data['session_key']}">
% if data['state'] == 'playing': % if data['state'] == 'playing':
State &nbsp;<strong>Playing</strong> State &nbsp;<strong>Playing</strong> ${'(' + data['quality_profile'] + ')' if data['media_type'] != 'track' else ''}
% elif data['state'] == 'paused': % elif data['state'] == 'paused':
State &nbsp;<strong>Paused</strong> State &nbsp;<strong>Paused</strong> ${'(' + data['quality_profile'] + ')' if data['media_type'] != 'track' else ''}
% elif data['state'] == 'buffering': % elif data['state'] == 'buffering':
State &nbsp;<strong>Buffering</strong> State &nbsp;<strong>Buffering</strong> ${'(' + data['quality_profile'] + ')' if data['media_type'] != 'track' else ''}
% endif % endif
</span> </span>
</div> </div>
<span id="transcode-state-${data['session_key']}"> <div class="dashboard-activity-info-details-transcode-state" id="transcode-state-${data['session_key']}">
% if data['video_decision'] == 'transcode' or data['audio_decision'] == 'transcode': % if data['video_decision'] == 'transcode' or data['audio_decision'] == 'transcode':
Stream &nbsp;<strong>Transcode (Speed: ${data['transcode_speed']}) % if data['transcode_hardware'] == '1':
Stream &nbsp;<strong>Transcode (HW) (Speed: ${data['transcode_speed']})
% else:
Stream &nbsp;<strong>Transcode (Speed: ${data['transcode_speed']})
% endif
% if data['transcode_throttled'] == '1': % if data['transcode_throttled'] == '1':
(Throttled) (Throttled)
% endif % endif
@ -148,24 +152,36 @@ DOCUMENTATION :: END
<br /> <br />
% if data['media_type'] in ('movie', 'episode', 'clip'): % if data['media_type'] in ('movie', 'episode', 'clip'):
% if data['video_decision'] == 'transcode': % if data['video_decision'] == 'transcode':
Video &nbsp;<strong>Transcode (${data['transcode_video_codec']}) (${data['transcode_width']}x${data['transcode_height']})</strong> Video &nbsp;<strong>Transcode (${data['video_codec']} ${data['video_resolution'].rstrip('p') + ('p' if data['video_resolution'].lower() != 'sd' else '')} &rarr; ${data['stream_video_codec']} ${data['stream_video_resolution'].rstrip('p') + ('p' if data['stream_video_resolution'].lower() != 'sd' else '')})</strong>
% elif data['video_decision'] == 'copy': % elif data['video_decision'] == 'copy':
Video &nbsp;<strong>Direct Stream (${data['transcode_video_codec']}) (${data['width']}x${data['height']})</strong> Video &nbsp;<strong>Direct Stream (${data['video_codec']} ${data['video_resolution'].rstrip('p') + ('p' if data['video_resolution'].lower() != 'sd' else '')} &rarr; ${data['stream_video_codec']} ${data['stream_video_resolution'].rstrip('p') + ('p' if data['stream_video_resolution'].lower() != 'sd' else '')})</strong>
% else: % else:
Video &nbsp;<strong>Direct Play (${data['video_codec']}) (${data['width']}x${data['height']})</strong> Video &nbsp;<strong>Direct Play (${data['video_codec']} ${data['video_resolution'].rstrip('p') + ('p' if data['video_resolution'].lower() != 'sd' else '')})</strong>
% endif % endif
<br /> <br />
% endif % endif
% if data['media_type'] in ('movie', 'episode', 'clip', 'track'): % if data['media_type'] in ('movie', 'episode', 'clip', 'track'):
% if data['audio_decision'] == 'transcode': % if data['audio_decision'] == 'transcode':
Audio &nbsp;<strong>Transcode (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong> Audio &nbsp;<strong>Transcode (${data['audio_codec']} ${data['audio_channels']}ch &rarr; ${data['stream_audio_codec']} ${data['stream_audio_channels']}ch)</strong>
% elif data['audio_decision'] == 'copy': % elif data['audio_decision'] == 'copy':
Audio &nbsp;<strong>Direct Stream (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong> Audio &nbsp;<strong>Direct Stream (${data['audio_codec']} ${data['audio_channels']}ch &rarr; ${data['stream_audio_codec']} ${data['stream_audio_channels']}ch)</strong>
% else: % else:
Audio &nbsp;<strong>Direct Play (${data['audio_codec']}) (${data['audio_channels']}ch)</strong> Audio &nbsp;<strong>Direct Play (${data['audio_codec']} ${data['audio_channels']}ch)</strong>
% endif % endif
<br />
% endif % endif
</span> % if data['media_type'] in ('movie', 'episode', 'clip') and data['subtitles'] == '1':
% if data['subtitle_decision'] == 'transcode':
Subtitle &nbsp;<strong>Transcode (${data['subtitle_codec']} &rarr; ${data['stream_subtitle_codec']})</strong>
% elif data['subtitle_decision'] == 'burn':
Subtitle &nbsp;<strong>Burn</strong>
% else:
Subtitle &nbsp;<strong>Direct Play (${data['subtitle_codec']})</strong>
% endif
% elif data['media_type'] != 'track':
Subtitle &nbsp;<strong>None</strong>
% endif
</div>
</div> </div>
</div> </div>
% if data['media_type'] != 'photo': % if data['media_type'] != 'photo':

31
data/interfaces/default/index.html
View file

@ -178,7 +178,8 @@
var overlay_state = 'State &nbsp;<strong>Unknown</strong>'; var overlay_state = 'State &nbsp;<strong>Unknown</strong>';
var state_icon = '<i class="fa fa-fw fa-question-circle"></i>&nbsp;'; var state_icon = '<i class="fa fa-fw fa-question-circle"></i>&nbsp;';
} }
$('#overlay-play-state-' + key).html(overlay_state); var q = (s.media_type != 'track') ? ' (' + s.quality_profile + ')' : '';
$('#overlay-play-state-' + key).html(overlay_state + q);
$('#play-state-' + key).html(state_icon); $('#play-state-' + key).html(state_icon);
% if config['pms_use_bif']: % if config['pms_use_bif']:
@ -196,30 +197,44 @@
var ts = ''; var ts = '';
if (s.video_decision == 'transcode' || s.audio_decision == 'transcode') { if (s.video_decision == 'transcode' || s.audio_decision == 'transcode') {
var throttled = (s.throttled == '1') ? ' (Throttled)' : ''; var throttled = (s.throttled == '1') ? ' (Throttled)' : '';
ts += 'Stream &nbsp;<strong>Transcode (Speed: ' + s.transcode_speed + ')' + throttled + '</strong><br>'; var hw = (s.transcode_hardware == '1') ? ' (HW)' : '';
ts += 'Stream &nbsp;<strong>Transcode' + hw + ' (Speed: ' + s.transcode_speed + ')' + throttled + '</strong><br>';
} else if (s.video_decision == 'copy' || s.audio_decision == 'copy') { } else if (s.video_decision == 'copy' || s.audio_decision == 'copy') {
ts += 'Stream &nbsp;<strong>Direct Stream</strong><br>'; ts += 'Stream &nbsp;<strong>Direct Stream</strong><br>';
} else { } else {
ts += 'Stream &nbsp;<strong>Direct Play</strong><br>'; ts += 'Stream &nbsp;<strong>Direct Play</strong><br>';
} }
if (s.video_decision != '' && s.media_type != 'photo') { if (s.video_decision != '' && s.media_type != 'photo') {
var v_res = s.video_resolution.replace(/p$/, '') + ((s.video_resolution.toLowerCase() == 'sd') ? '' : 'p');
var sv_res = s.stream_video_resolution.replace(/p$/, '') + ((s.stream_video_resolution.toLowerCase() == 'sd') ? '' : 'p');
if (s.video_decision == 'transcode') { if (s.video_decision == 'transcode') {
ts += 'Video &nbsp;<strong>Transcode (' + s.transcode_video_codec + ') (' + s.transcode_width + 'x' + s.transcode_height + ')</strong><br>'; ts += 'Video &nbsp;<strong>Transcode (' + s.video_codec + ' ' + v_res + ' &rarr; ' + s.stream_video_codec + ' ' + sv_res + ')</strong><br>';
} else if (s.video_decision == 'copy') { } else if (s.video_decision == 'copy') {
ts += 'Video &nbsp;<strong>Direct Stream (' + s.transcode_video_codec + ') (' + s.width + 'x' + s.height + ')</strong><br>'; ts += 'Video &nbsp;<strong>Direct Stream (' + s.video_codec + ' ' + v_res + ' &rarr; ' + s.stream_video_codec + ' ' + sv_res + ')</strong><br>';
} else { } else {
ts += 'Video &nbsp;<strong>Direct Play (' + s.video_codec + ') (' + s.width + 'x' + s.height + ')</strong><br>'; ts += 'Video &nbsp;<strong>Direct Play (' + s.video_codec + ' ' + v_res + ')</strong><br>';
} }
} }
if (s.audio_decision != '') { if (s.audio_decision != '') {
if (s.audio_decision == 'transcode') { if (s.audio_decision == 'transcode') {
ts += 'Audio &nbsp;<strong>Transcode (' + s.transcode_audio_codec + ') (' + s.transcode_audio_channels + 'ch)</strong>'; ts += 'Audio &nbsp;<strong>Transcode (' + s.audio_codec + ' ' + s.audio_channels + 'ch &rarr; ' + s.stream_audio_codec + ' ' + s.stream_audio_channels + 'ch)</strong><br>';
} else if (s.audio_decision == 'copy') { } else if (s.audio_decision == 'copy') {
ts += 'Audio &nbsp;<strong>Direct Stream (' + s.transcode_audio_codec + ') (' + s.transcode_audio_channels + 'ch)</strong>'; ts += 'Audio &nbsp;<strong>Direct Stream (' + s.audio_codec + ' ' + s.audio_channels + 'ch &rarr; ' + s.stream_audio_codec + ' ' + s.stream_audio_channels + 'ch)</strong><br>';
} else { } else {
ts += 'Audio &nbsp;<strong>Direct Play (' + s.audio_codec + ') (' + s.audio_channels + 'ch)</strong>'; ts += 'Audio &nbsp;<strong>Direct Play (' + s.audio_codec + ' ' + s.audio_channels + 'ch)</strong><br>';
} }
} }
if (s.subtitles) {
if (s.subtitle_decision == 'transcode') {
ts += 'Subtitle &nbsp;<strong>Transcode (' + s.subtitle_codec + ' &rarr; ' + s.stream_subtitle_codec + ')</strong>';
} else if (s.audio_decision == 'burn') {
ts += 'Subtitle &nbsp;<strong>Burn</strong>';
} else {
ts += 'Subtitle &nbsp;<strong>Direct Play (' + s.subtitle_codec + ')</strong>';
}
} else if (s.media_type != 'track') {
ts += 'Subtitle &nbsp;<strong>None</strong>';
}
$('#transcode-state-' + key).html(ts); $('#transcode-state-' + key).html(ts);
// update the stream progress times // update the stream progress times