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

Show Gbps bandwidth

Browse source
This commit is contained in:
JonnyWong16 2020-02-17 12:00:00 -08:00
parent fa0b547b32
commit f3d42e7b53
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -330,7 +330,9 @@ DOCUMENTATION :: END
% if data['media_type'] != 'photo' and data['bandwidth'] != 'Unknown': % if data['media_type'] != 'photo' and data['bandwidth'] != 'Unknown':
<% <%
bw = helpers.cast_to_int(data['bandwidth']) bw = helpers.cast_to_int(data['bandwidth'])
if bw > 1000: if bw > 1000000:
bw = str(round(bw / 1000000.0, 1)) + ' Gbps'
elif bw > 1000:
bw = str(round(bw / 1000.0, 1)) + ' Mbps' bw = str(round(bw / 1000.0, 1)) + ' Mbps'
else: else:
bw = str(bw) + ' kbps' bw = str(bw) + ' kbps'

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

@ -334,13 +334,13 @@
streams_header = streams_header.replace(/, $/, '') + ')'; streams_header = streams_header.replace(/, $/, '') + ')';
$('#currentActivityHeader-streams').text(streams_header); $('#currentActivityHeader-streams').text(streams_header);
var bandwidth_header = ((total_bw > 1000) ? ((total_bw / 1000).toFixed(1) + ' Mbps') : (total_bw + ' kbps')); var bandwidth_header = ((total_bw > 1000000) ? ((total_bw / 1000000).toFixed(1) + ' Gbps') : ((total_bw > 1000) ? ((total_bw / 1000).toFixed(1) + ' Mbps') : (total_bw + ' kbps')));
var lan_wan_bandwidth_header = ''; var lan_wan_bandwidth_header = '';
if (lan_bw) { if (lan_bw) {
lan_wan_bandwidth_header += 'LAN: ' + ((lan_bw > 1000) ? ((lan_bw / 1000).toFixed(1) + ' Mbps') : (lan_bw + ' kbps')) + ', '; lan_wan_bandwidth_header += 'LAN: ' + ((lan_bw > 1000000) ? ((lan_bw / 1000000).toFixed(1) + ' Gbps') : ((lan_bw > 1000) ? ((lan_bw / 1000).toFixed(1) + ' Mbps') : (lan_bw + ' kbps'))); + ', ';
} }
if (wan_bw) { if (wan_bw) {
lan_wan_bandwidth_header += 'WAN: ' + ((wan_bw > 1000) ? ((wan_bw / 1000).toFixed(1) + ' Mbps') : (wan_bw + ' kbps')) + ', '; lan_wan_bandwidth_header += 'WAN: ' + ((wan_bw > 1000000) ? ((wan_bw / 1000000).toFixed(1) + ' Gbps') : ((wan_bw > 1000) ? ((wan_bw / 1000).toFixed(1) + ' Mbps') : (wan_bw + ' kbps'))); + ', ';
} }
if (lan_wan_bandwidth_header) { if (lan_wan_bandwidth_header) {
bandwidth_header += ' (' + lan_wan_bandwidth_header.replace(/, $/, '') + ')'; bandwidth_header += ' (' + lan_wan_bandwidth_header.replace(/, $/, '') + ')';
@ -507,7 +507,9 @@
if (s.media_type !== 'photo' && s.quality_profile !== 'Unknown') { if (s.media_type !== 'photo' && s.quality_profile !== 'Unknown') {
var br = parseInt(s.stream_bitrate) || ''; var br = parseInt(s.stream_bitrate) || '';
if (br) { if (br) {
if (br > 1000) { if (br > 1000000) {
br = ' (' + (br / 1000000).toFixed(1) + ' Gbps)';
} else if (br > 1000) {
br = ' (' + (br / 1000).toFixed(1) + ' Mbps)'; br = ' (' + (br / 1000).toFixed(1) + ' Mbps)';
} else { } else {
br = ' (' + br + ' kbps)'; br = ' (' + br + ' kbps)';