mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-07-13 00:32:58 -07:00
Testing more detailed activity pane
This commit is contained in:
JonnyWong16
parent
3166b91cb7
commit
83c1ca195f
3 changed files with 55 additions and 21 deletions
|
|
@ -779,10 +779,13 @@ a .users-poster-face:hover {
|
|||
color: #fff;
|
||||
font-weight: normal;
|
||||
}
|
||||
.dashboard-activity-info-details-transcode-state {
|
||||
line-height: 22px;
|
||||
}
|
||||
.dashboard-activity-info-platform {
|
||||
width: 100%;
|
||||
height: 50px;
|
||||
margin-bottom: 10px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.dashboard-activity-info-platform-box {
|
||||
float: left;
|
||||
|
|
|
|||
|
|
@ -125,17 +125,21 @@ DOCUMENTATION :: END
|
|||
<strong>${data['player']}</strong><br />
|
||||
<span id="overlay-play-state-${data['session_key']}">
|
||||
% if data['state'] == 'playing':
|
||||
State <strong>Playing</strong>
|
||||
State <strong>Playing</strong> ${'(' + data['quality_profile'] + ')' if data['media_type'] != 'track' else ''}
|
||||
% elif data['state'] == 'paused':
|
||||
State <strong>Paused</strong>
|
||||
State <strong>Paused</strong> ${'(' + data['quality_profile'] + ')' if data['media_type'] != 'track' else ''}
|
||||
% elif data['state'] == 'buffering':
|
||||
State <strong>Buffering</strong>
|
||||
State <strong>Buffering</strong> ${'(' + data['quality_profile'] + ')' if data['media_type'] != 'track' else ''}
|
||||
% endif
|
||||
</span>
|
||||
</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['transcode_hardware'] == '1':
|
||||
Stream <strong>Transcode (HW) (Speed: ${data['transcode_speed']})
|
||||
% else:
|
||||
Stream <strong>Transcode (Speed: ${data['transcode_speed']})
|
||||
% endif
|
||||
% if data['transcode_throttled'] == '1':
|
||||
(Throttled)
|
||||
% endif
|
||||
|
|
@ -148,24 +152,36 @@ DOCUMENTATION :: END
|
|||
<br />
|
||||
% if data['media_type'] in ('movie', 'episode', 'clip'):
|
||||
% if data['video_decision'] == 'transcode':
|
||||
Video <strong>Transcode (${data['transcode_video_codec']}) (${data['transcode_width']}x${data['transcode_height']})</strong>
|
||||
Video <strong>Transcode (${data['video_codec']} ${data['video_resolution'].rstrip('p') + ('p' if data['video_resolution'].lower() != 'sd' else '')} → ${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':
|
||||
Video <strong>Direct Stream (${data['transcode_video_codec']}) (${data['width']}x${data['height']})</strong>
|
||||
Video <strong>Direct Stream (${data['video_codec']} ${data['video_resolution'].rstrip('p') + ('p' if data['video_resolution'].lower() != 'sd' else '')} → ${data['stream_video_codec']} ${data['stream_video_resolution'].rstrip('p') + ('p' if data['stream_video_resolution'].lower() != 'sd' else '')})</strong>
|
||||
% else:
|
||||
Video <strong>Direct Play (${data['video_codec']}) (${data['width']}x${data['height']})</strong>
|
||||
Video <strong>Direct Play (${data['video_codec']} ${data['video_resolution'].rstrip('p') + ('p' if data['video_resolution'].lower() != 'sd' else '')})</strong>
|
||||
% endif
|
||||
<br />
|
||||
% endif
|
||||
% if data['media_type'] in ('movie', 'episode', 'clip', 'track'):
|
||||
% if data['audio_decision'] == 'transcode':
|
||||
Audio <strong>Transcode (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong>
|
||||
Audio <strong>Transcode (${data['audio_codec']} ${data['audio_channels']}ch → ${data['stream_audio_codec']} ${data['stream_audio_channels']}ch)</strong>
|
||||
% elif data['audio_decision'] == 'copy':
|
||||
Audio <strong>Direct Stream (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong>
|
||||
Audio <strong>Direct Stream (${data['audio_codec']} ${data['audio_channels']}ch → ${data['stream_audio_codec']} ${data['stream_audio_channels']}ch)</strong>
|
||||
% else:
|
||||
Audio <strong>Direct Play (${data['audio_codec']}) (${data['audio_channels']}ch)</strong>
|
||||
Audio <strong>Direct Play (${data['audio_codec']} ${data['audio_channels']}ch)</strong>
|
||||
% endif
|
||||
<br />
|
||||
% endif
|
||||
</span>
|
||||
% if data['media_type'] in ('movie', 'episode', 'clip') and data['subtitles'] == '1':
|
||||
% if data['subtitle_decision'] == 'transcode':
|
||||
Subtitle <strong>Transcode (${data['subtitle_codec']} → ${data['stream_subtitle_codec']})</strong>
|
||||
% elif data['subtitle_decision'] == 'burn':
|
||||
Subtitle <strong>Burn</strong>
|
||||
% else:
|
||||
Subtitle <strong>Direct Play (${data['subtitle_codec']})</strong>
|
||||
% endif
|
||||
% elif data['media_type'] != 'track':
|
||||
Subtitle <strong>None</strong>
|
||||
% endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
% if data['media_type'] != 'photo':
|
||||
|
|
|
|||
|
|
@ -178,7 +178,8 @@
|
|||
var overlay_state = 'State <strong>Unknown</strong>';
|
||||
var state_icon = '<i class="fa fa-fw fa-question-circle"></i> ';
|
||||
}
|
||||
$('#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);
|
||||
|
||||
% if config['pms_use_bif']:
|
||||
|
|
@ -196,30 +197,44 @@
|
|||
var ts = '';
|
||||
if (s.video_decision == 'transcode' || s.audio_decision == 'transcode') {
|
||||
var throttled = (s.throttled == '1') ? ' (Throttled)' : '';
|
||||
ts += 'Stream <strong>Transcode (Speed: ' + s.transcode_speed + ')' + throttled + '</strong><br>';
|
||||
var hw = (s.transcode_hardware == '1') ? ' (HW)' : '';
|
||||
ts += 'Stream <strong>Transcode' + hw + ' (Speed: ' + s.transcode_speed + ')' + throttled + '</strong><br>';
|
||||
} else if (s.video_decision == 'copy' || s.audio_decision == 'copy') {
|
||||
ts += 'Stream <strong>Direct Stream</strong><br>';
|
||||
} else {
|
||||
ts += 'Stream <strong>Direct Play</strong><br>';
|
||||
}
|
||||
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') {
|
||||
ts += 'Video <strong>Transcode (' + s.transcode_video_codec + ') (' + s.transcode_width + 'x' + s.transcode_height + ')</strong><br>';
|
||||
ts += 'Video <strong>Transcode (' + s.video_codec + ' ' + v_res + ' → ' + s.stream_video_codec + ' ' + sv_res + ')</strong><br>';
|
||||
} else if (s.video_decision == 'copy') {
|
||||
ts += 'Video <strong>Direct Stream (' + s.transcode_video_codec + ') (' + s.width + 'x' + s.height + ')</strong><br>';
|
||||
ts += 'Video <strong>Direct Stream (' + s.video_codec + ' ' + v_res + ' → ' + s.stream_video_codec + ' ' + sv_res + ')</strong><br>';
|
||||
} else {
|
||||
ts += 'Video <strong>Direct Play (' + s.video_codec + ') (' + s.width + 'x' + s.height + ')</strong><br>';
|
||||
ts += 'Video <strong>Direct Play (' + s.video_codec + ' ' + v_res + ')</strong><br>';
|
||||
}
|
||||
}
|
||||
if (s.audio_decision != '') {
|
||||
if (s.audio_decision == 'transcode') {
|
||||
ts += 'Audio <strong>Transcode (' + s.transcode_audio_codec + ') (' + s.transcode_audio_channels + 'ch)</strong>';
|
||||
ts += 'Audio <strong>Transcode (' + s.audio_codec + ' ' + s.audio_channels + 'ch → ' + s.stream_audio_codec + ' ' + s.stream_audio_channels + 'ch)</strong><br>';
|
||||
} else if (s.audio_decision == 'copy') {
|
||||
ts += 'Audio <strong>Direct Stream (' + s.transcode_audio_codec + ') (' + s.transcode_audio_channels + 'ch)</strong>';
|
||||
ts += 'Audio <strong>Direct Stream (' + s.audio_codec + ' ' + s.audio_channels + 'ch → ' + s.stream_audio_codec + ' ' + s.stream_audio_channels + 'ch)</strong><br>';
|
||||
} else {
|
||||
ts += 'Audio <strong>Direct Play (' + s.audio_codec + ') (' + s.audio_channels + 'ch)</strong>';
|
||||
ts += 'Audio <strong>Direct Play (' + s.audio_codec + ' ' + s.audio_channels + 'ch)</strong><br>';
|
||||
}
|
||||
}
|
||||
if (s.subtitles) {
|
||||
if (s.subtitle_decision == 'transcode') {
|
||||
ts += 'Subtitle <strong>Transcode (' + s.subtitle_codec + ' → ' + s.stream_subtitle_codec + ')</strong>';
|
||||
} else if (s.audio_decision == 'burn') {
|
||||
ts += 'Subtitle <strong>Burn</strong>';
|
||||
} else {
|
||||
ts += 'Subtitle <strong>Direct Play (' + s.subtitle_codec + ')</strong>';
|
||||
}
|
||||
} else if (s.media_type != 'track') {
|
||||
ts += 'Subtitle <strong>None</strong>';
|
||||
}
|
||||
$('#transcode-state-' + key).html(ts);
|
||||
|
||||
// update the stream progress times
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue