From 441572ea12f6f6c949e81c43ab0ab786c78b3fc6 Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Tue, 29 Sep 2015 10:11:11 -0700
Subject: [PATCH] Fix "Mystery" platform in stats and activity

---
 data/interfaces/default/current_activity.html | 10 ++++++----
 data/interfaces/default/js/script.js          |  6 +++---
 plexpy/datafactory.py                         |  8 +++++++-
 plexpy/pmsconnect.py                          |  7 +++++++
 plexpy/users.py                               |  8 +++++++-
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html
index 2c98bfea..12bb2f84 100644
--- a/data/interfaces/default/current_activity.html
+++ b/data/interfaces/default/current_activity.html
@@ -106,7 +106,12 @@ DOCUMENTATION :: END
             </div>
             <div id="stream-${a['session_key']}" class="dashboard-activity-info-details-overlay">
                 <div class="dashboard-activity-info-details-content">
-                    <div class="dashboard-activity-info-platform" id="platform-${a['session_key']}">
+                    <div id="platform-${a['session_key']}" title="${a['platform']}">
+                        <script>
+                            $("#platform-${a['session_key']}").html("<div class='dashboard-activity-info-platform-box' style='background-image: url(" + getPlatformImagePath('${a['platform']}') + ");'>");
+                        </script>
+                    </div>
+                    <div class="dashboard-activity-info-platform">
                         <strong>${a['player']}</strong><br />
                         % if a['state'] == 'playing':
                         State &nbsp;<strong>Playing</strong>
@@ -249,9 +254,6 @@ DOCUMENTATION :: END
         </div>
 </div>
 </div>
-<script>
-    $("#platform-${a['session_key']}").prepend("<div class='dashboard-activity-info-platform-box' style='background-image: url(" + getPlatformImagePath('${a['platform']}') + ");'>");
-</script>
 
 % endfor
 <script>
diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js
index 33de6f00..142121b9 100644
--- a/data/interfaces/default/js/script.js
+++ b/data/interfaces/default/js/script.js
@@ -213,11 +213,11 @@ function getPlatformImagePath(platformName) {
         return 'interfaces/default/images/platforms/opera.png';
     } else if (platformName.indexOf("KODI") > -1) {
         return 'interfaces/default/images/platforms/kodi.png';
-    } else if (platformName.indexOf("Mystery 3") > -1) {
+    } else if (platformName.indexOf("Playstation 3") > -1) {
         return 'interfaces/default/images/platforms/playstation.png';
-    } else if (platformName.indexOf("Mystery 4") > -1) {
+    } else if (platformName.indexOf("Playstation 4") > -1) {
         return 'interfaces/default/images/platforms/playstation.png';
-	} else if (platformName.indexOf("Mystery 5") > -1) {
+	} else if (platformName.indexOf("Xbox 360") > -1) {
         return 'interfaces/default/images/platforms/xbox.png';
 	} else if (platformName.indexOf("Windows") > -1) {
 	    return 'interfaces/default/images/platforms/win8.png';
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 421bc85e..7718de11 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -502,11 +502,17 @@ class DataFactory(object):
                     return None
 
                 for item in result:
+                    # Rename Mystery platform names
+                    platform_names = {'Mystery 3': 'Playstation 3',
+                                      'Mystery 4': 'Playstation 4',
+                                      'Mystery 5': 'Xbox 360'}
+                    platform_type = platform_names.get(item[0], item[0])
+
                     row = {'platform': item[0],
                            'total_plays': item[1],
                            'total_duration': item[2],
                            'last_play': item[3],
-                           'platform_type': item[0],
+                           'platform_type': platform_type,
                            'title': '',
                            'thumb': '',
                            'grandparent_thumb': '',
diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py
index 687725b4..bb2da415 100644
--- a/plexpy/pmsconnect.py
+++ b/plexpy/pmsconnect.py
@@ -1070,6 +1070,13 @@ class PmsConnect(object):
         else:
             logger.warn(u"No known stream types found in session list.")
 
+        # Rename Mystery platform names
+        platform_names = {'Mystery 3': 'Playstation 3',
+                          'Mystery 4': 'Playstation 4',
+                          'Mystery 5': 'Xbox 360'}
+        session_output['platform'] = platform_names.get(session_output['platform'], 
+                                                        session_output['platform'])
+
         return session_output
 
     """
diff --git a/plexpy/users.py b/plexpy/users.py
index 26f46abf..d6b32c5b 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -516,8 +516,14 @@ class Users(object):
             return None
 
         for item in result:
+            # Rename Mystery platform names
+            platform_names = {'Mystery 3': 'Playstation 3',
+                              'Mystery 4': 'Playstation 4',
+                              'Mystery 5': 'Xbox 360'}
+            platform_type = platform_names.get(item[2], item[2])
+
             row = {'platform_name': item[0],
-                   'platform_type': item[2],
+                   'platform_type': platform_type,
                    'total_plays': item[1],
                    'result_id': result_id
                    }