diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index 1e13e989..2f051d02 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -292,7 +292,9 @@ var sc_dp = current_activity.stream_count_direct_play, sc_ds = current_activity.stream_count_direct_stream, sc_tc = current_activity.stream_count_transcode, - total_bw = current_activity.total_bandwidth; + total_bw = current_activity.total_bandwidth, + lan_bw = current_activity.lan_bandwidth, + wan_bw = current_activity.wan_bandwidth; var streams_header = stream_count + ' stream' + (stream_count > 1 ? 's' : '') + ' ('; if (sc_dp) { streams_header += sc_dp + ' direct play' + (sc_dp > 1 ? 's' : '') + ', '; @@ -306,7 +308,14 @@ streams_header = streams_header.replace(/, $/, '') + ')'; $('#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 > 1000) ? ((total_bw / 1000).toFixed(1) + ' Mbps') : (total_bw + ' kbps')) + ' ('; + if (lan_bw) { + bandwidth_header += 'LAN: ' + ((lan_bw > 1000) ? ((lan_bw / 1000).toFixed(1) + ' Mbps') : (lan_bw + ' kbps')) + ', '; + } + if (wan_bw) { + bandwidth_header += 'WAN: ' + ((wan_bw > 1000) ? ((wan_bw / 1000).toFixed(1) + ' Mbps') : (wan_bw + ' kbps')) + ', '; + } + bandwidth_header = bandwidth_header.replace(/, $/, '') + ')'; $('#currentActivityHeader-bandwidth').text(bandwidth_header); $('#currentActivityHeader').show(); diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 87ce87d5..bdde4323 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -4440,7 +4440,9 @@ class WebInterface(object): counts = {'stream_count_direct_play': 0, 'stream_count_direct_stream': 0, 'stream_count_transcode': 0, - 'total_bandwidth': 0} + 'total_bandwidth': 0, + 'lan_bandwidth': 0, + 'wan_bandwidth': 0} for s in result['sessions']: if s['transcode_decision'] == 'transcode': @@ -4451,6 +4453,10 @@ class WebInterface(object): counts['stream_count_direct_play'] += 1 counts['total_bandwidth'] += helpers.cast_to_int(s['bandwidth']) + if s['location'] == 'lan': + counts['lan_bandwidth'] += helpers.cast_to_int(s['bandwidth']) + elif s['location'] == 'wan': + counts['wan_bandwidth'] += helpers.cast_to_int(s['bandwidth']) result.update(counts)