From 70478299439724f84f1fe97579803f03831f2f99 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Sun, 29 Oct 2017 11:13:50 -0700
Subject: [PATCH] Add hidden raw stream info

---
 .../default/current_activity_instance.html    |  2 +-
 data/interfaces/default/index.html            | 37 +++++++++++++++++++
 plexpy/webserve.py                            |  7 +++-
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html
index d43890fd..7c6caf61 100644
--- a/data/interfaces/default/current_activity_instance.html
+++ b/data/interfaces/default/current_activity_instance.html
@@ -151,7 +151,7 @@ DOCUMENTATION :: END
                     </ul>
                     <ul class="list-unstyled dashboard-activity-info-list">
                         <li class="dashboard-activity-info-item">
-                            <div class="sub-heading">Stream</div>
+                            <div class="sub-heading"><span class="raw-stream-info-modal" data-toggle="modal" data-target="#raw-stream-info-modal" data-key="${data['session_key']}">Stream</span></div>
                             <div class="sub-value" id="transcode_decision-${data['session_key']}">
                                 % if data['transcode_decision'] == 'transcode':
                                 Transcode
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index 004bed3f..4cd1262a 100644
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -181,6 +181,22 @@
 
 <div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
 </div>
+<div class="modal fade wide" id="raw-stream-info-modal" tabindex="-1" role="dialog" aria-labelledby="raw-stream-info-modal">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                <h4 class="modal-title">Raw Stream Info: <strong><span id="raw-stream-info-title"></span> (<span id="raw-stream-info-user"></span>)</strong></h4>
+            </div>
+            <div class="modal-body">
+                <pre id="raw-stream-info"></pre>
+            </div>
+            <div class="modal-footer">
+                <input type="button" class="btn btn-bright" data-dismiss="modal" value="Close">
+            </div>
+        </div>
+    </div>
+</div>
 
 </%def>
 
@@ -469,6 +485,27 @@
         });
     });
 
+    $('#currentActivity').on('click', '.raw-stream-info-modal', function () {
+        $.ajax({
+            url: 'get_activity',
+            type: 'GET',
+            cache: false,
+            async: true,
+            data: {
+                session_key: $(this).data('key')
+            },
+            error: function (xhr, status, error) {
+                console.log(status + ': ' + error);
+            },
+            complete: function (xhr, status) {
+                var session = $.parseJSON(xhr.responseText);
+                $('#raw-stream-info-title').text(session.full_title);
+                $('#raw-stream-info-user').text(session.friendly_name);
+                $('#raw-stream-info').text(JSON.stringify(session, null, '\t'));
+            }
+        });
+    });
+
     % if _session['user_group'] == 'admin':
     // Terminate session
     $('#currentActivity').on('click', '.dashboard-activity-terminate-session', function (e) {
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 740a7412..0a04e5d6 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -4332,7 +4332,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth()
     @addtoapi()
-    def get_activity(self, **kwargs):
+    def get_activity(self, session_key=None, **kwargs):
         """ Get the current activity on the PMS.
 
             ```
@@ -4345,7 +4345,7 @@ class WebInterface(object):
             Returns:
                 json:
                     {"stream_count": 3,
-                     "session":
+                     "sessions":
                         [{"art": "/library/metadata/1219/art/1462175063",
                           "aspect_ratio": "1.78",
                           "audio_channels": "6",
@@ -4419,6 +4419,9 @@ class WebInterface(object):
                         ip_address = data_factory.get_session_ip(session['session_key'])
                         session['ip_address'] = ip_address
 
+                if session_key:
+                    return next((s for s in result['sessions'] if s['session_key'] == session_key), {})
+
                 return result
             else:
                 logger.warn(u"Unable to retrieve data for get_activity.")