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

Add transcode decision count to activity header

Browse source
This commit is contained in:
JonnyWong16 2016-05-04 12:54:14 -07:00
parent 3da8cc1e7f
commit f001e19728
2 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
data/interfaces/default/current_activity_header.html
View file

@ -15,12 +15,23 @@ DOCUMENTATION :: END
</%doc>
% if data != None:
% if data == '0':
<%
s = '('
if data['direct_play']:
s += str(data['direct_play']) + ' direct play' + ('s' if data['direct_play'] > 1 else '') + ', '
if data['direct_stream']:
s += str(data['direct_stream']) + ' direct stream' + ('s' if data['direct_stream'] > 1 else '') + ', '
if data['transcode']:
s += str(data['transcode']) + ' transcode' + ('s' if data['transcode'] > 1 else '') + ', '
s = s.rstrip(', ')
s += ')'
%>
% if data['stream_count'] == '0':
<h3>Activity</h3>
% elif data == '1':
<h3>Activity &nbsp;&nbsp;<small>${data} stream</small></h3>
% elif data['stream_count'] == '1':
<h3>Activity &nbsp;&nbsp;<small>${data['stream_count']} stream ${s}</small></h3>
% else:
<h3>Activity &nbsp;&nbsp;<small>${data} streams</small></h3>
<h3>Activity &nbsp;&nbsp;<small>${data['stream_count']} streams ${s}</small></h3>
% endif
% else:
<h3>Activity</h3>

13
plexpy/webserve.py
View file

@ -211,7 +211,18 @@ class WebInterface(object):
return serve_template(templatename="current_activity_header.html", data=None)
if result:
return serve_template(templatename="current_activity_header.html", data=result['stream_count'])
data = {'stream_count': result['stream_count']}
data['direct_play'] = \
sum(1 for s in result['sessions']
if s['video_decision'] == 'direct play' and s['audio_decision'] == 'direct play')
data['direct_stream'] = \
sum(1 for s in result['sessions']
if s['video_decision'] == 'copy' and s['audio_decision'] == 'copy')
data['transcode'] = \
sum(1 for s in result['sessions']
if s['video_decision'] == 'transcode' or s['audio_decision'] == 'transcode')
return serve_template(templatename="current_activity_header.html", data=data)
else:
logger.warn(u"Unable to retrieve data for get_current_activity_header.")
return serve_template(templatename="current_activity_header.html", data=None)