From f0e14b6de5f37d40ef66ad1d6faba6656d56f39c Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Sun, 13 Aug 2017 09:09:39 -0700
Subject: [PATCH] Round bitrate/bandwidth to Mbps

---
 .../default/current_activity_instance.html    | 21 +++++++++++++++----
 data/interfaces/default/index.html            | 17 ++++++++++++++-
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html
index c69373e0..bf1fce7a 100644
--- a/data/interfaces/default/current_activity_instance.html
+++ b/data/interfaces/default/current_activity_instance.html
@@ -62,6 +62,7 @@ DOCUMENTATION :: END
 % if data is not None:
 <%
     from urllib import quote
+    from plexpy import helpers
     import plexpy
 %>
 <div class="dashboard-instance" id="instance-${data['session_key']}" data-key="${data['session_key']}" data-id="${data['session_id']}">
@@ -204,14 +205,26 @@ DOCUMENTATION :: END
                 <div class="dashboard-activity-poster-info-bar">
                     <div class="dashboard-activity-poster-info-ip-address">
                         Quality: 
-                        <span id="stream-quality-${data['session_key']}">
-                            ${data['quality_profile']}
-                        </span>
+                        <%
+                            br = helpers.cast_to_int(data['stream_bitrate']) or "Unknown"
+                            br_units = "kbps"
+                            if br != "Unknown" and br > 1000:
+                                br = round(br / 1000, 1)
+                                br_units = "Mbps"
+                            %>
+                        <span id="stream-quality-${data['session_key']}">${data['quality_profile']}</span> (<span id="stream-quality-bitrate-${data['session_key']}">${br}</span> <span id="stream-quality-bitrate-units-${data['session_key']}">${br_units}</span>)
                         <br />
                         % if data['ip_address']:
                         IP: ${data['ip_address']} 
                         % if data['media_type'] != 'photo' and 'location' in data:
-                        (${data['location'].upper()} - <span id="stream-bandwidth-${data['session_key']}">${data['bandwidth']}</span> kbps)
+                        <%
+                            bw = helpers.cast_to_int(data['bandwidth']) or "Unknown"
+                            bw_units = "kbps"
+                            if bw != "Unknown" and bw > 1000:
+                                bw = round(bw / 1000, 1)
+                                bw_units = "Mbps"
+                        %>
+                        (${data['location'].upper()} - <span id="stream-bandwidth-${data['session_key']}">${bw}</span> <span id="stream-bandwidth-units-${data['session_key']}">${bw_units}</span>)
                         % endif
                         % else:
                         IP: N/A
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index 28bb23ba..ab67ec5f 100644
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -355,8 +355,23 @@
                         $('#transcode-state-' + key).html(ts);
 
                         // update the stream quality profile and bandwidth
+                        var br = parseInt(s.stream_bitrate) || 'Unknown';
+                        var br_units = 'kbps'
+                        if (br != "Unknown" && br > 1000) {
+                            br = (br / 1000).toFixed(1);
+                            br_units = 'Mbps';
+                        }
                         $('#stream-quality-' + key).html(s.quality_profile);
-                        $('#stream-bandwidth-' + key).html(s.bandwidth);
+                        $('#stream-quality-bitrate-' + key).html(br);
+                        $('#stream-quality-bitrate-units-' + key).html(br_units);
+                        var bw = parseInt(s.bandwidth) || 'Unknown';
+                        var bw_units = 'kbps'
+                        if (bw != "Unknown" && bw > 1000) {
+                            bw = (bw / 1000).toFixed(1);
+                            bw_units = 'Mbps';
+                        }
+                        $('#stream-bandwidth-' + key).html(bw);
+                        $('#stream-bandwidth-units-' + key).html(bw_units);
 
                         // update the stream progress times
                         $('#stream-eta-' + key).html(moment().add(parseInt(s.duration) - parseInt(s.view_offset), 'milliseconds').format(time_format));