From ecd0a199f1b825a0d6328fde9feeddaedaaf3831 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Fri, 8 Dec 2017 22:05:44 -0800 Subject: [PATCH] Add mobile device last seen --- .../default/mobile_devices_table.html | 9 +++++ data/interfaces/default/settings.html | 10 +++-- plexpy/__init__.py | 12 +++++- plexpy/api2.py | 37 ++++++++++--------- plexpy/mobile_app.py | 15 ++++++++ 5 files changed, 61 insertions(+), 22 deletions(-) diff --git a/data/interfaces/default/mobile_devices_table.html b/data/interfaces/default/mobile_devices_table.html index bbdc8988..6ccec57b 100644 --- a/data/interfaces/default/mobile_devices_table.html +++ b/data/interfaces/default/mobile_devices_table.html @@ -17,6 +17,15 @@ DOCUMENTATION :: END ${device['friendly_name'] or device['device_name']}  (${device['id']}) + + % if device['last_seen']: + + % else: + never + % endif + diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 94c67df3..0406afa9 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -1076,7 +1076,7 @@

Register a new device, or configure an existing device by clicking the settings icon on the right.

The API must be enabled under Access Control to use the app.

-
+
Loading registered devices...

@@ -1429,26 +1429,28 @@

- Scan the QR code below with the PlexPy Android app to automatically register it with the server. + Scan the QR code below with the PlexPy Android app to automatically register it with the server + or manually enter the into into the app settings. Make sure the PlexPy Address below is correct. 


                 
                 
-                
                 
                 
                 
+                
+                
             

             

                 
diff --git a/plexpy/__init__.py b/plexpy/__init__.py
index d339399f..27340070 100644
--- a/plexpy/__init__.py
+++ b/plexpy/__init__.py
@@ -540,7 +540,8 @@ def dbcheck():
     # mobile_devices table :: This table keeps record of devices linked with the mobile app
     c_db.execute(
         'CREATE TABLE IF NOT EXISTS mobile_devices (id INTEGER PRIMARY KEY AUTOINCREMENT, '
-        'device_id TEXT NOT NULL UNIQUE, device_token TEXT, device_name TEXT, friendly_name TEXT)'
+        'device_id TEXT NOT NULL UNIQUE, device_token TEXT, device_name TEXT, friendly_name TEXT, '
+        'last_seen INTEGER)'
     )
 
     # tvmaze_lookup table :: This table keeps record of the TVmaze lookups
@@ -1084,6 +1085,15 @@ def dbcheck():
         logger.warn(u"Failed to recreate mobile_devices table.")
         pass
 
+    # Upgrade mobile_devices table from earlier versions
+    try:
+        c_db.execute('SELECT last_seen FROM mobile_devices')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table mobile_devices.")
+        c_db.execute(
+            'ALTER TABLE mobile_devices ADD COLUMN last_seen INTEGER'
+        )
+
     # Upgrade notifiers table from earlier versions
     try:
         c_db.execute('SELECT custom_conditions FROM notifiers')
diff --git a/plexpy/api2.py b/plexpy/api2.py
index b6088143..2b0537a8 100644
--- a/plexpy/api2.py
+++ b/plexpy/api2.py
@@ -89,11 +89,6 @@ class API2:
         elif 'apikey' not in kwargs:
             self._api_msg = 'Parameter apikey is required'
 
-        elif (kwargs.get('apikey', '') != plexpy.CONFIG.API_KEY and 
-              kwargs.get('apikey', '') != mobile_app.TEMP_DEVICE_TOKEN and 
-              not mobile_app.get_mobile_device_by_token(kwargs.get('apikey', ''))):
-            self._api_msg = 'Invalid apikey'
-
         elif 'cmd' not in kwargs:
             self._api_msg = 'Parameter cmd is required. Possible commands are: %s' % ', '.join(self._api_valid_methods)
 
@@ -108,18 +103,26 @@ class API2:
         # Allow override for the api.
         self._api_out_type = kwargs.pop('out_type', 'json')
 
-        if ((self._api_apikey == plexpy.CONFIG.API_KEY or 
-             self._api_apikey == mobile_app.TEMP_DEVICE_TOKEN or 
-             mobile_app.get_mobile_device_by_token(self._api_apikey)) and 
-            plexpy.CONFIG.API_ENABLED and self._api_cmd in self._api_valid_methods):
-            self._api_authenticated = True
-            self._api_msg = None
-            self._api_kwargs = kwargs
-        elif self._api_cmd in ('get_apikey', 'docs', 'docs_md') and plexpy.CONFIG.API_ENABLED:
-            self._api_authenticated = True
-            # Remove the old error msg
-            self._api_msg = None
-            self._api_kwargs = kwargs
+        if plexpy.CONFIG.API_ENABLED and not self._api_msg:
+            if self._api_apikey in (plexpy.CONFIG.API_KEY, mobile_app.TEMP_DEVICE_TOKEN):
+                self._api_authenticated = True
+
+            elif mobile_app.get_mobile_device_by_token(self._api_apikey):
+                mobile_app.set_last_seen(self._api_apikey)
+                self._api_authenticated = True
+
+            else:
+                self._api_msg = 'Invalid apikey'
+            
+            if self._api_authenticated and self._api_cmd in self._api_valid_methods:
+                self._api_msg = None
+                self._api_kwargs = kwargs
+
+            elif not self._api_authenticated and self._api_cmd in ('get_apikey', 'docs', 'docs_md'):
+                self._api_authenticated = True
+                # Remove the old error msg
+                self._api_msg = None
+                self._api_kwargs = kwargs
 
         if self._api_msg:
             logger.api_debug(u'PlexPy APIv2 :: %s.' % self._api_msg)
diff --git a/plexpy/mobile_app.py b/plexpy/mobile_app.py
index 319c12cd..812672b9 100644
--- a/plexpy/mobile_app.py
+++ b/plexpy/mobile_app.py
@@ -13,6 +13,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with PlexPy.  If not, see .
 
+import time
+
 import plexpy
 import database
 import helpers
@@ -121,6 +123,19 @@ def delete_mobile_device(mobile_device_id=None):
         return False
 
 
+def set_last_seen(device_token=None):
+    db = database.MonitorDatabase()
+
+    last_seen = int(time.time())
+
+    try:
+        result = db.action('UPDATE mobile_devices SET last_seen = ? WHERE device_token = ?',
+                           args=[last_seen, device_token])
+    except Exception as e:
+        logger.warn(u"PlexPy MobileApp :: Failed to set last_seen time for device: %s." % e)
+        return
+
+
 def blacklist_logger():
     devices = get_mobile_devices()