From fdff9d7454c4fbf8030da6994f55f1bc52bd32b3 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Nov 2017 21:13:03 -0800
Subject: [PATCH] Default to 'Unknown' for any missing activity values

---
 .../interfaces/default/current_activity_instance.html |  4 +++-
 data/interfaces/default/index.html                    | 11 +++++++++--
 plexpy/webserve.py                                    |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html
index 1ec245ee..6d31565a 100644
--- a/data/interfaces/default/current_activity_instance.html
+++ b/data/interfaces/default/current_activity_instance.html
@@ -59,12 +59,14 @@ indexes                     Returns true if the media has media indexes and are
 DOCUMENTATION :: END
 </%doc>
 
-% if data is not None:
+% if session is not None:
 <%
+    from collections import defaultdict
     from urllib import quote
     from plexpy import helpers
     import plexpy
 %>
+<% data = defaultdict(lambda: 'Unknown', **session) %>
 <% sk = data['session_key'] %>
 <div class="dashboard-activity-instance" id="activity-instance-${sk}" data-key="${sk}" data-id="${data['session_id']}"
      data-rating_key="${data['rating_key']}" data-parent_rating_key="${data['parent_rating_key']}" data-grandparent_rating_key="${data['grandparent_rating_key']}">
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index 9f3a96b4..cd27fa1e 100644
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -229,6 +229,12 @@
 </script>
 % if 'current_activity' in config['home_sections']:
 <script>
+    var defaultHandler = {
+        get: function(target, name) {
+            return target.hasOwnProperty(name) ? target[name] : 'Unknown';
+        }
+    };
+
     function getCurrentActivity() {
         $.ajax({
             url: 'get_activity',
@@ -279,14 +285,15 @@
                     header_count += ')';
                     $('#currentActivityHeader').text(header_count);
 
-                    sessions.forEach(function (s) {
+                    sessions.forEach(function (session) {
+                        var s = new Proxy(session, defaultHandler);
                         var key = s.session_key;
                         var session_id = s.session_id;
                         var instance = $('#activity-instance-' + key);
 
                         // Create a new instance if it doesn't exist
                         if (!(instance.length)) {
-                            getActivityInstance(s);
+                            getActivityInstance(session);
                             return;
                         }
 
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index d9489ed4..19e65206 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -246,7 +246,7 @@ class WebInterface(object):
     @requireAuth()
     def get_current_activity_instance(self, **kwargs):
 
-        return serve_template(templatename="current_activity_instance.html", data=kwargs)
+        return serve_template(templatename="current_activity_instance.html", session=kwargs)
 
     @cherrypy.expose
     @requireAuth()