github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-16 02:02:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix refresh of burn subtitle info

Browse source
This commit is contained in:
JonnyWong16 2017-03-01 20:52:30 -08:00
parent 83c1ca195f
commit c4fc831968
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -152,31 +152,31 @@ DOCUMENTATION :: END
<br />
% if data['media_type'] in ('movie', 'episode', 'clip'):
% if data['video_decision'] == 'transcode':
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>
Video &nbsp;<strong>Transcode (${data['video_codec'].upper()} ${data['video_resolution'].rstrip('p') + ('p' if data['video_resolution'].lower() != 'sd' else '')} &rarr; ${data['stream_video_codec'].upper()} ${data['stream_video_resolution'].rstrip('p') + ('p' if data['stream_video_resolution'].lower() != 'sd' else '')})</strong>
% elif data['video_decision'] == 'copy':
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>
Video &nbsp;<strong>Direct Stream (${data['video_codec'].upper()} ${data['video_resolution'].rstrip('p') + ('p' if data['video_resolution'].lower() != 'sd' else '')} &rarr; ${data['stream_video_codec'].upper()} ${data['stream_video_resolution'].rstrip('p') + ('p' if data['stream_video_resolution'].lower() != 'sd' else '')})</strong>
% else:
Video &nbsp;<strong>Direct Play (${data['video_codec']} ${data['video_resolution'].rstrip('p') + ('p' if data['video_resolution'].lower() != 'sd' else '')})</strong>
Video &nbsp;<strong>Direct Play (${data['video_codec'].upper()} ${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 &nbsp;<strong>Transcode (${data['audio_codec']} ${data['audio_channels']}ch &rarr; ${data['stream_audio_codec']} ${data['stream_audio_channels']}ch)</strong>
Audio &nbsp;<strong>Transcode (${data['audio_codec'].upper()} ${data['audio_channels']}ch &rarr; ${data['stream_audio_codec'].upper()} ${data['stream_audio_channels']}ch)</strong>
% elif data['audio_decision'] == 'copy':
Audio &nbsp;<strong>Direct Stream (${data['audio_codec']} ${data['audio_channels']}ch &rarr; ${data['stream_audio_codec']} ${data['stream_audio_channels']}ch)</strong>
Audio &nbsp;<strong>Direct Stream (${data['audio_codec'].upper()} ${data['audio_channels']}ch &rarr; ${data['stream_audio_codec'].upper()} ${data['stream_audio_channels']}ch)</strong>
% else:
Audio &nbsp;<strong>Direct Play (${data['audio_codec']} ${data['audio_channels']}ch)</strong>
Audio &nbsp;<strong>Direct Play (${data['audio_codec'].upper()} ${data['audio_channels']}ch)</strong>
% endif
<br />
% endif
% 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>
Subtitle &nbsp;<strong>Transcode (${data['subtitle_codec'].upper()} &rarr; ${data['stream_subtitle_codec'].upper()})</strong>
% elif data['subtitle_decision'] == 'burn':
Subtitle &nbsp;<strong>Burn</strong>
Subtitle &nbsp;<strong>Burn (${data['subtitle_codec'].upper()})</strong>
% else:
Subtitle &nbsp;<strong>Direct Play (${data['subtitle_codec']})</strong>
Subtitle &nbsp;<strong>Direct Play (${data['subtitle_codec'].upper()})</strong>
% endif
% elif data['media_type'] != 'track':
Subtitle &nbsp;<strong>None</strong>

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

@ -208,29 +208,29 @@
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 &nbsp;<strong>Transcode (' + s.video_codec + ' ' + v_res + ' &rarr; ' + s.stream_video_codec + ' ' + sv_res + ')</strong><br>';
ts += 'Video &nbsp;<strong>Transcode (' + s.video_codec.toUpperCase() + ' ' + v_res + ' &rarr; ' + s.stream_video_codec.toUpperCase() + ' ' + sv_res + ')</strong><br>';
} else if (s.video_decision == 'copy') {
ts += 'Video &nbsp;<strong>Direct Stream (' + s.video_codec + ' ' + v_res + ' &rarr; ' + s.stream_video_codec + ' ' + sv_res + ')</strong><br>';
ts += 'Video &nbsp;<strong>Direct Stream (' + s.video_codec.toUpperCase() + ' ' + v_res + ' &rarr; ' + s.stream_video_codec.toUpperCase() + ' ' + sv_res + ')</strong><br>';
} else {
ts += 'Video &nbsp;<strong>Direct Play (' + s.video_codec + ' ' + v_res + ')</strong><br>';
ts += 'Video &nbsp;<strong>Direct Play (' + s.video_codec.toUpperCase() + ' ' + v_res + ')</strong><br>';
}
}
if (s.audio_decision != '') {
if (s.audio_decision == 'transcode') {
ts += 'Audio &nbsp;<strong>Transcode (' + s.audio_codec + ' ' + s.audio_channels + 'ch &rarr; ' + s.stream_audio_codec + ' ' + s.stream_audio_channels + 'ch)</strong><br>';
ts += 'Audio &nbsp;<strong>Transcode (' + s.audio_codec.toUpperCase() + ' ' + s.audio_channels + 'ch &rarr; ' + s.stream_audio_codec.toUpperCase() + ' ' + s.stream_audio_channels + 'ch)</strong><br>';
} else if (s.audio_decision == 'copy') {
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>';
ts += 'Audio &nbsp;<strong>Direct Stream (' + s.audio_codec.toUpperCase() + ' ' + s.audio_channels + 'ch &rarr; ' + s.stream_audio_codec.toUpperCase() + ' ' + s.stream_audio_channels + 'ch)</strong><br>';
} else {
ts += 'Audio &nbsp;<strong>Direct Play (' + s.audio_codec + ' ' + s.audio_channels + 'ch)</strong><br>';
ts += 'Audio &nbsp;<strong>Direct Play (' + s.audio_codec.toUpperCase() + ' ' + 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>';
ts += 'Subtitle &nbsp;<strong>Transcode (' + s.subtitle_codec.toUpperCase() + ' &rarr; ' + s.stream_subtitle_codec.toUpperCase() + ')</strong>';
} else if (s.subtitle_decision == 'burn') {
ts += 'Subtitle &nbsp;<strong>Burn (' + s.subtitle_codec.toUpperCase() + ')</strong>';
} else {
ts += 'Subtitle &nbsp;<strong>Direct Play (' + s.subtitle_codec + ')</strong>';
ts += 'Subtitle &nbsp;<strong>Direct Play (' + s.subtitle_codec.toUpperCase() + ')</strong>';
}
} else if (s.media_type != 'track') {
ts += 'Subtitle &nbsp;<strong>None</strong>';