From a393d1a50ab8a1ffa80f875537d467ca49863d8d Mon Sep 17 00:00:00 2001
From: Tim <timvdwest@gmail.com>
Date: Tue, 4 Aug 2015 18:34:38 +0200
Subject: [PATCH] Add IP modal to info screen. Display notice for minimum
 version of PW database import. Address a bug where a newly added user's watch
 history would be logged as "Local" until next user list refresh.

---
 data/interfaces/default/info.html             |  2 +
 data/interfaces/default/plexwatch_import.html |  3 +
 plexpy/datafactory.py                         | 83 ++++++++++++++++---
 3 files changed, 76 insertions(+), 12 deletions(-)

diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index fbdce9ac..3d5661e0 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -191,6 +191,8 @@ DOCUMENTATION :: END
             </div>
             <div id="info-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="info-modal">
             </div>
+            <div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
+            </div>
         </div>
     </div>
 </div>
diff --git a/data/interfaces/default/plexwatch_import.html b/data/interfaces/default/plexwatch_import.html
index ed58d4e1..1330b2b5 100644
--- a/data/interfaces/default/plexwatch_import.html
+++ b/data/interfaces/default/plexwatch_import.html
@@ -5,6 +5,9 @@
             <h4 class="modal-title">Import PlexWatch Database</h4>
         </div>
         <div class="modal-body" id="modal-text">
+            <p class="help-block">
+                Please ensure your PlexWatch database is at version 0.3.2 or higher.
+            </p>
             <div class="form-group">
                 <label for="db_location">Database Location</label>
                 <div class="row">
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index f2bfb0a3..8dbb78cf 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -308,6 +308,8 @@ class DataFactory(object):
         return None
 
     def get_user_details(self, user=None, user_id=None):
+        from plexpy import plextv
+
         monitor_db = database.MonitorDatabase()
 
         if user:
@@ -361,18 +363,75 @@ class DataFactory(object):
                                 }
             return user_details
         else:
-            # If there is no user data we must return something
-            # Use "Local" user to retain compatibility with PlexWatch database value
-            return {"user_id": None,
-                    "username": 'Local',
-                    "friendly_name": 'Local',
-                    "email": '',
-                    "thumb": '',
-                    "is_home_user": 0,
-                    "is_allow_sync": 0,
-                    "is_restricted": 0,
-                    "do_notify": 0
-                    }
+            logger.warn(u"PlexPy :: Unable to retrieve user from local database. Requesting user list refresh.")
+            # Let's first refresh the user list to make sure the user isn't newly added and not in the db yet
+            if user:
+                # Refresh users
+                plextv.refresh_users()
+                query = 'SELECT user_id, username, friendly_name, email, ' \
+                        'thumb, is_home_user, is_allow_sync, is_restricted, do_notify ' \
+                        'FROM users ' \
+                        'WHERE username = ? ' \
+                        'UNION ALL ' \
+                        'SELECT null, user, null, null, null, null, null, null, null ' \
+                        'FROM session_history ' \
+                        'WHERE user = ? ' \
+                        'GROUP BY user ' \
+                        'LIMIT 1'
+                result = monitor_db.select(query, args=[user, user])
+            elif user_id:
+                # Refresh users
+                plextv.refresh_users()
+                query = 'SELECT user_id, username, friendly_name, email, ' \
+                        'thumb, is_home_user, is_allow_sync, is_restricted, do_notify ' \
+                        'FROM users ' \
+                        'WHERE user_id = ? ' \
+                        'UNION ALL ' \
+                        'SELECT user_id, user, null, null, null, null, null, null, null ' \
+                        'FROM session_history ' \
+                        'WHERE user_id = ? ' \
+                        'GROUP BY user ' \
+                        'LIMIT 1'
+                result = monitor_db.select(query, args=[user_id, user_id])
+            else:
+                result = None
+
+            if result:
+                user_details = {}
+                for item in result:
+                    if not item['friendly_name']:
+                        friendly_name = item['username']
+                    else:
+                        friendly_name = item['friendly_name']
+                    if not item['thumb'] or item['thumb'] == '':
+                        user_thumb = common.DEFAULT_USER_THUMB
+                    else:
+                        user_thumb = item['thumb']
+
+                    user_details = {"user_id": item['user_id'],
+                                    "username": item['username'],
+                                    "friendly_name": friendly_name,
+                                    "email": item['email'],
+                                    "thumb": user_thumb,
+                                    "is_home_user": item['is_home_user'],
+                                    "is_allow_sync": item['is_allow_sync'],
+                                    "is_restricted": item['is_restricted'],
+                                    "do_notify": item['do_notify']
+                                    }
+                return user_details
+            else:
+                # If there is no user data we must return something
+                # Use "Local" user to retain compatibility with PlexWatch database value
+                return {"user_id": None,
+                        "username": 'Local',
+                        "friendly_name": 'Local',
+                        "email": '',
+                        "thumb": '',
+                        "is_home_user": 0,
+                        "is_allow_sync": 0,
+                        "is_restricted": 0,
+                        "do_notify": 0
+                        }
 
     def get_home_stats(self, time_range='30'):
         monitor_db = database.MonitorDatabase()