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

Improve calculation for transcode progress bar

Browse source
This commit is contained in:
JonnyWong16 2022-02-13 11:59:06 -08:00
parent cfd1bf445f
commit 6d84d1b4c9
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,7 @@ DOCUMENTATION :: END
% if session is not None: % if session is not None:
<% <%
from collections import defaultdict from collections import defaultdict
from plexpy.helpers import cast_to_int, page, short_season from plexpy.helpers import cast_to_int, get_percent, page, short_season
from plexpy.common import VIDEO_RESOLUTION_OVERRIDES, AUDIO_CODEC_OVERRIDES, EXTRA_TYPES from plexpy.common import VIDEO_RESOLUTION_OVERRIDES, AUDIO_CODEC_OVERRIDES, EXTRA_TYPES
import plexpy import plexpy
%> %>
@ -392,7 +392,8 @@ DOCUMENTATION :: END
% if data['live']: % if data['live']:
<div id="progress-bar-${sk}" class="progress-bar" style="width: 100%" data-state="live" data-toggle="tooltip" title="Stream Progress Live">Live</div> <div id="progress-bar-${sk}" class="progress-bar" style="width: 100%" data-state="live" data-toggle="tooltip" title="Stream Progress Live">Live</div>
% else: % else:
<div id="buffer-bar-${sk}" class="buffer-bar" style="width: ${data['transcode_progress']}%" data-toggle="tooltip" title="Transcoder Progress ${data['transcode_progress']}%">${data['transcode_progress']}%</div> <% transcode_progress = get_percent(data['transcode_max_offset_available'] * 1000, data['duration']) or data['transcode_progress'] %>
<div id="buffer-bar-${sk}" class="buffer-bar" style="width: ${transcode_progress}%" data-toggle="tooltip" title="Transcoder Progress ${transcode_progress}%">${transcode_progress}%</div>
<div id="progress-bar-${sk}" class="progress-bar" style="width: ${data['progress_percent']}%" data-last_view_offset="${data['view_offset']}" data-view_offset="${data['view_offset']}" data-stream_duration="${data['stream_duration']}" data-state="${data['state']}" data-toggle="tooltip" title="Stream Progress ${data['progress_percent']}%">${data['progress_percent']}%</div> <div id="progress-bar-${sk}" class="progress-bar" style="width: ${data['progress_percent']}%" data-last_view_offset="${data['view_offset']}" data-view_offset="${data['view_offset']}" data-stream_duration="${data['stream_duration']}" data-state="${data['state']}" data-toggle="tooltip" title="Stream Progress ${data['progress_percent']}%">${data['progress_percent']}%</div>
% endif % endif
</div> </div>

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

@ -590,8 +590,10 @@
} }
// Update the progress bars // Update the progress bars
$('#buffer-bar-' + key).css({width: parseInt(s.transcode_progress) + '%'}).html(s.transcode_progress + '%') var duration = parseInt(s.duration);
.attr('data-original-title', 'Transcoder Progress ' + s.transcode_progress + '%'); 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) { if (s.live !== 1) {
var progress_bar = $('#progress-bar-' + key); var progress_bar = $('#progress-bar-' + key);
progress_bar.data('state', s.state); progress_bar.data('state', s.state);

6
plexpy/pmsconnect.py
View file

@ -1734,6 +1734,8 @@ class PmsConnect(object):
transcode_progress = helpers.get_xml_attr(transcode_info, 'progress') transcode_progress = helpers.get_xml_attr(transcode_info, 'progress')
transcode_speed = helpers.get_xml_attr(transcode_info, 'speed') transcode_speed = helpers.get_xml_attr(transcode_info, 'speed')
transcode_min_offset = helpers.get_xml_attr(transcode_info, 'minOffsetAvailable')
transcode_max_offset = helpers.get_xml_attr(transcode_info, 'maxOffsetAvailable')
transcode_details = {'transcode_key': helpers.get_xml_attr(transcode_info, 'key'), transcode_details = {'transcode_key': helpers.get_xml_attr(transcode_info, 'key'),
'transcode_throttled': int(helpers.get_xml_attr(transcode_info, 'throttled') == '1'), 'transcode_throttled': int(helpers.get_xml_attr(transcode_info, 'throttled') == '1'),
@ -1746,6 +1748,8 @@ class PmsConnect(object):
'transcode_height': helpers.get_xml_attr(transcode_info, 'height'), # Blank but keep backwards compatibility 'transcode_height': helpers.get_xml_attr(transcode_info, 'height'), # Blank but keep backwards compatibility
'transcode_container': helpers.get_xml_attr(transcode_info, 'container'), 'transcode_container': helpers.get_xml_attr(transcode_info, 'container'),
'transcode_protocol': helpers.get_xml_attr(transcode_info, 'protocol'), 'transcode_protocol': helpers.get_xml_attr(transcode_info, 'protocol'),
'transcode_min_offset_available': int(round(helpers.cast_to_float(transcode_min_offset), 0)),
'transcode_max_offset_available': int(round(helpers.cast_to_float(transcode_max_offset), 0)),
'transcode_hw_requested': int(helpers.get_xml_attr(transcode_info, 'transcodeHwRequested') == '1'), 'transcode_hw_requested': int(helpers.get_xml_attr(transcode_info, 'transcodeHwRequested') == '1'),
'transcode_hw_decode': helpers.get_xml_attr(transcode_info, 'transcodeHwDecoding'), 'transcode_hw_decode': helpers.get_xml_attr(transcode_info, 'transcodeHwDecoding'),
'transcode_hw_decode_title': helpers.get_xml_attr(transcode_info, 'transcodeHwDecodingTitle'), 'transcode_hw_decode_title': helpers.get_xml_attr(transcode_info, 'transcodeHwDecodingTitle'),
@ -1771,6 +1775,8 @@ class PmsConnect(object):
'transcode_height': '', 'transcode_height': '',
'transcode_container': '', 'transcode_container': '',
'transcode_protocol': '', 'transcode_protocol': '',
'transcode_min_offset_available': 0,
'transcode_max_offset_available': 0,
'transcode_hw_requested': 0, 'transcode_hw_requested': 0,
'transcode_hw_decode': '', 'transcode_hw_decode': '',
'transcode_hw_decode_title': '', 'transcode_hw_decode_title': '',