From d1f1763919a7d2d4fc27895a1237cbd5a540417e Mon Sep 17 00:00:00 2001
From: Mitch <mitchelvanhamburg@posteo.net>
Date: Sun, 5 Apr 2020 20:03:57 +0200
Subject: [PATCH 01/26] Allow custom time_queries for get_watch_stats

---
 API.md              |  2 ++
 plexpy/libraries.py |  8 ++++++--
 plexpy/users.py     |  8 ++++++--
 plexpy/webserve.py  | 11 +++++++----
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/API.md b/API.md
index 8164bd97..8cb7ed60 100644
--- a/API.md
+++ b/API.md
@@ -1066,6 +1066,7 @@ Required parameters:
 
 Optional parameters:
     grouping (int):         0 or 1
+    time_queries (str):     "1, 7, 30, 0"
 
 Returns:
     json:
@@ -2378,6 +2379,7 @@ Required parameters:
 
 Optional parameters:
     grouping (int):         0 or 1
+    time_queries (str):     "1, 7, 30, 0"
 
 Returns:
     json:
diff --git a/plexpy/libraries.py b/plexpy/libraries.py
index 14fa7d22..e2e85595 100644
--- a/plexpy/libraries.py
+++ b/plexpy/libraries.py
@@ -812,16 +812,20 @@ class Libraries(object):
                 # If there is no library data we must return something
                 return default_return
 
-    def get_watch_time_stats(self, section_id=None, grouping=None):
+    def get_watch_time_stats(self, section_id=None, grouping=None, time_queries=None):
         if not session.allow_session_library(section_id):
             return []
 
         if grouping is None:
             grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
 
+        if time_queries is not None:
+            time_queries = map(int, time_queries.split(","))
+        else:
+            time_queries = [1, 7, 30, 0]
+
         monitor_db = database.MonitorDatabase()
 
-        time_queries = [1, 7, 30, 0]
         library_watch_time_stats = []
 
         group_by = 'session_history.reference_id' if grouping else 'session_history.id'
diff --git a/plexpy/users.py b/plexpy/users.py
index 35e19201..e8a63392 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -434,16 +434,20 @@ class Users(object):
                 # Use "Local" user to retain compatibility with PlexWatch database value
                 return default_return
 
-    def get_watch_time_stats(self, user_id=None, grouping=None):
+    def get_watch_time_stats(self, user_id=None, grouping=None, time_queries=None):
         if not session.allow_session_user(user_id):
             return []
 
         if grouping is None:
             grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
 
+        if time_queries is not None:
+            time_queries = map(int, time_queries.split(","))
+        else:
+            time_queries = [1, 7, 30, 0]
+
         monitor_db = database.MonitorDatabase()
 
-        time_queries = [1, 7, 30, 0]
         user_watch_time_stats = []
 
         group_by = 'reference_id' if grouping else 'id'
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index e38c509e..9b9b6729 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -810,7 +810,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth(member_of("admin"))
     @addtoapi()
-    def get_library_watch_time_stats(self, section_id=None, grouping=None, **kwargs):
+    def get_library_watch_time_stats(self, section_id=None, grouping=None, time_queries=None, **kwargs):
         """ Get a library's watch time statistics.
 
             ```
@@ -819,6 +819,7 @@ class WebInterface(object):
 
             Optional parameters:
                 grouping (int):         0 or 1
+                time_queries (str):     "1, 7, 30, 0"
 
             Returns:
                 json:
@@ -845,7 +846,8 @@ class WebInterface(object):
 
         if section_id:
             library_data = libraries.Libraries()
-            result = library_data.get_watch_time_stats(section_id=section_id, grouping=grouping)
+            result = library_data.get_watch_time_stats(section_id=section_id, grouping=grouping,
+                                                       time_queries=time_queries)
             if result:
                 return result
             else:
@@ -1427,7 +1429,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth(member_of("admin"))
     @addtoapi()
-    def get_user_watch_time_stats(self, user_id=None, grouping=None, **kwargs):
+    def get_user_watch_time_stats(self, user_id=None, grouping=None, time_queries=None, **kwargs):
         """ Get a user's watch time statistics.
 
             ```
@@ -1436,6 +1438,7 @@ class WebInterface(object):
 
             Optional parameters:
                 grouping (int):         0 or 1
+                time_queries (str):     "1, 7, 30, 0"
 
             Returns:
                 json:
@@ -1462,7 +1465,7 @@ class WebInterface(object):
 
         if user_id:
             user_data = users.Users()
-            result = user_data.get_watch_time_stats(user_id=user_id, grouping=grouping)
+            result = user_data.get_watch_time_stats(user_id=user_id, grouping=grouping, time_queries=time_queries)
             if result:
                 return result
             else:

From ae9df92d287e13566c817d61a7f7ab54c35b3502 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Wed, 8 Apr 2020 22:55:56 -0700
Subject: [PATCH 02/26] Divide file size by 2^10 but display SI units

---
 data/interfaces/default/js/script.js | 3 ++-
 plexpy/helpers.py                    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js
index 089488c9..b03bb3ee 100644
--- a/data/interfaces/default/js/script.js
+++ b/data/interfaces/default/js/script.js
@@ -462,7 +462,8 @@ $('*').on('click', '.refresh_pms_image', function (e) {
 
 // Taken from http://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable#answer-14919494
 function humanFileSize(bytes, si = true) {
-    var thresh = si ? 1000 : 1024;
+    //var thresh = si ? 1000 : 1024;
+    var thresh = 1024;  // Always divide by 2^10 but display SI units
     if (Math.abs(bytes) < thresh) {
         return bytes + ' B';
     }
diff --git a/plexpy/helpers.py b/plexpy/helpers.py
index 4ed03e45..a2adb592 100644
--- a/plexpy/helpers.py
+++ b/plexpy/helpers.py
@@ -1034,7 +1034,8 @@ def humanFileSize(bytes, si=True):
     else:
         return bytes
 
-    thresh = 1000 if si else 1024
+    #thresh = 1000 if si else 1024
+    thresh = 1024  # Always divide by 2^10 but display SI units
     if bytes < thresh:
         return str(bytes) + ' B'
 

From 1d08069162158e45431985e3e5836839f3730716 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Thu, 9 Apr 2020 18:30:46 -0700
Subject: [PATCH 03/26] Rename time_queries to query_days

---
 API.md              |  4 ++--
 plexpy/libraries.py | 10 +++++-----
 plexpy/users.py     | 10 +++++-----
 plexpy/webserve.py  | 12 ++++++------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/API.md b/API.md
index 8cb7ed60..ae147c46 100644
--- a/API.md
+++ b/API.md
@@ -1066,7 +1066,7 @@ Required parameters:
 
 Optional parameters:
     grouping (int):         0 or 1
-    time_queries (str):     "1, 7, 30, 0"
+    query_days (str):       Comma separated days, e.g. "1, 7, 30, 0"
 
 Returns:
     json:
@@ -2379,7 +2379,7 @@ Required parameters:
 
 Optional parameters:
     grouping (int):         0 or 1
-    time_queries (str):     "1, 7, 30, 0"
+    query_days (str):       Comma separated days, e.g. "1, 7, 30, 0"
 
 Returns:
     json:
diff --git a/plexpy/libraries.py b/plexpy/libraries.py
index e2e85595..9f5136d9 100644
--- a/plexpy/libraries.py
+++ b/plexpy/libraries.py
@@ -812,17 +812,17 @@ class Libraries(object):
                 # If there is no library data we must return something
                 return default_return
 
-    def get_watch_time_stats(self, section_id=None, grouping=None, time_queries=None):
+    def get_watch_time_stats(self, section_id=None, grouping=None, query_days=None):
         if not session.allow_session_library(section_id):
             return []
 
         if grouping is None:
             grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
 
-        if time_queries is not None:
-            time_queries = map(int, time_queries.split(","))
+        if query_days is not None:
+            query_days = map(int, query_days.split(","))
         else:
-            time_queries = [1, 7, 30, 0]
+            query_days = [1, 7, 30, 0]
 
         monitor_db = database.MonitorDatabase()
 
@@ -830,7 +830,7 @@ class Libraries(object):
 
         group_by = 'session_history.reference_id' if grouping else 'session_history.id'
 
-        for days in time_queries:
+        for days in query_days:
             try:
                 if days > 0:
                     if str(section_id).isdigit():
diff --git a/plexpy/users.py b/plexpy/users.py
index e8a63392..0a5f7621 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -434,17 +434,17 @@ class Users(object):
                 # Use "Local" user to retain compatibility with PlexWatch database value
                 return default_return
 
-    def get_watch_time_stats(self, user_id=None, grouping=None, time_queries=None):
+    def get_watch_time_stats(self, user_id=None, grouping=None, query_days=None):
         if not session.allow_session_user(user_id):
             return []
 
         if grouping is None:
             grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
 
-        if time_queries is not None:
-            time_queries = map(int, time_queries.split(","))
+        if query_days is not None:
+            query_days = map(int, query_days.split(","))
         else:
-            time_queries = [1, 7, 30, 0]
+            query_days = [1, 7, 30, 0]
 
         monitor_db = database.MonitorDatabase()
 
@@ -452,7 +452,7 @@ class Users(object):
 
         group_by = 'reference_id' if grouping else 'id'
 
-        for days in time_queries:
+        for days in query_days:
             try:
                 if days > 0:
                     if str(user_id).isdigit():
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 6145dfe9..a8e87aa4 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -812,7 +812,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth(member_of("admin"))
     @addtoapi()
-    def get_library_watch_time_stats(self, section_id=None, grouping=None, time_queries=None, **kwargs):
+    def get_library_watch_time_stats(self, section_id=None, grouping=None, query_days=None, **kwargs):
         """ Get a library's watch time statistics.
 
             ```
@@ -821,7 +821,7 @@ class WebInterface(object):
 
             Optional parameters:
                 grouping (int):         0 or 1
-                time_queries (str):     "1, 7, 30, 0"
+                query_days (str):       Comma separated days, e.g. "1, 7, 30, 0"
 
             Returns:
                 json:
@@ -849,7 +849,7 @@ class WebInterface(object):
         if section_id:
             library_data = libraries.Libraries()
             result = library_data.get_watch_time_stats(section_id=section_id, grouping=grouping,
-                                                       time_queries=time_queries)
+                                                       query_days=query_days)
             if result:
                 return result
             else:
@@ -1433,7 +1433,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth(member_of("admin"))
     @addtoapi()
-    def get_user_watch_time_stats(self, user_id=None, grouping=None, time_queries=None, **kwargs):
+    def get_user_watch_time_stats(self, user_id=None, grouping=None, query_days=None, **kwargs):
         """ Get a user's watch time statistics.
 
             ```
@@ -1442,7 +1442,7 @@ class WebInterface(object):
 
             Optional parameters:
                 grouping (int):         0 or 1
-                time_queries (str):     "1, 7, 30, 0"
+                query_days (str):       Comma separated days, e.g. "1, 7, 30, 0"
 
             Returns:
                 json:
@@ -1469,7 +1469,7 @@ class WebInterface(object):
 
         if user_id:
             user_data = users.Users()
-            result = user_data.get_watch_time_stats(user_id=user_id, grouping=grouping, time_queries=time_queries)
+            result = user_data.get_watch_time_stats(user_id=user_id, grouping=grouping, query_days=query_days)
             if result:
                 return result
             else:

From ca2b4085c9f7e94f6538e7ceda64b164677decc1 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Thu, 9 Apr 2020 18:33:02 -0700
Subject: [PATCH 04/26] Fix if bad query_days passed to API

---
 plexpy/libraries.py | 4 ++--
 plexpy/users.py     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plexpy/libraries.py b/plexpy/libraries.py
index 9f5136d9..91c27a33 100644
--- a/plexpy/libraries.py
+++ b/plexpy/libraries.py
@@ -819,8 +819,8 @@ class Libraries(object):
         if grouping is None:
             grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
 
-        if query_days is not None:
-            query_days = map(int, query_days.split(","))
+        if query_days and query_days is not None:
+            query_days = map(helpers.cast_to_int, query_days.split(','))
         else:
             query_days = [1, 7, 30, 0]
 
diff --git a/plexpy/users.py b/plexpy/users.py
index 0a5f7621..e4b36cd5 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -441,8 +441,8 @@ class Users(object):
         if grouping is None:
             grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
 
-        if query_days is not None:
-            query_days = map(int, query_days.split(","))
+        if query_days and query_days is not None:
+            query_days = map(helpers.cast_to_int, query_days.split(','))
         else:
             query_days = [1, 7, 30, 0]
 

From ce289995ff54efdeddb29dda885b5d8082baa033 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Thu, 9 Apr 2020 23:15:08 -0700
Subject: [PATCH 05/26] Add user is_active to database

---
 plexpy/__init__.py | 19 ++++++++++++++-----
 plexpy/plextv.py   |  2 ++
 plexpy/users.py    |  7 +++++++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/plexpy/__init__.py b/plexpy/__init__.py
index 60bffef3..24b58f8e 100644
--- a/plexpy/__init__.py
+++ b/plexpy/__init__.py
@@ -663,11 +663,11 @@ def dbcheck():
     c_db.execute(
         'CREATE TABLE IF NOT EXISTS users (id INTEGER PRIMARY KEY AUTOINCREMENT, '
         'user_id INTEGER DEFAULT NULL UNIQUE, username TEXT NOT NULL, friendly_name TEXT, '
-        'thumb TEXT, custom_avatar_url TEXT, email TEXT, is_admin INTEGER DEFAULT 0, is_home_user INTEGER DEFAULT NULL, '
-        'is_allow_sync INTEGER DEFAULT NULL, is_restricted INTEGER DEFAULT NULL, do_notify INTEGER DEFAULT 1, '
-        'keep_history INTEGER DEFAULT 1, deleted_user INTEGER DEFAULT 0, allow_guest INTEGER DEFAULT 0, '
-        'user_token TEXT, server_token TEXT, shared_libraries TEXT, filter_all TEXT, filter_movies TEXT, filter_tv TEXT, '
-        'filter_music TEXT, filter_photos TEXT)'
+        'thumb TEXT, custom_avatar_url TEXT, email TEXT, is_active INTEGER DEFAULT 1, is_admin INTEGER DEFAULT 0, '
+        'is_home_user INTEGER DEFAULT NULL, is_allow_sync INTEGER DEFAULT NULL, is_restricted INTEGER DEFAULT NULL, '
+        'do_notify INTEGER DEFAULT 1, keep_history INTEGER DEFAULT 1, deleted_user INTEGER DEFAULT 0, '
+        'allow_guest INTEGER DEFAULT 0, user_token TEXT, server_token TEXT, shared_libraries TEXT, '
+        'filter_all TEXT, filter_movies TEXT, filter_tv TEXT, filter_music TEXT, filter_photos TEXT)'
     )
 
     # library_sections table :: This table keeps record of the servers library sections
@@ -1733,6 +1733,15 @@ def dbcheck():
             'ALTER TABLE users ADD COLUMN is_admin INTEGER DEFAULT 0'
         )
 
+    # Upgrade users table from earlier versions
+    try:
+        c_db.execute('SELECT is_active FROM users')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table users.")
+        c_db.execute(
+            'ALTER TABLE users ADD COLUMN is_active INTEGER DEFAULT 1'
+        )
+
     # Upgrade notify_log table from earlier versions
     try:
         c_db.execute('SELECT poster_url FROM notify_log')
diff --git a/plexpy/plextv.py b/plexpy/plextv.py
index 1405a937..e389cf07 100644
--- a/plexpy/plextv.py
+++ b/plexpy/plextv.py
@@ -396,6 +396,7 @@ class PlexTV(object):
                            "username": helpers.get_xml_attr(a, 'username'),
                            "thumb": helpers.get_xml_attr(a, 'thumb'),
                            "email": helpers.get_xml_attr(a, 'email'),
+                           "is_active": 1,
                            "is_admin": 1,
                            "is_home_user": helpers.get_xml_attr(a, 'home'),
                            "is_allow_sync": 1,
@@ -423,6 +424,7 @@ class PlexTV(object):
                       "username": helpers.get_xml_attr(a, 'title'),
                       "thumb": helpers.get_xml_attr(a, 'thumb'),
                       "email": helpers.get_xml_attr(a, 'email'),
+                      "is_active": 1,
                       "is_admin": 0,
                       "is_home_user": helpers.get_xml_attr(a, 'home'),
                       "is_allow_sync": helpers.get_xml_attr(a, 'allowSync'),
diff --git a/plexpy/users.py b/plexpy/users.py
index e4b36cd5..5c78e0c0 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -34,7 +34,11 @@ def refresh_users():
     if result:
         monitor_db = database.MonitorDatabase()
 
+        # Keep track of user_id to update is_active status
+        user_ids = [0]  # Local user always considered active
+
         for item in result:
+            user_ids.append(helpers.cast_to_int(item['user_id']))
 
             if item.get('shared_libraries'):
                 item['shared_libraries'] = ';'.join(item['shared_libraries'])
@@ -58,6 +62,9 @@ def refresh_users():
 
             monitor_db.upsert('users', item, keys_dict)
 
+        query = 'UPDATE users SET is_active = 0 WHERE user_id NOT IN ({})'.format(', '.join(['?'] * len(user_ids)))
+        monitor_db.action(query=query, args=user_ids)
+
         logger.info(u"Tautulli Users :: Users list refreshed.")
         return True
     else:

From f366304c50fe2283b3b73338b559346a1659229b Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 00:02:30 -0700
Subject: [PATCH 06/26] Show user active status on Users table

---
 data/interfaces/default/css/tautulli.css   | 18 +++++++++++++++---
 data/interfaces/default/js/tables/users.js |  6 ++++--
 data/interfaces/default/user.html          | 10 +++++++++-
 plexpy/users.py                            | 20 ++++++++++++++------
 4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/data/interfaces/default/css/tautulli.css b/data/interfaces/default/css/tautulli.css
index a3865497..59182e37 100644
--- a/data/interfaces/default/css/tautulli.css
+++ b/data/interfaces/default/css/tautulli.css
@@ -711,7 +711,6 @@ fieldset[disabled] .form-control {
     box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
 }
 .users-poster-face {
-    overflow: hidden;
     float: left;
     background-size: cover;
     background-position: center;
@@ -3119,6 +3118,20 @@ div.dataTables_info {
     font-weight: bold;
     border-radius: 2px;
 }
+.inactive-library-tooltip,
+.inactive-user-tooltip {
+    display: inline-block;
+    position: relative;
+    width: 100%;
+    height: 100%;
+}
+.inactive-library-tooltip i.fa,
+.inactive-user-tooltip i.fa {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    text-shadow: 0 0 2px rgba(0,0,0,.5);
+}
 .history-thumbnail-popover {
     z-index: 2000;
     padding: 0;
@@ -3808,9 +3821,8 @@ a:hover .overlay-refresh-image:hover {
 }
 
 .svg-icon {
-    padding: 10px;
+    background-size: calc(100% - 20px) calc(100% - 20px) !important;
     background-origin: content-box !important;
-    background-size: contain !important;
     background-repeat: no-repeat !important;
     background-position: center !important;
 }
diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js
index fdbc0449..58918d46 100644
--- a/data/interfaces/default/js/tables/users.js
+++ b/data/interfaces/default/js/tables/users.js
@@ -59,10 +59,12 @@ users_list_table_options = {
             "targets": [1],
             "data": "user_thumb",
             "createdCell": function (td, cellData, rowData, row, col) {
+                var inactive = '';
+                if (!rowData['is_active']) { inactive = '<span class="inactive-user-tooltip" data-toggle="tooltip" title="User not on Plex server"><i class="fa fa-exclamation-triangle"></i></span>'; }
                 if (cellData === '') {
-                    $(td).html('<a href="' + page('user', rowData['user_id']) + '"><div class="users-poster-face" style="background-image: url(../../images/gravatar-default-80x80.png);"></div></a>');
+                    $(td).html('<a href="' + page('user', rowData['user_id']) + '"><div class="users-poster-face" style="background-image: url(../../images/gravatar-default-80x80.png);">' + inactive + '</div></a>');
                 } else {
-                    $(td).html('<a href="' + page('user', rowData['user_id']) + '"><div class="users-poster-face" style="background-image: url(' + rowData['user_thumb'] + ');"></div></a>');
+                    $(td).html('<a href="' + page('user', rowData['user_id']) + '"><div class="users-poster-face" style="background-image: url(' + rowData['user_thumb'] + ');">' + inactive + '</div></a>');
                 }
             },
             "orderable": false,
diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html
index d25cdf51..3e0bf406 100644
--- a/data/interfaces/default/user.html
+++ b/data/interfaces/default/user.html
@@ -51,7 +51,13 @@ DOCUMENTATION :: END
                 <div class="col-md-12">
                     <div class="table-card-back">
                         <div class="user-info-wrapper">
-                            <div class="user-info-poster-face" style="background-image: url(${data['user_thumb']});"></div>
+                                <div class="user-info-poster-face" style="background-image: url(${data['user_thumb']});">
+                                    % if not data['is_active']:
+                                    <span class="inactive-user-tooltip" data-toggle="tooltip" title="User not on Plex server">
+                                        <i class="fa fa-lg fa-exclamation-triangle"></i>
+                                    </span>
+                                    % endif
+                                </div>
                             <div class="user-info-username">
                                 <span class="set-username">${data['friendly_name']}</span>
                                 % if _session['user_group'] == 'admin':
@@ -540,6 +546,8 @@ DOCUMENTATION :: END
         login_log_table.draw();
     });
 
+    $(".inactive-user-tooltip").tooltip();
+
     % if _session['user_group'] == 'admin':
     $("#edit-user-tooltip").tooltip();
 
diff --git a/plexpy/users.py b/plexpy/users.py
index 5c78e0c0..ddac44fa 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -130,7 +130,8 @@ class Users(object):
                    'session_history_media_info.transcode_decision',
                    'users.do_notify as do_notify',
                    'users.keep_history as keep_history',
-                   'users.allow_guest as allow_guest'
+                   'users.allow_guest as allow_guest',
+                   'users.is_active as is_active'
                    ]
         try:
             query = data_tables.ssp_query(table_name='users',
@@ -196,7 +197,8 @@ class Users(object):
                    'transcode_decision': item['transcode_decision'],
                    'do_notify': helpers.checked(item['do_notify']),
                    'keep_history': helpers.checked(item['keep_history']),
-                   'allow_guest': helpers.checked(item['allow_guest'])
+                   'allow_guest': helpers.checked(item['allow_guest']),
+                   'is_active': item['is_active']
                    }
 
             rows.append(row)
@@ -337,6 +339,7 @@ class Users(object):
                           'friendly_name': 'Local',
                           'user_thumb': common.DEFAULT_USER_THUMB,
                           'email': '',
+                          'is_active': 1,
                           'is_admin': '',
                           'is_home_user': 0,
                           'is_allow_sync': 0,
@@ -357,21 +360,24 @@ class Users(object):
             try:
                 if str(user_id).isdigit():
                     query = 'SELECT user_id, username, friendly_name, thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \
-                            'email, is_admin, is_home_user, is_allow_sync, is_restricted, do_notify, keep_history, deleted_user, ' \
+                            'email, is_active, is_admin, is_home_user, is_allow_sync, is_restricted, ' \
+                            'do_notify, keep_history, deleted_user, ' \
                             'allow_guest, shared_libraries ' \
                             'FROM users ' \
                             'WHERE user_id = ? '
                     result = monitor_db.select(query, args=[user_id])
                 elif user:
                     query = 'SELECT user_id, username, friendly_name, thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \
-                            'email, is_admin, is_home_user, is_allow_sync, is_restricted, do_notify, keep_history, deleted_user, ' \
+                            'email, is_active, is_admin, is_home_user, is_allow_sync, is_restricted, ' \
+                            'do_notify, keep_history, deleted_user, ' \
                             'allow_guest, shared_libraries ' \
                             'FROM users ' \
                             'WHERE username = ? COLLATE NOCASE '
                     result = monitor_db.select(query, args=[user])
                 elif email:
                     query = 'SELECT user_id, username, friendly_name, thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \
-                            'email, is_admin, is_home_user, is_allow_sync, is_restricted, do_notify, keep_history, deleted_user, ' \
+                            'email, is_active, is_admin, is_home_user, is_allow_sync, is_restricted, ' \
+                            'do_notify, keep_history, deleted_user, ' \
                             'allow_guest, shared_libraries ' \
                             'FROM users ' \
                             'WHERE email = ? COLLATE NOCASE '
@@ -406,6 +412,7 @@ class Users(object):
                                     'friendly_name': friendly_name,
                                     'user_thumb': user_thumb,
                                     'email': item['email'],
+                                    'is_active': item['is_active'],
                                     'is_admin': item['is_admin'],
                                     'is_home_user': item['is_home_user'],
                                     'is_allow_sync': item['is_allow_sync'],
@@ -613,7 +620,7 @@ class Users(object):
 
         try:
             query = 'SELECT user_id, username, friendly_name, thumb, custom_avatar_url, email, ' \
-                    'is_admin, is_home_user, is_allow_sync, is_restricted, ' \
+                    'is_active, is_admin, is_home_user, is_allow_sync, is_restricted, ' \
                     'do_notify, keep_history, allow_guest, server_token, shared_libraries, ' \
                     'filter_all, filter_movies, filter_tv, filter_music, filter_photos ' \
                     'FROM users WHERE deleted_user = 0'
@@ -629,6 +636,7 @@ class Users(object):
                     'friendly_name': item['friendly_name'] or item['username'],
                     'thumb': item['custom_avatar_url'] or item['thumb'],
                     'email': item['email'],
+                    'is_active': item['is_active'],
                     'is_admin': item['is_admin'],
                     'is_home_user': item['is_home_user'],
                     'is_allow_sync': item['is_allow_sync'],

From aa31bf1a191c0d4b58262002f42c3796c361963d Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 00:11:43 -0700
Subject: [PATCH 07/26] Update API docs with user is_active

---
 API.md             | 4 ++++
 plexpy/webserve.py | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/API.md b/API.md
index ae147c46..41153114 100644
--- a/API.md
+++ b/API.md
@@ -2223,6 +2223,8 @@ Returns:
          "do_notify": 1,
          "email": "Jon.Snow.1337@CastleBlack.com",
          "friendly_name": "Jon Snow",
+         "is_active": 1,
+         "is_admin": 0,
          "is_allow_sync": 1,
          "is_home_user": 1,
          "is_restricted": 0,
@@ -2423,6 +2425,7 @@ Returns:
           "filter_music": "",
           "filter_photos": "",
           "filter_tv": "",
+          "is_active": 1,
           "is_admin": 0,
           "is_allow_sync": 1,
           "is_home_user": 1,
@@ -2469,6 +2472,7 @@ Returns:
               "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
               "id": 1121,
               "ip_address": "xxx.xxx.xxx.xxx",
+              "is_active": 1,
               "keep_history": "Checked",
               "last_played": "Game of Thrones - The Red Woman",
               "last_seen": 1462591869,
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index a8e87aa4..c1618777 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1072,6 +1072,7 @@ class WebInterface(object):
                           "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
                           "id": 1121,
                           "ip_address": "xxx.xxx.xxx.xxx",
+                          "is_active": 1,
                           "keep_history": "Checked",
                           "last_played": "Game of Thrones - The Red Woman",
                           "last_seen": 1462591869,
@@ -1408,6 +1409,8 @@ class WebInterface(object):
                      "do_notify": 1,
                      "email": "Jon.Snow.1337@CastleBlack.com",
                      "friendly_name": "Jon Snow",
+                     "is_active": 1,
+                     "is_admin": 0,
                      "is_allow_sync": 1,
                      "is_home_user": 1,
                      "is_restricted": 0,
@@ -5399,6 +5402,7 @@ class WebInterface(object):
                       "filter_music": "",
                       "filter_photos": "",
                       "filter_tv": "",
+                      "is_active": 1,
                       "is_admin": 0,
                       "is_allow_sync": 1,
                       "is_home_user": 1,

From 198e7767dc7cff32832329289662d3bcfcdfd6b3 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 00:12:38 -0700
Subject: [PATCH 08/26] Add library is_active to database

---
 plexpy/__init__.py   | 11 ++++++++++-
 plexpy/libraries.py  |  9 +++++++++
 plexpy/pmsconnect.py |  3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/plexpy/__init__.py b/plexpy/__init__.py
index 24b58f8e..b422c922 100644
--- a/plexpy/__init__.py
+++ b/plexpy/__init__.py
@@ -675,7 +675,7 @@ def dbcheck():
         'CREATE TABLE IF NOT EXISTS library_sections (id INTEGER PRIMARY KEY AUTOINCREMENT, '
         'server_id TEXT, section_id INTEGER, section_name TEXT, section_type TEXT, agent TEXT, '
         'thumb TEXT, custom_thumb_url TEXT, art TEXT, custom_art_url TEXT, '
-        'count INTEGER, parent_count INTEGER, child_count INTEGER, '
+        'count INTEGER, parent_count INTEGER, child_count INTEGER, is_active INTEGER DEFAULT 1, '
         'do_notify INTEGER DEFAULT 1, do_notify_created INTEGER DEFAULT 1, keep_history INTEGER DEFAULT 1, '
         'deleted_section INTEGER DEFAULT 0, UNIQUE(server_id, section_id))'
     )
@@ -1914,6 +1914,15 @@ def dbcheck():
             'ALTER TABLE library_sections ADD COLUMN custom_art_url TEXT'
         )
 
+    # Upgrade library_sections table from earlier versions
+    try:
+        c_db.execute('SELECT is_active FROM library_sections')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table library_sections.")
+        c_db.execute(
+            'ALTER TABLE library_sections ADD COLUMN is_active INTEGER DEFAULT 1'
+        )
+
     # Upgrade users table from earlier versions (remove UNIQUE constraint on username)
     try:
         result = c_db.execute('SELECT SQL FROM sqlite_master WHERE type="table" AND name="users"').fetchone()
diff --git a/plexpy/libraries.py b/plexpy/libraries.py
index 91c27a33..b6461e3b 100644
--- a/plexpy/libraries.py
+++ b/plexpy/libraries.py
@@ -43,7 +43,12 @@ def refresh_libraries():
         library_keys = []
         new_keys = []
 
+        # Keep track of section_id to update is_active status
+        section_ids = [common.LIVE_TV_SECTION_ID]  # Live TV library always considered active
+
         for section in library_sections:
+            section_ids.append(helpers.cast_to_int(section['section_id']))
+
             section_keys = {'server_id': server_id,
                             'section_id': section['section_id']}
             section_values = {'server_id': server_id,
@@ -65,6 +70,10 @@ def refresh_libraries():
             if result == 'insert':
                 new_keys.append(section['section_id'])
 
+        query = 'UPDATE library_sections SET is_active = 0 WHERE server_id != ? OR ' \
+                'section_id NOT IN ({})'.format(', '.join(['?'] * len(section_ids)))
+        monitor_db.action(query=query, args=[plexpy.CONFIG.PMS_IDENTIFIER] + section_ids)
+
         if plexpy.CONFIG.HOME_LIBRARY_CARDS == ['first_run_wizard']:
             plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', library_keys)
             plexpy.CONFIG.write()
diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py
index 58cbe02a..16cba489 100644
--- a/plexpy/pmsconnect.py
+++ b/plexpy/pmsconnect.py
@@ -2643,7 +2643,8 @@ class PmsConnect(object):
                                      'agent': library['agent'],
                                      'thumb': library['thumb'],
                                      'art': library['art'],
-                                     'count': children_list['library_count']
+                                     'count': children_list['library_count'],
+                                     'is_active': 1
                                      }
 
                     if section_type == 'show':

From 23de9616f1c9833f446f4ea61db702165b81d533 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 00:17:52 -0700
Subject: [PATCH 09/26] Show library active status on Libraries table

---
 data/interfaces/default/js/tables/libraries.js |  8 +++++---
 data/interfaces/default/library.html           | 18 ++++++++++++++++--
 data/interfaces/default/user.html              | 14 +++++++-------
 plexpy/libraries.py                            | 10 +++++++---
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/data/interfaces/default/js/tables/libraries.js b/data/interfaces/default/js/tables/libraries.js
index 240670cc..903d5756 100644
--- a/data/interfaces/default/js/tables/libraries.js
+++ b/data/interfaces/default/js/tables/libraries.js
@@ -41,14 +41,16 @@ libraries_list_table_options = {
             "targets": [1],
             "data": "library_thumb",
             "createdCell": function (td, cellData, rowData, row, col) {
+                var inactive = '';
+                if (!rowData['is_active']) { inactive = '<span class="inactive-library-tooltip" data-toggle="tooltip" title="Library not on Plex server"><i class="fa fa-exclamation-triangle"></i></span>'; }
                 if (cellData !== null && cellData !== '') {
                     if (rowData['library_thumb'].substring(0, 4) == "http") {
-                        $(td).html('<a href="library?section_id=' + rowData['section_id'] + '"><div class="libraries-poster-face" style="background-image: url(' + rowData['library_thumb'] + ');"></div></a>');
+                        $(td).html('<a href="library?section_id=' + rowData['section_id'] + '"><div class="libraries-poster-face" style="background-image: url(' + rowData['library_thumb'] + ');">' + inactive + '</div></a>');
                     } else {
-                        $(td).html('<a href="library?section_id=' + rowData['section_id'] + '"><div class="libraries-poster-face svg-icon library-' + rowData['section_type'] + '"></div></a>');
+                        $(td).html('<a href="library?section_id=' + rowData['section_id'] + '"><div class="libraries-poster-face svg-icon library-' + rowData['section_type'] + '">' + inactive + '</div></a>');
                     }
                 } else {
-                    $(td).html('<a href="library?section_id=' + rowData['section_id'] + '"><div class="libraries-poster-face" style="background-image: url(../../images/cover.png);"></div></a>');
+                    $(td).html('<a href="library?section_id=' + rowData['section_id'] + '"><div class="libraries-poster-face" style="background-image: url(../../images/cover.png);">' + inactive + '</div></a>');
                 }
             },
             "orderable": false,
diff --git a/data/interfaces/default/library.html b/data/interfaces/default/library.html
index fb57cda4..2d8364a9 100644
--- a/data/interfaces/default/library.html
+++ b/data/interfaces/default/library.html
@@ -62,9 +62,21 @@ DOCUMENTATION :: END
                     <div class="table-card-back">
                         <div class="user-info-wrapper">
                             % if data['library_thumb'].startswith('http'):
-                            <div class="library-info-poster-face" style="background-image: url(${page('pms_image_proxy', data['library_thumb'], None, 80, 80)});"></div>
+                            <div class="library-info-poster-face" style="background-image: url(${page('pms_image_proxy', data['library_thumb'], None, 80, 80)});">
+                                % if not data['is_active']:
+                                <span class="inactive-library-tooltip" data-toggle="tooltip" title="Library not on Plex server">
+                                    <i class="fa fa-lg fa-exclamation-triangle"></i>
+                                </span>
+                                % endif
+                            </div>
                             % else:
-                            <div class="library-info-poster-face svg-icon library-${data['section_type']}"></div>
+                            <div class="library-info-poster-face svg-icon library-${data['section_type']}">
+                                % if not data['is_active']:
+                                <span class="inactive-library-tooltip" data-toggle="tooltip" title="Library not on Plex server">
+                                    <i class="fa fa-lg fa-exclamation-triangle"></i>
+                                </span>
+                                % endif
+                            </div>
                             % endif
                             <div class="user-info-username">
                                 <span class="set-username">${data['section_name']}</span>
@@ -411,6 +423,8 @@ DOCUMENTATION :: END
         history_table.draw();
     });
 
+    $(".inactive-library-tooltip").tooltip();
+
     % if _session['user_group'] == 'admin':
     function loadMediaInfoTable() {
         // Build media info table
diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html
index 3e0bf406..e95af099 100644
--- a/data/interfaces/default/user.html
+++ b/data/interfaces/default/user.html
@@ -51,13 +51,13 @@ DOCUMENTATION :: END
                 <div class="col-md-12">
                     <div class="table-card-back">
                         <div class="user-info-wrapper">
-                                <div class="user-info-poster-face" style="background-image: url(${data['user_thumb']});">
-                                    % if not data['is_active']:
-                                    <span class="inactive-user-tooltip" data-toggle="tooltip" title="User not on Plex server">
-                                        <i class="fa fa-lg fa-exclamation-triangle"></i>
-                                    </span>
-                                    % endif
-                                </div>
+                            <div class="user-info-poster-face" style="background-image: url(${data['user_thumb']});">
+                                % if not data['is_active']:
+                                <span class="inactive-user-tooltip" data-toggle="tooltip" title="User not on Plex server">
+                                    <i class="fa fa-lg fa-exclamation-triangle"></i>
+                                </span>
+                                % endif
+                            </div>
                             <div class="user-info-username">
                                 <span class="set-username">${data['friendly_name']}</span>
                                 % if _session['user_group'] == 'admin':
diff --git a/plexpy/libraries.py b/plexpy/libraries.py
index b6461e3b..141ac0fe 100644
--- a/plexpy/libraries.py
+++ b/plexpy/libraries.py
@@ -331,7 +331,8 @@ class Libraries(object):
                    'session_history_metadata.guid',
                    'library_sections.do_notify',
                    'library_sections.do_notify_created',
-                   'library_sections.keep_history'
+                   'library_sections.keep_history',
+                   'library_sections.is_active'
                    ]
         try:
             query = data_tables.ssp_query(table_name='library_sections',
@@ -397,7 +398,8 @@ class Libraries(object):
                    'guid': item['guid'],
                    'do_notify': helpers.checked(item['do_notify']),
                    'do_notify_created': helpers.checked(item['do_notify_created']),
-                   'keep_history': helpers.checked(item['keep_history'])
+                   'keep_history': helpers.checked(item['keep_history']),
+                   'is_active': item['is_active']
                    }
 
             rows.append(row)
@@ -742,6 +744,7 @@ class Libraries(object):
                           'count': 0,
                           'parent_count': 0,
                           'child_count': 0,
+                          'is_active': 1,
                           'do_notify': 0,
                           'do_notify_created': 0,
                           'keep_history': 1,
@@ -758,7 +761,7 @@ class Libraries(object):
                 if str(section_id).isdigit():
                     query = 'SELECT section_id, section_name, section_type, count, parent_count, child_count, ' \
                             'thumb AS library_thumb, custom_thumb_url AS custom_thumb, art AS library_art, ' \
-                            'custom_art_url AS custom_art, ' \
+                            'custom_art_url AS custom_art, is_active, ' \
                             'do_notify, do_notify_created, keep_history, deleted_section ' \
                             'FROM library_sections ' \
                             'WHERE section_id = ? '
@@ -792,6 +795,7 @@ class Libraries(object):
                                        'count': item['count'],
                                        'parent_count': item['parent_count'],
                                        'child_count': item['child_count'],
+                                       'is_active': item['is_active'],
                                        'do_notify': item['do_notify'],
                                        'do_notify_created': item['do_notify_created'],
                                        'keep_history': item['keep_history'],

From 1091a64863c8594bbfbe679b674ae6d04974b058 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 00:20:25 -0700
Subject: [PATCH 10/26] Update API docs with library is_active

---
 API.md             | 3 +++
 plexpy/webserve.py | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/API.md b/API.md
index 41153114..c160ca68 100644
--- a/API.md
+++ b/API.md
@@ -853,6 +853,7 @@ Returns:
         [{"art": "/:/resources/show-fanart.jpg",
           "child_count": "3745",
           "count": "62",
+          "is_active": 1,
           "parent_count": "240",
           "section_id": "2",
           "section_name": "TV Shows",
@@ -895,6 +896,7 @@ Returns:
               "duration": 1578037,
               "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
               "id": 1128,
+              "is_active": 1,
               "keep_history": "Checked",
               "labels": [],
               "last_accessed": 1462693216,
@@ -940,6 +942,7 @@ Returns:
          "deleted_section": 0,
          "do_notify": 1,
          "do_notify_created": 1,
+         "is_active": 1,
          "keep_history": 1,
          "library_art": "/:/resources/movie-fanart.jpg",
          "library_thumb": "/:/resources/movie.png",
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index c1618777..ea62dfb8 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -398,6 +398,7 @@ class WebInterface(object):
                           "duration": 1578037,
                           "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
                           "id": 1128,
+                          "is_active": 1,
                           "keep_history": "Checked",
                           "labels": [],
                           "last_accessed": 1462693216,
@@ -788,6 +789,7 @@ class WebInterface(object):
                      "deleted_section": 0,
                      "do_notify": 1,
                      "do_notify_created": 1,
+                     "is_active": 1,
                      "keep_history": 1,
                      "library_art": "/:/resources/movie-fanart.jpg",
                      "library_thumb": "/:/resources/movie.png",
@@ -5359,6 +5361,7 @@ class WebInterface(object):
                     [{"art": "/:/resources/show-fanart.jpg",
                       "child_count": "3745",
                       "count": "62",
+                      "is_active": 1,
                       "parent_count": "240",
                       "section_id": "2",
                       "section_name": "TV Shows",

From 38f64c7d8530232dc6915dcf65a29176f1b475d9 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 11:45:20 -0700
Subject: [PATCH 11/26] Improve delete history using list of row ids

---
 data/interfaces/default/history.html | 20 +++++++++-----------
 data/interfaces/default/info.html    | 20 +++++++++-----------
 data/interfaces/default/library.html | 20 +++++++++-----------
 data/interfaces/default/user.html    | 20 +++++++++-----------
 plexpy/datafactory.py                | 26 ++++++++++++++------------
 plexpy/webserve.py                   | 28 +++++++++++++++++++++-------
 6 files changed, 71 insertions(+), 63 deletions(-)

diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html
index bfe32348..16d62a94 100644
--- a/data/interfaces/default/history.html
+++ b/data/interfaces/default/history.html
@@ -185,17 +185,15 @@
                     $('#deleteCount').text(history_to_delete.length);
                     $('#confirm-modal-delete').modal();
                     $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                        history_to_delete.forEach(function(row, idx) {
-                            $.ajax({
-                                url: 'delete_history_rows',
-                                type: 'POST',
-                                data: { row_id: row },
-                                async: true,
-                                success: function (data) {
-                                    var msg = "History deleted";
-                                    showMsg(msg, false, true, 2000);
-                                }
-                            });
+                        $.ajax({
+                            url: 'delete_history_rows',
+                            type: 'POST',
+                            data: { row_ids: history_to_delete.join(',') },
+                            async: true,
+                            success: function (data) {
+                                var msg = "History deleted";
+                                showMsg(msg, false, true, 2000);
+                            }
                         });
                         history_table.draw();
                     });
diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index 30f7caa6..36ce79a6 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -721,17 +721,15 @@ DOCUMENTATION :: END
                     $('#deleteCount').text(history_to_delete.length);
                     $('#confirm-modal-delete').modal();
                     $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                        history_to_delete.forEach(function (row, idx) {
-                            $.ajax({
-                                url: 'delete_history_rows',
-                                type: 'POST',
-                                data: { row_id: row },
-                                async: true,
-                                success: function (data) {
-                                    var msg = "History deleted";
-                                    showMsg(msg, false, true, 2000);
-                                }
-                            });
+                        $.ajax({
+                            url: 'delete_history_rows',
+                            type: 'POST',
+                            data: { row_ids: history_to_delete.join(',') },
+                            async: true,
+                            success: function (data) {
+                                var msg = "History deleted";
+                                showMsg(msg, false, true, 2000);
+                            }
                         });
                         history_table.draw();
                     });
diff --git a/data/interfaces/default/library.html b/data/interfaces/default/library.html
index 2d8364a9..a3a68296 100644
--- a/data/interfaces/default/library.html
+++ b/data/interfaces/default/library.html
@@ -485,17 +485,15 @@ DOCUMENTATION :: END
                 $('#deleteCount').text(history_to_delete.length);
                 $('#confirm-modal-delete').modal();
                 $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                    history_to_delete.forEach(function(row, idx) {
-                        $.ajax({
-                            url: 'delete_history_rows',
-                            type: 'POST',
-                            data: { row_id: row },
-                            async: true,
-                            success: function (data) {
-                                var msg = "History deleted";
-                                showMsg(msg, false, true, 2000);
-                            }
-                        });
+                    $.ajax({
+                        url: 'delete_history_rows',
+                        type: 'POST',
+                        data: { row_ids: history_to_delete.join(',') },
+                        async: true,
+                        success: function (data) {
+                            var msg = "History deleted";
+                            showMsg(msg, false, true, 2000);
+                        }
                     });
                     history_table.draw();
                 });
diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html
index e95af099..1875ba7b 100644
--- a/data/interfaces/default/user.html
+++ b/data/interfaces/default/user.html
@@ -574,17 +574,15 @@ DOCUMENTATION :: END
                 $('#deleteType').text('history');
                 $('#confirm-modal-delete').modal();
                 $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                    history_to_delete.forEach(function(row, idx) {
-                        $.ajax({
-                            url: 'delete_history_rows',
-                            type: 'POST',
-                            data: { row_id: row },
-                            async: true,
-                            success: function (data) {
-                                var msg = "History deleted";
-                                showMsg(msg, false, true, 2000);
-                            }
-                        });
+                    $.ajax({
+                        url: 'delete_history_rows',
+                        type: 'POST',
+                        data: { row_ids: history_to_delete.join(',') },
+                        async: true,
+                        success: function (data) {
+                            var msg = "History deleted";
+                            showMsg(msg, false, true, 2000);
+                        }
                     });
                     history_table.draw();
                 });
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 58ae5514..131eedce 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -1561,21 +1561,23 @@ class DataFactory(object):
 
         return key_list
 
-    def delete_session_history_rows(self, row_id=None):
-        monitor_db = database.MonitorDatabase()
+    def delete_session_history_rows(self, row_ids=None):
+        if row_ids and row_ids is not None:
+            row_ids = map(helpers.cast_to_int, row_ids.split(','))
 
-        if row_id.isdigit():
-            logger.info(u"Tautulli DataFactory :: Deleting row id %s from the session history database." % row_id)
-            session_history_del = \
-                monitor_db.action('DELETE FROM session_history WHERE id = ?', [row_id])
-            session_history_media_info_del = \
-                monitor_db.action('DELETE FROM session_history_media_info WHERE id = ?', [row_id])
-            session_history_metadata_del = \
-                monitor_db.action('DELETE FROM session_history_metadata WHERE id = ?', [row_id])
+        if row_ids:
+            monitor_db = database.MonitorDatabase()
 
-            return 'Deleted rows %s.' % row_id
+            logger.info(u"Tautulli DataFactory :: Deleting history row ids %s from the session history database." % row_ids)
+
+            where = 'WHERE id IN ({})'.format(', '.join(['?'] * len(row_ids)))
+            for table in ('session_history', 'session_history_media_info', 'session_history_metadata'):
+                query = 'DELETE FROM {table} {where}'.format(table=table, where=where)
+                monitor_db.action(query=query, args=row_ids)
+
+            return 'Deleted history.'
         else:
-            return 'Unable to delete rows. Input row not valid.'
+            return 'Unable to delete rows. Input rows not valid.'
 
     def update_metadata(self, old_key_list='', new_key_list='', media_type=''):
         pms_connect = pmsconnect.PmsConnect()
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index ea62dfb8..4fda8647 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -819,11 +819,11 @@ class WebInterface(object):
 
             ```
             Required parameters:
-                section_id (str):               The id of the Plex library section
+                section_id (str):       The id of the Plex library section
 
             Optional parameters:
                 grouping (int):         0 or 1
-                query_days (str):       Comma separated days, e.g. "1, 7, 30, 0"
+                query_days (str):       Comma separated days, e.g. "1,7,30,0"
 
             Returns:
                 json:
@@ -1447,7 +1447,7 @@ class WebInterface(object):
 
             Optional parameters:
                 grouping (int):         0 or 1
-                query_days (str):       Comma separated days, e.g. "1, 7, 30, 0"
+                query_days (str):       Comma separated days, e.g. "1,7,30,0"
 
             Returns:
                 json:
@@ -1853,16 +1853,30 @@ class WebInterface(object):
     @cherrypy.expose
     @cherrypy.tools.json_out()
     @requireAuth(member_of("admin"))
-    def delete_history_rows(self, row_id, **kwargs):
+    @addtoapi("delete_history")
+    def delete_history_rows(self, row_ids=None, **kwargs):
+        """ Delete history rows from Tautulli.
+
+            ```
+            Required parameters:
+                row_ids (str):          Comma separated row ids to delete, e.g. "65,110,2,3645"
+
+            Optional parameters:
+                None
+
+            Returns:
+                None
+            ```
+        """
         data_factory = datafactory.DataFactory()
 
-        if row_id:
-            delete_row = data_factory.delete_session_history_rows(row_id=row_id)
+        if row_ids:
+            delete_row = data_factory.delete_session_history_rows(row_ids=row_ids)
 
             if delete_row:
                 return {'message': delete_row}
         else:
-            return {'message': 'no data received'}
+            return {'message': 'No row ids received.'}
 
 
     ##### Graphs #####

From c979e788020f6b77eec91a84d2e57c24d1a96a43 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 12:40:35 -0700
Subject: [PATCH 12/26] Refactor database delete_session_history_rows ids

---
 plexpy/database.py    | 19 +++++++++++++++++++
 plexpy/datafactory.py | 18 ------------------
 plexpy/webserve.py    | 10 ++++++----
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/plexpy/database.py b/plexpy/database.py
index e164b62c..203142eb 100644
--- a/plexpy/database.py
+++ b/plexpy/database.py
@@ -21,6 +21,7 @@ import threading
 import time
 
 import plexpy
+import helpers
 import logger
 
 FILENAME = "tautulli.db"
@@ -57,6 +58,24 @@ def delete_recently_added():
     return clear_table('recently_added')
 
 
+def delete_session_history_rows(row_ids=None):
+    if row_ids:
+        for table in ('session_history', 'session_history_media_info', 'session_history_metadata'):
+            delete_rows_from_table(table=table, row_ids=row_ids)
+        return True
+    return False
+
+
+def delete_rows_from_table(table, row_ids):
+    if row_ids and isinstance(row_ids, basestring):
+        row_ids = map(helpers.cast_to_int, row_ids.split(','))
+
+    logger.info(u"Tautulli Database :: Deleting row ids %s from %s database table", row_ids, table)
+    query = "DELETE FROM " + table + " WHERE id IN (%s) " % ','.join(['?'] * len(row_ids))
+    monitor_db = MonitorDatabase()
+    monitor_db.action(query, row_ids)
+
+
 def db_filename(filename=FILENAME):
     """ Returns the filepath to the db """
 
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 131eedce..bbdea771 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -1561,24 +1561,6 @@ class DataFactory(object):
 
         return key_list
 
-    def delete_session_history_rows(self, row_ids=None):
-        if row_ids and row_ids is not None:
-            row_ids = map(helpers.cast_to_int, row_ids.split(','))
-
-        if row_ids:
-            monitor_db = database.MonitorDatabase()
-
-            logger.info(u"Tautulli DataFactory :: Deleting history row ids %s from the session history database." % row_ids)
-
-            where = 'WHERE id IN ({})'.format(', '.join(['?'] * len(row_ids)))
-            for table in ('session_history', 'session_history_media_info', 'session_history_metadata'):
-                query = 'DELETE FROM {table} {where}'.format(table=table, where=where)
-                monitor_db.action(query=query, args=row_ids)
-
-            return 'Deleted history.'
-        else:
-            return 'Unable to delete rows. Input rows not valid.'
-
     def update_metadata(self, old_key_list='', new_key_list='', media_type=''):
         pms_connect = pmsconnect.PmsConnect()
         monitor_db = database.MonitorDatabase()
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 4fda8647..65ff47dd 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1871,12 +1871,14 @@ class WebInterface(object):
         data_factory = datafactory.DataFactory()
 
         if row_ids:
-            delete_row = data_factory.delete_session_history_rows(row_ids=row_ids)
+            success = database.delete_session_history_rows(row_ids=row_ids)
 
-            if delete_row:
-                return {'message': delete_row}
+            if success:
+                return {'result': 'success', 'message': 'Deleted history.'}
+            else:
+                return {'result': 'error', 'message': 'Failed to delete history.'}
         else:
-            return {'message': 'No row ids received.'}
+            return {'result': 'error', 'message': 'No row ids received.'}
 
 
     ##### Graphs #####

From 377a23478e11300e313d40536d82090aa13ceffd Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 12:56:50 -0700
Subject: [PATCH 13/26] Rename history id to row_id

---
 .../default/js/tables/history_table.js        | 26 +++++++++----------
 .../default/js/tables/history_table_modal.js  |  2 +-
 plexpy/datafactory.py                         |  6 ++---
 plexpy/webserve.py                            |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js
index a9552dab..c3be6f33 100644
--- a/data/interfaces/default/js/tables/history_table.js
+++ b/data/interfaces/default/js/tables/history_table.js
@@ -36,10 +36,10 @@ history_table_options = {
             "targets": [0],
             "data": null,
             "createdCell": function (td, cellData, rowData, row, col) {
-                if (rowData['id'] === null) {
+                if (rowData['row_id'] === null) {
                     $(td).html('');
                 } else {
-                    $(td).html('<button class="btn btn-xs btn-warning" data-id="' + rowData['id'] + '"><i class="fa fa-trash-o fa-fw"></i> Delete</button>');
+                    $(td).html('<button class="btn btn-xs btn-warning" data-id="' + rowData['row_id'] + '"><i class="fa fa-trash-o fa-fw"></i> Delete</button>');
                 }
             },
             "width": "5%",
@@ -317,19 +317,19 @@ history_table_options = {
     "rowCallback": function (row, rowData, rowIndex) {
         if (rowData['group_count'] == 1) {
             // if no grouped rows simply toggle the delete button
-            if ($.inArray(rowData['id'], history_to_delete) !== -1) {
-                $(row).find('button[data-id="' + rowData['id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
+            if ($.inArray(rowData['row_id'], history_to_delete) !== -1) {
+                $(row).find('button[data-id="' + rowData['row_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
             }
-        } else if (rowData['id'] !== null) {
+        } else if (rowData['row_id'] !== null) {
             // if grouped rows
             // toggle the parent button to danger
-            $(row).find('button[data-id="' + rowData['id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
+            $(row).find('button[data-id="' + rowData['row_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
             // check if any child rows are not selected
             var group_ids = rowData['group_ids'].split(',').map(Number);
             group_ids.forEach(function (id) {
                 var index = $.inArray(id, history_to_delete);
                 if (index == -1) {
-                    $(row).find('button[data-id="' + rowData['id'] + '"]').addClass('btn-warning').removeClass('btn-danger');
+                    $(row).find('button[data-id="' + rowData['row_id'] + '"]').addClass('btn-warning').removeClass('btn-danger');
                 }
             });
         }
@@ -353,7 +353,7 @@ $('.history_table').on('click', '> tbody > tr > td.modal-control', function () {
     var rowData = row.data();
 
     $.get('get_stream_data', {
-        row_id: rowData['id'],
+        row_id: rowData['row_id'],
         session_key: rowData['session_key'],
         user: rowData['friendly_name']
     }).then(function (jqXHR) {
@@ -382,9 +382,9 @@ $('.history_table').on('click', '> tbody > tr > td.delete-control > button', fun
 
     if (rowData['group_count'] == 1) {
         // if no grouped rows simply add or remove row from history_to_delete
-        var index = $.inArray(rowData['id'], history_to_delete);
+        var index = $.inArray(rowData['row_id'], history_to_delete);
         if (index === -1) {
-            history_to_delete.push(rowData['id']);
+            history_to_delete.push(rowData['row_id']);
         } else {
             history_to_delete.splice(index, 1);
         }
@@ -549,7 +549,7 @@ function createChildTable(row, rowData) {
         var childRowData = childRow.data();
 
         $.get('get_stream_data', {
-            row_id: childRowData['id'],
+            row_id: childRowData['row_id'],
             user: childRowData['friendly_name']
         }).then(function (jqXHR) {
             $("#info-modal").html(jqXHR);
@@ -576,9 +576,9 @@ function createChildTable(row, rowData) {
         var childRowData = childRow.data();
 
         // add or remove row from history_to_delete
-        var index = $.inArray(childRowData['id'], history_to_delete);
+        var index = $.inArray(childRowData['row_id'], history_to_delete);
         if (index === -1) {
-            history_to_delete.push(childRowData['id']);
+            history_to_delete.push(childRowData['row_id']);
         } else {
             history_to_delete.splice(index, 1);
         }
diff --git a/data/interfaces/default/js/tables/history_table_modal.js b/data/interfaces/default/js/tables/history_table_modal.js
index 575e91cd..69030b3a 100644
--- a/data/interfaces/default/js/tables/history_table_modal.js
+++ b/data/interfaces/default/js/tables/history_table_modal.js
@@ -169,7 +169,7 @@ $('.history_table').on('click', 'td.modal-control', function () {
     function showStreamDetails() {
         $.ajax({
             url: 'get_stream_data',
-            data: { row_id: rowData['id'], user: rowData['friendly_name'] },
+            data: { row_id: rowData['row_id'], user: rowData['friendly_name'] },
             cache: false,
             async: true,
             complete: function (xhr, status) {
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index bbdea771..01a00340 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -64,7 +64,7 @@ class DataFactory(object):
 
         columns = [
             'session_history.reference_id',
-            'session_history.id',
+            'session_history.id AS row_id',
             'MAX(started) AS date',
             'MIN(started) AS started',
             'MAX(stopped) AS stopped',
@@ -116,7 +116,7 @@ class DataFactory(object):
 
             columns_union = [
                 'NULL AS reference_id',
-                'NULL AS id',
+                'NULL AS row_id',
                 'started AS date',
                 'started',
                 'stopped',
@@ -228,7 +228,7 @@ class DataFactory(object):
             platform = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform'])
 
             row = {'reference_id': item['reference_id'],
-                   'id': item['id'],
+                   'row_id': item['row_id'],
                    'date': item['date'],
                    'started': item['started'],
                    'stopped': item['stopped'],
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 65ff47dd..5329a755 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1663,7 +1663,6 @@ class WebInterface(object):
                           "group_count": 1,
                           "group_ids": "1124",
                           "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-                          "id": 1124,
                           "ip_address": "xxx.xxx.xxx.xxx",
                           "live": 0,
                           "media_index": 17,
@@ -1679,6 +1678,7 @@ class WebInterface(object):
                           "player": "Castle-PC",
                           "rating_key": 4348,
                           "reference_id": 1123,
+                          "row_id": 1124,
                           "session_key": null,
                           "started": 1462688107,
                           "state": null,

From faac6b11c22d53d9211570ac6b602e4ec9461a5c Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 13:15:29 -0700
Subject: [PATCH 14/26] Improve user delete/purge function

---
 data/interfaces/default/js/tables/user_ips.js |   2 +-
 data/interfaces/default/js/tables/users.js    |  24 ++--
 data/interfaces/default/users.html            |  50 ++++----
 plexpy/database.py                            |  28 +++--
 plexpy/users.py                               | 111 ++++++++----------
 plexpy/webserve.py                            |  34 +++---
 6 files changed, 128 insertions(+), 121 deletions(-)

diff --git a/data/interfaces/default/js/tables/user_ips.js b/data/interfaces/default/js/tables/user_ips.js
index e73c7635..084b0378 100644
--- a/data/interfaces/default/js/tables/user_ips.js
+++ b/data/interfaces/default/js/tables/user_ips.js
@@ -167,7 +167,7 @@ $('.user_ip_table').on('click', 'td.modal-control', function () {
     function showStreamDetails() {
         $.ajax({
             url: 'get_stream_data',
-            data: { row_id: rowData['id'], user: rowData['friendly_name'] },
+            data: { row_id: rowData['history_row_id'], user: rowData['friendly_name'] },
             cache: false,
             async: true,
             complete: function (xhr, status) {
diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js
index 58918d46..15c64fbc 100644
--- a/data/interfaces/default/js/tables/users.js
+++ b/data/interfaces/default/js/tables/users.js
@@ -44,8 +44,8 @@ users_list_table_options = {
             "data": null,
             "createdCell": function (td, cellData, rowData, row, col) {
                 $(td).html('<div class="edit-user-toggles">' + 
-                    '<button class="btn btn-xs btn-warning delete-user" data-id="' + rowData['user_id'] + '" data-toggle="button"><i class="fa fa-trash-o fa-fw"></i> Delete</button>&nbsp' +
-                    '<button class="btn btn-xs btn-warning purge-user" data-id="' + rowData['user_id'] + '" data-toggle="button"><i class="fa fa-eraser fa-fw"></i> Purge</button>&nbsp&nbsp&nbsp' +
+                    '<button class="btn btn-xs btn-warning delete-user" data-id="' + rowData['row_id'] + '" data-toggle="button"><i class="fa fa-trash-o fa-fw"></i> Delete</button>&nbsp' +
+                    '<button class="btn btn-xs btn-warning purge-user" data-id="' + rowData['row_id'] + '" data-toggle="button"><i class="fa fa-eraser fa-fw"></i> Purge</button>&nbsp&nbsp&nbsp' +
                     '<input type="checkbox" id="keep_history-' + rowData['user_id'] + '" name="keep_history" value="1" ' + rowData['keep_history'] + '><label class="edit-tooltip" for="keep_history-' + rowData['user_id'] + '" data-toggle="tooltip" title="Toggle History"><i class="fa fa-history fa-lg fa-fw"></i></label>&nbsp' +
                     '<input type="checkbox" id="allow_guest-' + rowData['user_id'] + '" name="allow_guest" value="1" ' + rowData['allow_guest'] + '><label class="edit-tooltip" for="allow_guest-' + rowData['user_id'] + '" data-toggle="tooltip" title="Toggle Guest Access"><i class="fa fa-unlock-alt fa-lg fa-fw"></i></label>&nbsp' +
                     '</div>');
@@ -77,7 +77,7 @@ users_list_table_options = {
             "data": "friendly_name",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== null && cellData !== '') {
-                    $(td).html('<div class="edit-user-name" data-id="' + rowData['user_id'] + '">' +
+                    $(td).html('<div class="edit-user-name" data-id="' + rowData['row_id'] + '">' +
                         '<a href="' + page('user', rowData['user_id']) + '">' + cellData + '</a>' +
                         '<input type="text" class="hidden" value="' + cellData + '">' +
                         '</div>');
@@ -256,10 +256,10 @@ users_list_table_options = {
     },
     "rowCallback": function (row, rowData) {
         if ($.inArray(rowData['user_id'], users_to_delete) !== -1) {
-            $(row).find('button.delete-user[data-id="' + rowData['user_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
+            $(row).find('button.delete-user[data-id="' + rowData['row_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
         }
         if ($.inArray(rowData['user_id'], users_to_purge) !== -1) {
-            $(row).find('button.purge-user[data-id="' + rowData['user_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
+            $(row).find('button.purge-user[data-id="' + rowData['row_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
         }
     }
 }
@@ -270,7 +270,7 @@ $('#users_list_table').on('click', 'td.modal-control', function () {
     var rowData = row.data();
 
     $.get('get_stream_data', {
-        row_id: rowData['id'],
+        row_id: rowData['history_row_id'],
         user: rowData['friendly_name']
     }).then(function (jqXHR) {
         $("#info-modal").html(jqXHR);
@@ -328,11 +328,11 @@ $('#users_list_table').on('click', 'td.edit-control > .edit-user-toggles > butto
     var row = users_list_table.row(tr);
     var rowData = row.data();
 
-    var index_delete = $.inArray(rowData['user_id'], users_to_delete);
-    var index_purge = $.inArray(rowData['user_id'], users_to_purge);
+    var index_delete = $.inArray(rowData['row_id'], users_to_delete);
+    var index_purge = $.inArray(rowData['row_id'], users_to_purge);
 
     if (index_delete === -1) {
-        users_to_delete.push(rowData['user_id']);
+        users_to_delete.push(rowData['row_id']);
         if (index_purge === -1) {
             tr.find('button.purge-user').click();
         }
@@ -351,11 +351,11 @@ $('#users_list_table').on('click', 'td.edit-control > .edit-user-toggles > butto
     var row = users_list_table.row(tr);
     var rowData = row.data();
 
-    var index_delete = $.inArray(rowData['user_id'], users_to_delete);
-    var index_purge = $.inArray(rowData['user_id'], users_to_purge);
+    var index_delete = $.inArray(rowData['row_id'], users_to_delete);
+    var index_purge = $.inArray(rowData['row_id'], users_to_purge);
 
     if (index_purge === -1) {
-        users_to_purge.push(rowData['user_id']);
+        users_to_purge.push(rowData['row_id']);
     } else {
         users_to_purge.splice(index_purge, 1);
         if (index_delete != -1) {
diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html
index 79f264e3..f3595148 100644
--- a/data/interfaces/default/users.html
+++ b/data/interfaces/default/users.html
@@ -119,14 +119,14 @@
                     });
 
                     if (users_to_delete.length > 0) {
-                        $('#users-to-delete').prepend('<p>Are you REALLY sure you want to delete and purge all history for the following users:</p>')
+                        $('#users-to-delete').prepend('<p>Are you REALLY sure you want to delete and purge all history for the following users:</p>');
                         for (var i = 0; i < users_to_delete.length; i++) {
                             $('#users-to-delete').append('<li>' + $('div[data-id=' + users_to_delete[i] + '] > input').val() + '</li>');
                         }
                     }
 
                     if (users_to_purge.length > 0) {
-                        $('#users-to-purge').prepend('<p>Are you REALLY sure you want to purge all history for the following users:</p>')
+                        $('#users-to-purge').prepend('<p>Are you REALLY sure you want to purge all history for the following users:</p>');
                         for (var i = 0; i < users_to_purge.length; i++) {
                             $('#users-to-purge').append('<li>' + $('div[data-id=' + users_to_purge[i] + '] > input').val() + '</li>');
                         }
@@ -134,31 +134,27 @@
 
                     $('#confirm-modal-delete').modal();
                     $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                        users_to_delete.forEach(function(row, idx) {
-                            $.ajax({
-                                url: 'delete_user',
-                                type: 'POST',
-                                data: { user_id: row },
-                                cache: false,
-                                async: true,
-                                success: function (data) {
-                                    var msg = "User deleted";
-                                    showMsg(msg, false, true, 2000);
-                                }
-                            });
+                        $.ajax({
+                            url: 'delete_user',
+                            type: 'POST',
+                            data: { row_ids: users_to_delete.join(',') },
+                            cache: false,
+                            async: true,
+                            success: function (data) {
+                                var msg = "User deleted";
+                                showMsg(msg, false, true, 2000);
+                            }
                         });
-                        users_to_purge.forEach(function(row, idx) {
-                            $.ajax({
-                                url: 'delete_all_user_history',
-                                type: 'POST',
-                                data: { user_id: row },
-                                cache: false,
-                                async: true,
-                                success: function (data) {
-                                    var msg = "User history purged";
-                                    showMsg(msg, false, true, 2000);
-                                }
-                            });
+                        $.ajax({
+                            url: 'delete_all_user_history',
+                            type: 'POST',
+                            data: { row_ids: users_to_purge.join(',') },
+                            cache: false,
+                            async: true,
+                            success: function (data) {
+                                var msg = "User history purged";
+                                showMsg(msg, false, true, 2000);
+                            }
                         });
                         users_list_table.draw();
                     });
@@ -192,7 +188,7 @@
             complete: function (xhr, status) {
                 var result = $.parseJSON(xhr.responseText);
                 var msg = result.message;
-                if (result.result == 'success') {
+                if (result.result === 'success') {
                     showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 2000, false);
                     users_list_table.draw();
                 } else {
diff --git a/plexpy/database.py b/plexpy/database.py
index 203142eb..b55deaab 100644
--- a/plexpy/database.py
+++ b/plexpy/database.py
@@ -58,14 +58,6 @@ def delete_recently_added():
     return clear_table('recently_added')
 
 
-def delete_session_history_rows(row_ids=None):
-    if row_ids:
-        for table in ('session_history', 'session_history_media_info', 'session_history_metadata'):
-            delete_rows_from_table(table=table, row_ids=row_ids)
-        return True
-    return False
-
-
 def delete_rows_from_table(table, row_ids):
     if row_ids and isinstance(row_ids, basestring):
         row_ids = map(helpers.cast_to_int, row_ids.split(','))
@@ -76,6 +68,26 @@ def delete_rows_from_table(table, row_ids):
     monitor_db.action(query, row_ids)
 
 
+def delete_session_history_rows(row_ids=None):
+    if row_ids:
+        for table in ('session_history', 'session_history_media_info', 'session_history_metadata'):
+            delete_rows_from_table(table=table, row_ids=row_ids)
+        return True
+    return False
+
+
+def delete_user_history(user_id=None):
+    if str(user_id).isdigit():
+        monitor_db = MonitorDatabase()
+
+        # Get all history associated with the user_id
+        result = monitor_db.select('SELECT id FROM session_history WHERE user_id = ?', [user_id])
+        row_ids = [row['id'] for row in result]
+
+        logger.info(u"Tautulli Database :: Deleting all history for user id %s from database." % user_id)
+        return delete_session_history_rows(row_ids=row_ids)
+
+
 def db_filename(filename=FILENAME):
     """ Returns the filepath to the db """
 
diff --git a/plexpy/users.py b/plexpy/users.py
index ddac44fa..93efc810 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -99,7 +99,8 @@ class Users(object):
 
         group_by = 'session_history.reference_id' if grouping else 'session_history.id'
 
-        columns = ['users.user_id',
+        columns = ['users.id AS row_id',
+                   'users.user_id',
                    '(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = "" \
                     THEN users.username ELSE users.friendly_name END) AS friendly_name',
                    'users.thumb AS user_thumb',
@@ -109,7 +110,7 @@ class Users(object):
                     ELSE 0 END) - SUM(CASE WHEN session_history.paused_counter IS NULL THEN 0 ELSE \
                     session_history.paused_counter END) AS duration',
                    'MAX(session_history.started) AS last_seen',
-                   'MAX(session_history.id) AS id',
+                   'MAX(session_history.id) AS history_row_id',
                    'session_history_metadata.full_title AS last_played',
                    'session_history.ip_address',
                    'session_history.platform',
@@ -128,10 +129,10 @@ class Users(object):
                    'session_history_metadata.originally_available_at',
                    'session_history_metadata.guid',
                    'session_history_media_info.transcode_decision',
-                   'users.do_notify as do_notify',
-                   'users.keep_history as keep_history',
-                   'users.allow_guest as allow_guest',
-                   'users.is_active as is_active'
+                   'users.do_notify AS do_notify',
+                   'users.keep_history AS keep_history',
+                   'users.allow_guest AS allow_guest',
+                   'users.is_active AS is_active'
                    ]
         try:
             query = data_tables.ssp_query(table_name='users',
@@ -173,14 +174,15 @@ class Users(object):
             # Rename Mystery platform names
             platform = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform'])
 
-            row = {'user_id': item['user_id'],
+            row = {'row_id': item['row_id'],
+                   'user_id': item['user_id'],
                    'friendly_name': item['friendly_name'],
                    'user_thumb': user_thumb,
                    'plays': item['plays'],
                    'duration': item['duration'],
                    'last_seen': item['last_seen'],
                    'last_played': item['last_played'],
-                   'id': item['id'],
+                   'history_row_id': item['history_row_id'],
                    'ip_address': item['ip_address'],
                    'platform': platform,
                    'player': item['player'],
@@ -225,7 +227,7 @@ class Users(object):
 
         custom_where = ['users.user_id', user_id]
 
-        columns = ['session_history.id',
+        columns = ['session_history.id AS history_row_id',
                    'MAX(session_history.started) AS last_seen',
                    'session_history.ip_address',
                    'COUNT(session_history.id) AS play_count',
@@ -285,7 +287,7 @@ class Users(object):
             # Rename Mystery platform names
             platform = common.PLATFORM_NAME_OVERRIDES.get(item["platform"], item["platform"])
 
-            row = {'id': item['id'],
+            row = {'history_row_id': item['history_row_id'],
                    'last_seen': item['last_seen'],
                    'ip_address': item['ip_address'],
                    'play_count': item['play_count'],
@@ -334,7 +336,8 @@ class Users(object):
                 logger.warn(u"Tautulli Users :: Unable to execute database query for set_config: %s." % e)
 
     def get_details(self, user_id=None, user=None, email=None):
-        default_return = {'user_id': 0,
+        default_return = {'row_id': 0,
+                          'user_id': 0,
                           'username': 'Local',
                           'friendly_name': 'Local',
                           'user_thumb': common.DEFAULT_USER_THUMB,
@@ -359,7 +362,8 @@ class Users(object):
 
             try:
                 if str(user_id).isdigit():
-                    query = 'SELECT user_id, username, friendly_name, thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \
+                    query = 'SELECT id AS row_id, user_id, username, friendly_name, ' \
+                            'thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \
                             'email, is_active, is_admin, is_home_user, is_allow_sync, is_restricted, ' \
                             'do_notify, keep_history, deleted_user, ' \
                             'allow_guest, shared_libraries ' \
@@ -367,7 +371,8 @@ class Users(object):
                             'WHERE user_id = ? '
                     result = monitor_db.select(query, args=[user_id])
                 elif user:
-                    query = 'SELECT user_id, username, friendly_name, thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \
+                    query = 'SELECT id AS row_id, user_id, username, friendly_name, ' \
+                            'thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \
                             'email, is_active, is_admin, is_home_user, is_allow_sync, is_restricted, ' \
                             'do_notify, keep_history, deleted_user, ' \
                             'allow_guest, shared_libraries ' \
@@ -375,7 +380,8 @@ class Users(object):
                             'WHERE username = ? COLLATE NOCASE '
                     result = monitor_db.select(query, args=[user])
                 elif email:
-                    query = 'SELECT user_id, username, friendly_name, thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \
+                    query = 'SELECT id AS row_id, user_id, username, friendly_name, ' \
+                            'thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \
                             'email, is_active, is_admin, is_home_user, is_allow_sync, is_restricted, ' \
                             'do_notify, keep_history, deleted_user, ' \
                             'allow_guest, shared_libraries ' \
@@ -407,7 +413,8 @@ class Users(object):
 
                     shared_libraries = tuple(item['shared_libraries'].split(';')) if item['shared_libraries'] else ()
 
-                    user_details = {'user_id': item['user_id'],
+                    user_details = {'row_id': item['row_id'],
+                                    'user_id': item['user_id'],
                                     'username': item['username'],
                                     'friendly_name': friendly_name,
                                     'user_thumb': user_thumb,
@@ -619,7 +626,7 @@ class Users(object):
         monitor_db = database.MonitorDatabase()
 
         try:
-            query = 'SELECT user_id, username, friendly_name, thumb, custom_avatar_url, email, ' \
+            query = 'SELECT id AS row_id, user_id, username, friendly_name, thumb, custom_avatar_url, email, ' \
                     'is_active, is_admin, is_home_user, is_allow_sync, is_restricted, ' \
                     'do_notify, keep_history, allow_guest, server_token, shared_libraries, ' \
                     'filter_all, filter_movies, filter_tv, filter_music, filter_photos ' \
@@ -631,7 +638,8 @@ class Users(object):
 
         users = []
         for item in result:
-            user = {'user_id': item['user_id'],
+            user = {'row_id': item['row_id'],
+                    'user_id': item['user_id'],
                     'username': item['username'],
                     'friendly_name': item['friendly_name'] or item['username'],
                     'thumb': item['custom_avatar_url'] or item['thumb'],
@@ -656,53 +664,38 @@ class Users(object):
 
         return users
 
-    def delete_all_history(self, user_id=None):
+    def delete(self, user_id=None, row_ids=None, purge_only=False):
         monitor_db = database.MonitorDatabase()
 
-        try:
-            if str(user_id).isdigit():
-                logger.info(u"Tautulli Users :: Deleting all history for user id %s from database." % user_id)
-                session_history_media_info_del = \
-                    monitor_db.action('DELETE FROM '
-                                      'session_history_media_info '
-                                      'WHERE session_history_media_info.id IN (SELECT session_history_media_info.id '
-                                      'FROM session_history_media_info '
-                                      'JOIN session_history ON session_history_media_info.id = session_history.id '
-                                      'WHERE session_history.user_id = ?)', [user_id])
-                session_history_metadata_del = \
-                    monitor_db.action('DELETE FROM '
-                                      'session_history_metadata '
-                                      'WHERE session_history_metadata.id IN (SELECT session_history_metadata.id '
-                                      'FROM session_history_metadata '
-                                      'JOIN session_history ON session_history_metadata.id = session_history.id '
-                                      'WHERE session_history.user_id = ?)', [user_id])
-                session_history_del = \
-                    monitor_db.action('DELETE FROM '
-                                      'session_history '
-                                      'WHERE session_history.user_id = ?', [user_id])
+        if row_ids and row_ids is not None:
+            row_ids = map(helpers.cast_to_int, row_ids.split(','))
 
-                return 'Deleted all items for user_id %s.' % user_id
+            # Get the user_ids corresponding to the row_ids
+            result = monitor_db.select('SELECT user_id FROM users '
+                                       'WHERE id IN ({})'.format(','.join(['?'] * len(row_ids))), row_ids)
+            user_ids = [user['user_id'] for user in result]
+
+            success = []
+            for user_id in user_ids:
+                success.append(self.delete(user_id=user_id, purge_only=purge_only))
+            return all(success)
+
+        elif str(user_id).isdigit():
+            database.delete_user_history(user_id=user_id)
+            if purge_only:
+                return True
             else:
-                return 'Unable to delete items. Input user_id not valid.'
-        except Exception as e:
-            logger.warn(u"Tautulli Users :: Unable to execute database query for delete_all_history: %s." % e)
+                logger.info(u"Tautulli Users :: Deleting user with user_id %s from database." % user_id)
+                try:
+                    monitor_db.action('UPDATE users '
+                                      'SET deleted_user = 1, keep_history = 0, do_notify = 0 '
+                                      'WHERE user_id = ?', [user_id])
+                    return True
+                except Exception as e:
+                    logger.warn(u"Tautulli Users :: Unable to execute database query for delete: %s." % e)
 
-    def delete(self, user_id=None):
-        monitor_db = database.MonitorDatabase()
-
-        try:
-            if str(user_id).isdigit():
-                self.delete_all_history(user_id)
-                logger.info(u"Tautulli Users :: Deleting user with id %s from database." % user_id)
-                monitor_db.action('UPDATE users SET deleted_user = 1 WHERE user_id = ?', [user_id])
-                monitor_db.action('UPDATE users SET keep_history = 0 WHERE user_id = ?', [user_id])
-                monitor_db.action('UPDATE users SET do_notify = 0 WHERE user_id = ?', [user_id])
-
-                return 'Deleted user with id %s.' % user_id
-            else:
-                return 'Unable to delete user, user_id not valid.'
-        except Exception as e:
-            logger.warn(u"Tautulli Users :: Unable to execute database query for delete: %s." % e)
+        else:
+            return False
 
     def undelete(self, user_id=None, username=None):
         monitor_db = database.MonitorDatabase()
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 5329a755..16015876 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1417,6 +1417,7 @@ class WebInterface(object):
                      "is_home_user": 1,
                      "is_restricted": 0,
                      "keep_history": 1,
+                     "row_id": 1,
                      "shared_libraries": ["10", "1", "4", "5", "15", "20", "2"],
                      "user_id": 133788,
                      "user_thumb": "https://plex.tv/users/k10w42309cynaopq/avatar",
@@ -1529,7 +1530,7 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth(member_of("admin"))
     @addtoapi()
-    def delete_all_user_history(self, user_id, **kwargs):
+    def delete_all_user_history(self, user_id=None, row_ids=None, **kwargs):
         """ Delete all Tautulli history for a specific user.
 
             ```
@@ -1537,25 +1538,27 @@ class WebInterface(object):
                 user_id (str):          The id of the Plex user
 
             Optional parameters:
-                None
+                row_ids (str):          Comma separated row ids to delete, e.g. "2,3,8"
 
             Returns:
                 None
             ```
         """
-        if user_id:
+        if user_id or row_ids:
             user_data = users.Users()
-            delete_row = user_data.delete_all_history(user_id=user_id)
-            if delete_row:
-                return {'message': delete_row}
+            success = user_data.delete(user_id=user_id, row_ids=row_ids, purge_only=True)
+            if success:
+                return {'result': 'success', 'message': 'Deleted user history.'}
+            else:
+                return {'result': 'error', 'message': 'Failed to delete user(s) history.'}
         else:
-            return {'message': 'no data received'}
+            return {'result': 'error', 'message': 'No user id or row ids received.'}
 
     @cherrypy.expose
     @cherrypy.tools.json_out()
     @requireAuth(member_of("admin"))
     @addtoapi()
-    def delete_user(self, user_id, **kwargs):
+    def delete_user(self, user_id=None, row_ids=None, **kwargs):
         """ Delete a user from Tautulli. Also erases all history for the user.
 
             ```
@@ -1563,19 +1566,21 @@ class WebInterface(object):
                 user_id (str):          The id of the Plex user
 
             Optional parameters:
-                None
+                row_ids (str):          Comma separated row ids to delete, e.g. "2,3,8"
 
             Returns:
                 None
             ```
         """
-        if user_id:
+        if user_id or row_ids:
             user_data = users.Users()
-            delete_row = user_data.delete(user_id=user_id)
-            if delete_row:
-                return {'message': delete_row}
+            success = user_data.delete(user_id=user_id, row_ids=row_ids)
+            if success:
+                return {'result': 'success', 'message': 'Deleted user.'}
+            else:
+                return {'result': 'error', 'message': 'Failed to delete user(s).'}
         else:
-            return {'message': 'no data received'}
+            return {'result': 'error', 'message': 'No user id or row ids received.'}
 
     @cherrypy.expose
     @cherrypy.tools.json_out()
@@ -5427,6 +5432,7 @@ class WebInterface(object):
                       "is_home_user": 1,
                       "is_restricted": 0,
                       "keep_history": 1,
+                      "row_id": 1,
                       "server_token": "PU9cMuQZxJKFBtGqHk68",
                       "shared_libraries": "1;2;3",
                       "thumb": "https://plex.tv/users/k10w42309cynaopq/avatar",

From 104e2929df1711409cec2830aaade18de27df99c Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 13:27:26 -0700
Subject: [PATCH 15/26] Simplify user delete loop

---
 plexpy/users.py    | 5 ++---
 plexpy/webserve.py | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plexpy/users.py b/plexpy/users.py
index 93efc810..20d9029f 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -673,11 +673,10 @@ class Users(object):
             # Get the user_ids corresponding to the row_ids
             result = monitor_db.select('SELECT user_id FROM users '
                                        'WHERE id IN ({})'.format(','.join(['?'] * len(row_ids))), row_ids)
-            user_ids = [user['user_id'] for user in result]
 
             success = []
-            for user_id in user_ids:
-                success.append(self.delete(user_id=user_id, purge_only=purge_only))
+            for user in result:
+                success.append(self.delete(user_id=user['user_id'], purge_only=purge_only))
             return all(success)
 
         elif str(user_id).isdigit():
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 16015876..2b295ef0 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1072,7 +1072,7 @@ class WebInterface(object):
                           "duration": 2998290,
                           "friendly_name": "Jon Snow",
                           "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-                          "id": 1121,
+                          "history_row_id": 1121,
                           "ip_address": "xxx.xxx.xxx.xxx",
                           "is_active": 1,
                           "keep_history": "Checked",
@@ -1088,6 +1088,7 @@ class WebInterface(object):
                           "player": "Plex Web (Chrome)",
                           "plays": 487,
                           "rating_key": 153037,
+                          "row_id": 1,
                           "thumb": "/library/metadata/153036/thumb/1462175062",
                           "transcode_decision": "transcode",
                           "user_id": 133788,
@@ -1290,7 +1291,7 @@ class WebInterface(object):
                      "data":
                         [{"friendly_name": "Jon Snow",
                           "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-                          "id": 1121,
+                          "history_row_id": 1121,
                           "ip_address": "xxx.xxx.xxx.xxx",
                           "last_played": "Game of Thrones - The Red Woman",
                           "last_seen": 1462591869,

From 6a87dc9c409b9dc2a4f1891da2423e42cd125e9c Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 14:00:19 -0700
Subject: [PATCH 16/26] Improve library delete/purge function

---
 .../interfaces/default/js/tables/libraries.js |  26 ++---
 data/interfaces/default/libraries.html        |  50 ++++-----
 plexpy/database.py                            |  21 +++-
 plexpy/libraries.py                           | 100 ++++++++----------
 plexpy/users.py                               |   3 +-
 plexpy/webserve.py                            |  52 +++++----
 6 files changed, 130 insertions(+), 122 deletions(-)

diff --git a/data/interfaces/default/js/tables/libraries.js b/data/interfaces/default/js/tables/libraries.js
index 903d5756..37be26ca 100644
--- a/data/interfaces/default/js/tables/libraries.js
+++ b/data/interfaces/default/js/tables/libraries.js
@@ -27,8 +27,8 @@ libraries_list_table_options = {
             "data": null,
             "createdCell": function (td, cellData, rowData, row, col) {
                 $(td).html('<div class="edit-library-toggles">' +
-                    '<button class="btn btn-xs btn-warning delete-library" data-id="' + rowData['section_id'] + '" data-toggle="button"><i class="fa fa-trash-o fa-fw"></i> Delete</button>&nbsp' +
-                    '<button class="btn btn-xs btn-warning purge-library" data-id="' + rowData['section_id'] + '" data-toggle="button"><i class="fa fa-eraser fa-fw"></i> Purge</button>&nbsp&nbsp&nbsp' +
+                    '<button class="btn btn-xs btn-warning delete-library" data-id="' + rowData['row_id'] + '" data-toggle="button"><i class="fa fa-trash-o fa-fw"></i> Delete</button>&nbsp' +
+                    '<button class="btn btn-xs btn-warning purge-library" data-id="' + rowData['row_id'] + '" data-toggle="button"><i class="fa fa-eraser fa-fw"></i> Purge</button>&nbsp&nbsp&nbsp' +
                     '<input type="checkbox" id="keep_history-' + rowData['section_id'] + '" name="keep_history" value="1" ' + rowData['keep_history'] + '><label class="edit-tooltip" for="keep_history-' + rowData['section_id'] + '" data-toggle="tooltip" title="Toggle History"><i class="fa fa-history fa-lg fa-fw"></i></label>&nbsp' +
                     '</div>');
             },
@@ -63,7 +63,7 @@ libraries_list_table_options = {
             "data": "section_name",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== null && cellData !== '') {
-                    $(td).html('<div data-id="' + rowData['section_id'] + '">' +
+                    $(td).html('<div data-id="' + rowData['row_id'] + '">' +
                         '<a href="library?section_id=' + rowData['section_id'] + '">' + cellData + '</a>' +
                         '</div>');
                 } else {
@@ -234,11 +234,11 @@ libraries_list_table_options = {
         showMsg(msg, false, false, 0)
     },
     "rowCallback": function (row, rowData) {
-        if ($.inArray(rowData['section_id'], libraries_to_delete) !== -1) {
-            $(row).find('button.delete-library[data-id="' + rowData['section_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
+        if ($.inArray(rowData['row_id'], libraries_to_delete) !== -1) {
+            $(row).find('button.delete-library[data-id="' + rowData['row_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
         }
-        if ($.inArray(rowData['section_id'], libraries_to_purge) !== -1) {
-            $(row).find('button.purge-library[data-id="' + rowData['section_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
+        if ($.inArray(rowData['row_id'], libraries_to_purge) !== -1) {
+            $(row).find('button.purge-library[data-id="' + rowData['row_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
         }
     }
 }
@@ -279,11 +279,11 @@ $('#libraries_list_table').on('click', 'td.edit-control > .edit-library-toggles
     var row = libraries_list_table.row(tr);
     var rowData = row.data();
 
-    var index_delete = $.inArray(rowData['section_id'], libraries_to_delete);
-    var index_purge = $.inArray(rowData['section_id'], libraries_to_purge);
+    var index_delete = $.inArray(rowData['row_id'], libraries_to_delete);
+    var index_purge = $.inArray(rowData['row_id'], libraries_to_purge);
 
     if (index_delete === -1) {
-        libraries_to_delete.push(rowData['section_id']);
+        libraries_to_delete.push(rowData['row_id']);
         if (index_purge === -1) {
             tr.find('button.purge-library').click();
         }
@@ -302,11 +302,11 @@ $('#libraries_list_table').on('click', 'td.edit-control > .edit-library-toggles
     var row = libraries_list_table.row(tr);
     var rowData = row.data();
 
-    var index_delete = $.inArray(rowData['section_id'], libraries_to_delete);
-    var index_purge = $.inArray(rowData['section_id'], libraries_to_purge);
+    var index_delete = $.inArray(rowData['row_id'], libraries_to_delete);
+    var index_purge = $.inArray(rowData['row_id'], libraries_to_purge);
 
     if (index_purge === -1) {
-        libraries_to_purge.push(rowData['section_id']);
+        libraries_to_purge.push(rowData['row_id']);
     } else {
         libraries_to_purge.splice(index_purge, 1);
         if (index_delete != -1) {
diff --git a/data/interfaces/default/libraries.html b/data/interfaces/default/libraries.html
index 4595dce4..f4983904 100644
--- a/data/interfaces/default/libraries.html
+++ b/data/interfaces/default/libraries.html
@@ -116,14 +116,14 @@
                     });
 
                     if (libraries_to_delete.length > 0) {
-                        $('#libraries-to-delete').prepend('<p>Are you REALLY sure you want to delete the following libraries:</p>')
+                        $('#libraries-to-delete').prepend('<p>Are you REALLY sure you want to delete the following libraries:</p>');
                         for (var i = 0; i < libraries_to_delete.length; i++) {
                             $('#libraries-to-delete').append('<li>' + $('div[data-id=' + libraries_to_delete[i] + ']').text() + '</li>');
                         }
                     }
 
                     if (libraries_to_purge.length > 0) {
-                        $('#libraries-to-purge').prepend('<p>Are you REALLY sure you want to purge all history for the following libraries:</p>')
+                        $('#libraries-to-purge').prepend('<p>Are you REALLY sure you want to purge all history for the following libraries:</p>');
                         for (var i = 0; i < libraries_to_purge.length; i++) {
                             $('#libraries-to-purge').append('<li>' + $('div[data-id=' + libraries_to_purge[i] + ']').text() + '</li>');
                         }
@@ -131,31 +131,27 @@
 
                     $('#confirm-modal-delete').modal();
                     $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                        libraries_to_delete.forEach(function(row, idx) {
-                            $.ajax({
-                                url: 'delete_library',
-                                type: 'POST',
-                                data: { section_id: row },
-                                cache: false,
-                                async: true,
-                                success: function (data) {
-                                    var msg = "Library deleted";
-                                    showMsg(msg, false, true, 2000);
-                                }
-                            });
+                        $.ajax({
+                            url: 'delete_library',
+                            type: 'POST',
+                            data: { row_ids: libraries_to_delete.join(',') },
+                            cache: false,
+                            async: true,
+                            success: function (data) {
+                                var msg = "Library deleted";
+                                showMsg(msg, false, true, 2000);
+                            }
                         });
-                        libraries_to_purge.forEach(function(row, idx) {
-                            $.ajax({
-                                url: 'delete_all_library_history',
-                                type: 'POST',
-                                data: { section_id: row },
-                                cache: false,
-                                async: true,
-                                success: function (data) {
-                                    var msg = "Library history purged";
-                                    showMsg(msg, false, true, 2000);
-                                }
-                            });
+                        $.ajax({
+                            url: 'delete_all_library_history',
+                            type: 'POST',
+                            data: { row_ids: libraries_to_purge.join(',') },
+                            cache: false,
+                            async: true,
+                            success: function (data) {
+                                var msg = "Library history purged";
+                                showMsg(msg, false, true, 2000);
+                            }
                         });
                         libraries_list_table.draw();
                     });
@@ -188,7 +184,7 @@
             complete: function (xhr, status) {
                 var result = $.parseJSON(xhr.responseText);
                 var msg = result.message;
-                if (result.result == 'success') {
+                if (result.result === 'success') {
                     showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 2000, false);
                     libraries_list_table.draw();
                 } else {
diff --git a/plexpy/database.py b/plexpy/database.py
index b55deaab..b88b190a 100644
--- a/plexpy/database.py
+++ b/plexpy/database.py
@@ -81,10 +81,27 @@ def delete_user_history(user_id=None):
         monitor_db = MonitorDatabase()
 
         # Get all history associated with the user_id
-        result = monitor_db.select('SELECT id FROM session_history WHERE user_id = ?', [user_id])
+        result = monitor_db.select('SELECT id FROM session_history WHERE user_id = ?',
+                                   [user_id])
         row_ids = [row['id'] for row in result]
 
-        logger.info(u"Tautulli Database :: Deleting all history for user id %s from database." % user_id)
+        logger.info(u"Tautulli Database :: Deleting all history for user_id %s from database." % user_id)
+        return delete_session_history_rows(row_ids=row_ids)
+
+
+def delete_library_history(server_id=None, section_id=None):
+    if server_id and str(section_id).isdigit():
+        monitor_db = MonitorDatabase()
+
+        # Get all history associated with the server_id and section_id
+        result = monitor_db.select('SELECT session_history.id FROM session_history '
+                                   'JOIN session_history_metadata ON session_history.id = session_history_metadata.id '
+                                   'WHERE session_history.server_id = ? AND session_history_metadata.section_id = ?',
+                                   [server_id, section_id])
+        row_ids = [row['id'] for row in result]
+
+        logger.info(u"Tautulli Database :: Deleting all history for library server_id %s and section_id %s from database."
+                    % (server_id, section_id))
         return delete_session_history_rows(row_ids=row_ids)
 
 
diff --git a/plexpy/libraries.py b/plexpy/libraries.py
index 141ac0fe..79e520ba 100644
--- a/plexpy/libraries.py
+++ b/plexpy/libraries.py
@@ -298,7 +298,9 @@ class Libraries(object):
 
         group_by = 'session_history.reference_id' if grouping else 'session_history.id'
 
-        columns = ['library_sections.section_id',
+        columns = ['library_sections.id AS row_id',
+                   'library_sections.server_id',
+                   'library_sections.section_id',
                    'library_sections.section_name',
                    'library_sections.section_type',
                    'library_sections.count',
@@ -312,7 +314,7 @@ class Libraries(object):
                     ELSE 0 END) - SUM(CASE WHEN session_history.paused_counter IS NULL THEN 0 ELSE \
                     session_history.paused_counter END) AS duration',
                    'MAX(session_history.started) AS last_accessed',
-                   'MAX(session_history.id) AS id',
+                   'MAX(session_history.id) AS history_row_id',
                    'session_history_metadata.full_title AS last_played',
                    'session_history.rating_key',
                    'session_history_metadata.media_type',
@@ -371,7 +373,9 @@ class Libraries(object):
             else:
                 library_thumb = common.DEFAULT_COVER_THUMB
 
-            row = {'section_id': item['section_id'],
+            row = {'row_id': item['row_id'],
+                   'server_id': item['server_id'],
+                   'section_id': item['section_id'],
                    'section_name': item['section_name'],
                    'section_type': item['section_type'],
                    'count': item['count'],
@@ -382,7 +386,7 @@ class Libraries(object):
                    'plays': item['plays'],
                    'duration': item['duration'],
                    'last_accessed': item['last_accessed'],
-                   'id': item['id'],
+                   'history_row_id': item['history_row_id'],
                    'last_played': item['last_played'],
                    'rating_key': item['rating_key'],
                    'media_type': item['media_type'],
@@ -736,7 +740,9 @@ class Libraries(object):
                 logger.warn(u"Tautulli Libraries :: Unable to execute database query for set_config: %s." % e)
 
     def get_details(self, section_id=None):
-        default_return = {'section_id': 0,
+        default_return = {'row_id': 0,
+                          'server_id': '',
+                          'section_id': 0,
                           'section_name': 'Local',
                           'section_type': '',
                           'library_thumb': common.DEFAULT_COVER_THUMB,
@@ -759,7 +765,8 @@ class Libraries(object):
 
             try:
                 if str(section_id).isdigit():
-                    query = 'SELECT section_id, section_name, section_type, count, parent_count, child_count, ' \
+                    query = 'SELECT id AS row_id, server_id, section_id, section_name, section_type, ' \
+                            'count, parent_count, child_count, ' \
                             'thumb AS library_thumb, custom_thumb_url AS custom_thumb, art AS library_art, ' \
                             'custom_art_url AS custom_art, is_active, ' \
                             'do_notify, do_notify_created, keep_history, deleted_section ' \
@@ -787,7 +794,9 @@ class Libraries(object):
                     else:
                         library_art = item['library_art']
 
-                    library_details = {'section_id': item['section_id'],
+                    library_details = {'row_id': item['row_id'],
+                                       'server_id': item['server_id'],
+                                       'section_id': item['section_id'],
                                        'section_name': item['section_name'],
                                        'section_type': item['section_type'],
                                        'library_thumb': library_thumb,
@@ -1015,60 +1024,39 @@ class Libraries(object):
 
         return libraries
 
-    def delete_all_history(self, section_id=None):
+    def delete(self, server_id=None, section_id=None, row_ids=None, purge_only=False):
         monitor_db = database.MonitorDatabase()
 
-        try:
-            if section_id.isdigit():
-                logger.info(u"Tautulli Libraries :: Deleting all history for library id %s from database." % section_id)
-                session_history_media_info_del = \
-                    monitor_db.action('DELETE FROM '
-                                      'session_history_media_info '
-                                      'WHERE session_history_media_info.id IN (SELECT session_history_media_info.id '
-                                      'FROM session_history_media_info '
-                                      'JOIN session_history_metadata ON session_history_media_info.id = session_history_metadata.id '
-                                      'WHERE session_history_metadata.section_id = ?)', [section_id])
-                session_history_del = \
-                    monitor_db.action('DELETE FROM '
-                                      'session_history '
-                                      'WHERE session_history.id IN (SELECT session_history.id '
-                                      'FROM session_history '
-                                      'JOIN session_history_metadata ON session_history.id = session_history_metadata.id '
-                                      'WHERE session_history_metadata.section_id = ?)', [section_id])
-                session_history_metadata_del = \
-                    monitor_db.action('DELETE FROM '
-                                      'session_history_metadata '
-                                      'WHERE session_history_metadata.section_id = ?', [section_id])
+        if row_ids and row_ids is not None:
+            row_ids = map(helpers.cast_to_int, row_ids.split(','))
 
-                return 'Deleted all items for section_id %s.' % section_id
+            # Get the user_ids corresponding to the row_ids
+            result = monitor_db.select('SELECT server_id, section_id FROM library_sections '
+                                       'WHERE id IN ({})'.format(','.join(['?'] * len(row_ids))), row_ids)
+
+            success = []
+            for library in result:
+                success.append(self.delete(server_id=library['server_id'], section_id=library['section_id'],
+                                           purge_only=purge_only))
+            return all(success)
+
+        elif server_id and str(section_id).isdigit():
+            database.delete_library_history(server_id=server_id, section_id=section_id)
+            if purge_only:
+                return True
             else:
-                return 'Unable to delete items, section_id not valid.'
-        except Exception as e:
-            logger.warn(u"Tautulli Libraries :: Unable to execute database query for delete_all_history: %s." % e)
+                logger.info(u"Tautulli Libraries :: Deleting library with server_id %s and section_id %s from database."
+                            % (server_id, section_id))
+                try:
+                    monitor_db.action('UPDATE library_sections '
+                                      'SET deleted_section = 1, keep_history = 0, do_notify = 0, do_notify_created = 0 '
+                                      'WHERE server_id = ? AND section_id = ?', [server_id, section_id])
+                    return True
+                except Exception as e:
+                    logger.warn(u"Tautulli Libraries :: Unable to execute database query for delete: %s." % e)
 
-    def delete(self, section_id=None):
-        monitor_db = database.MonitorDatabase()
-
-        try:
-            if section_id.isdigit():
-                self.delete_all_history(section_id)
-                logger.info(u"Tautulli Libraries :: Deleting library with id %s from database." % section_id)
-                monitor_db.action('UPDATE library_sections SET deleted_section = 1 WHERE section_id = ?', [section_id])
-                monitor_db.action('UPDATE library_sections SET keep_history = 0 WHERE section_id = ?', [section_id])
-                monitor_db.action('UPDATE library_sections SET do_notify = 0 WHERE section_id = ?', [section_id])
-                monitor_db.action('UPDATE library_sections SET do_notify_created = 0 WHERE section_id = ?', [section_id])
-
-                library_cards = plexpy.CONFIG.HOME_LIBRARY_CARDS
-                if section_id in library_cards:
-                    library_cards.remove(section_id)
-                    plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', library_cards)
-                    plexpy.CONFIG.write()
-
-                return 'Deleted library with id %s.' % section_id
-            else:
-                return 'Unable to delete library, section_id not valid.'
-        except Exception as e:
-            logger.warn(u"Tautulli Libraries :: Unable to execute database query for delete: %s." % e)
+        else:
+            return False
 
     def undelete(self, section_id=None, section_name=None):
         monitor_db = database.MonitorDatabase()
diff --git a/plexpy/users.py b/plexpy/users.py
index 20d9029f..cf61db0c 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -684,7 +684,8 @@ class Users(object):
             if purge_only:
                 return True
             else:
-                logger.info(u"Tautulli Users :: Deleting user with user_id %s from database." % user_id)
+                logger.info(u"Tautulli Users :: Deleting user with user_id %s from database."
+                            % user_id)
                 try:
                     monitor_db.action('UPDATE users '
                                       'SET deleted_user = 1, keep_history = 0, do_notify = 0 '
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 2b295ef0..6292e1fa 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -397,7 +397,7 @@ class WebInterface(object):
                           "do_notify_created": "Checked",
                           "duration": 1578037,
                           "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-                          "id": 1128,
+                          "histroy_row_id": 1128,
                           "is_active": 1,
                           "keep_history": "Checked",
                           "labels": [],
@@ -414,9 +414,11 @@ class WebInterface(object):
                           "parent_title": "",
                           "plays": 772,
                           "rating_key": 153037,
+                          "row_id": 1,
                           "section_id": 2,
                           "section_name": "TV Shows",
                           "section_type": "Show",
+                          "server_id": "ds48g4r354a8v9byrrtr697g3g79w",
                           "thumb": "/library/metadata/153036/thumb/1462175062",
                           "year": 2016
                           },
@@ -794,9 +796,11 @@ class WebInterface(object):
                      "library_art": "/:/resources/movie-fanart.jpg",
                      "library_thumb": "/:/resources/movie.png",
                      "parent_count": null,
+                     "row_id": 1,
                      "section_id": 1,
                      "section_name": "Movies",
-                     "section_type": "movie"
+                     "section_type": "movie",
+                     "server_id": "ds48g4r354a8v9byrrtr697g3g79w"
                      }
             ```
         """
@@ -906,57 +910,59 @@ class WebInterface(object):
     @cherrypy.tools.json_out()
     @requireAuth(member_of("admin"))
     @addtoapi()
-    def delete_all_library_history(self, section_id, **kwargs):
+    def delete_all_library_history(self, server_id=None, section_id=None, row_ids=None, **kwargs):
         """ Delete all Tautulli history for a specific library.
 
             ```
             Required parameters:
+                server_id (str):        The Plex server identifier of the library section
                 section_id (str):       The id of the Plex library section
 
             Optional parameters:
-                None
+                row_ids (str):          Comma separated row ids to delete, e.g. "2,3,8"
 
             Returns:
                 None
             ```
         """
-        library_data = libraries.Libraries()
-
-        if section_id:
-            delete_row = library_data.delete_all_history(section_id=section_id)
-
-            if delete_row:
-                return {'message': delete_row}
+        if (server_id and section_id) or row_ids:
+            library_data = libraries.Libraries()
+            success = library_data.delete(server_id=server_id, section_id=section_id, row_ids=row_ids, purge_only=True)
+            if success:
+                return {'result': 'success', 'message': 'Deleted library history.'}
+            else:
+                return {'result': 'error', 'message': 'Failed to delete library(s) history.'}
         else:
-            return {'message': 'no data received'}
+            return {'result': 'error', 'message': 'No server id and section id or row ids received.'}
 
     @cherrypy.expose
     @cherrypy.tools.json_out()
     @requireAuth(member_of("admin"))
     @addtoapi()
-    def delete_library(self, section_id, **kwargs):
+    def delete_library(self, server_id=None, section_id=None, row_ids=None, **kwargs):
         """ Delete a library section from Tautulli. Also erases all history for the library.
 
             ```
             Required parameters:
+                server_id (str):        The Plex server identifier of the library section
                 section_id (str):       The id of the Plex library section
 
             Optional parameters:
-                None
+                row_ids (str):          Comma separated row ids to delete, e.g. "2,3,8"
 
             Returns:
                 None
             ```
         """
-        library_data = libraries.Libraries()
-
-        if section_id:
-            delete_row = library_data.delete(section_id=section_id)
-
-            if delete_row:
-                return {'message': delete_row}
+        if (server_id and section_id) or row_ids:
+            library_data = libraries.Libraries()
+            success = library_data.delete(server_id=server_id, section_id=section_id, row_ids=row_ids)
+            if success:
+                return {'result': 'success', 'message': 'Deleted library.'}
+            else:
+                return {'result': 'error', 'message': 'Failed to delete library(s).'}
         else:
-            return {'message': 'no data received'}
+            return {'result': 'error', 'message': 'No server id and section id or row ids received.'}
 
     @cherrypy.expose
     @cherrypy.tools.json_out()
@@ -1291,7 +1297,7 @@ class WebInterface(object):
                      "data":
                         [{"friendly_name": "Jon Snow",
                           "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-                          "history_row_id": 1121,
+                          "id": 1121,
                           "ip_address": "xxx.xxx.xxx.xxx",
                           "last_played": "Game of Thrones - The Red Woman",
                           "last_seen": 1462591869,

From 899d2fbf9dfd4cd0d1dfe5bd9739905f708361d2 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 14:03:32 -0700
Subject: [PATCH 17/26] Make library delete server_id optional

---
 plexpy/libraries.py | 3 ++-
 plexpy/users.py     | 3 ++-
 plexpy/webserve.py  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plexpy/libraries.py b/plexpy/libraries.py
index 79e520ba..1cdf54b0 100644
--- a/plexpy/libraries.py
+++ b/plexpy/libraries.py
@@ -1040,7 +1040,8 @@ class Libraries(object):
                                            purge_only=purge_only))
             return all(success)
 
-        elif server_id and str(section_id).isdigit():
+        elif str(section_id).isdigit():
+            server_id = server_id or plexpy.CONFIG.PMS_IDENTIFIER
             database.delete_library_history(server_id=server_id, section_id=section_id)
             if purge_only:
                 return True
diff --git a/plexpy/users.py b/plexpy/users.py
index cf61db0c..55f04c19 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -676,7 +676,8 @@ class Users(object):
 
             success = []
             for user in result:
-                success.append(self.delete(user_id=user['user_id'], purge_only=purge_only))
+                success.append(self.delete(user_id=user['user_id'],
+                                           purge_only=purge_only))
             return all(success)
 
         elif str(user_id).isdigit():
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 6292e1fa..7389ceaa 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -915,10 +915,10 @@ class WebInterface(object):
 
             ```
             Required parameters:
-                server_id (str):        The Plex server identifier of the library section
                 section_id (str):       The id of the Plex library section
 
             Optional parameters:
+                server_id (str):        The Plex server identifier of the library section
                 row_ids (str):          Comma separated row ids to delete, e.g. "2,3,8"
 
             Returns:
@@ -944,10 +944,10 @@ class WebInterface(object):
 
             ```
             Required parameters:
-                server_id (str):        The Plex server identifier of the library section
                 section_id (str):       The id of the Plex library section
 
             Optional parameters:
+                server_id (str):        The Plex server identifier of the library section
                 row_ids (str):          Comma separated row ids to delete, e.g. "2,3,8"
 
             Returns:

From f484604c69cfae2dc1fe238cf3e94970dfa69807 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 14:07:03 -0700
Subject: [PATCH 18/26] Simplify user undelete function

---
 plexpy/users.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plexpy/users.py b/plexpy/users.py
index 55f04c19..51fa6903 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -707,9 +707,9 @@ class Users(object):
                 result = monitor_db.select(query=query, args=[user_id])
                 if result:
                     logger.info(u"Tautulli Users :: Re-adding user with id %s to database." % user_id)
-                    monitor_db.action('UPDATE users SET deleted_user = 0 WHERE user_id = ?', [user_id])
-                    monitor_db.action('UPDATE users SET keep_history = 1 WHERE user_id = ?', [user_id])
-                    monitor_db.action('UPDATE users SET do_notify = 1 WHERE user_id = ?', [user_id])
+                    monitor_db.action('UPDATE users '
+                                      'SET deleted_user = 0, keep_history = 1, do_notify = 1 '
+                                      'WHERE user_id = ?', [user_id])
                     return True
                 else:
                     return False
@@ -719,9 +719,9 @@ class Users(object):
                 result = monitor_db.select(query=query, args=[username])
                 if result:
                     logger.info(u"Tautulli Users :: Re-adding user with username %s to database." % username)
-                    monitor_db.action('UPDATE users SET deleted_user = 0 WHERE username = ?', [username])
-                    monitor_db.action('UPDATE users SET keep_history = 1 WHERE username = ?', [username])
-                    monitor_db.action('UPDATE users SET do_notify = 1 WHERE username = ?', [username])
+                    monitor_db.action('UPDATE users '
+                                      'SET deleted_user = 0, keep_history = 1, do_notify = 1 '
+                                      'WHERE username = ?', [username])
                     return True
                 else:
                     return False

From 5f26d0085db3ff219080be4673ea2581d0f36eb3 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 14:07:15 -0700
Subject: [PATCH 19/26] Simplify library undelete function

---
 plexpy/libraries.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plexpy/libraries.py b/plexpy/libraries.py
index 1cdf54b0..1a063f5d 100644
--- a/plexpy/libraries.py
+++ b/plexpy/libraries.py
@@ -1068,10 +1068,10 @@ class Libraries(object):
                 result = monitor_db.select(query=query, args=[section_id])
                 if result:
                     logger.info(u"Tautulli Libraries :: Re-adding library with id %s to database." % section_id)
-                    monitor_db.action('UPDATE library_sections SET deleted_section = 0 WHERE section_id = ?', [section_id])
-                    monitor_db.action('UPDATE library_sections SET keep_history = 1 WHERE section_id = ?', [section_id])
-                    monitor_db.action('UPDATE library_sections SET do_notify = 1 WHERE section_id = ?', [section_id])
-                    monitor_db.action('UPDATE library_sections SET do_notify_created = 1 WHERE section_id = ?', [section_id])
+                    monitor_db.action('UPDATE library_sections '
+                                      'SET deleted_section = 0, keep_history = 1, do_notify = 1, do_notify_created = 1 '
+                                      'WHERE section_id = ?',
+                                      [section_id])
                     return True
                 else:
                     return False
@@ -1081,10 +1081,10 @@ class Libraries(object):
                 result = monitor_db.select(query=query, args=[section_name])
                 if result:
                     logger.info(u"Tautulli Libraries :: Re-adding library with name %s to database." % section_name)
-                    monitor_db.action('UPDATE library_sections SET deleted_section = 0 WHERE section_name = ?', [section_name])
-                    monitor_db.action('UPDATE library_sections SET keep_history = 1 WHERE section_name = ?', [section_name])
-                    monitor_db.action('UPDATE library_sections SET do_notify = 1 WHERE section_name = ?', [section_name])
-                    monitor_db.action('UPDATE library_sections SET do_notify_created = 1 WHERE section_name = ?', [section_name])
+                    monitor_db.action('UPDATE library_sections '
+                                      'SET deleted_section = 0, keep_history = 1, do_notify = 1, do_notify_created = 1 '
+                                      'WHERE section_name = ?',
+                                      [section_name])
                     return True
                 else:
                     return False

From 440adfb914d50535aa5b0026eb7fa256631782f3 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 14:12:38 -0700
Subject: [PATCH 20/26] Fix missing page functions in library table

---
 data/interfaces/default/js/tables/libraries.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/interfaces/default/js/tables/libraries.js b/data/interfaces/default/js/tables/libraries.js
index 37be26ca..34239c3d 100644
--- a/data/interfaces/default/js/tables/libraries.js
+++ b/data/interfaces/default/js/tables/libraries.js
@@ -45,12 +45,12 @@ libraries_list_table_options = {
                 if (!rowData['is_active']) { inactive = '<span class="inactive-library-tooltip" data-toggle="tooltip" title="Library not on Plex server"><i class="fa fa-exclamation-triangle"></i></span>'; }
                 if (cellData !== null && cellData !== '') {
                     if (rowData['library_thumb'].substring(0, 4) == "http") {
-                        $(td).html('<a href="library?section_id=' + rowData['section_id'] + '"><div class="libraries-poster-face" style="background-image: url(' + rowData['library_thumb'] + ');">' + inactive + '</div></a>');
+                        $(td).html('<a href="' + page('library', rowData['section_id']) + '"><div class="libraries-poster-face" style="background-image: url(' + rowData['library_thumb'] + ');">' + inactive + '</div></a>');
                     } else {
-                        $(td).html('<a href="library?section_id=' + rowData['section_id'] + '"><div class="libraries-poster-face svg-icon library-' + rowData['section_type'] + '">' + inactive + '</div></a>');
+                        $(td).html('<a href="' + page('library', rowData['section_id']) + '"><div class="libraries-poster-face svg-icon library-' + rowData['section_type'] + '">' + inactive + '</div></a>');
                     }
                 } else {
-                    $(td).html('<a href="library?section_id=' + rowData['section_id'] + '"><div class="libraries-poster-face" style="background-image: url(../../images/cover.png);">' + inactive + '</div></a>');
+                    $(td).html('<a href="' + page('library', rowData['section_id']) + '"><div class="libraries-poster-face" style="background-image: url(../../images/cover.png);">' + inactive + '</div></a>');
                 }
             },
             "orderable": false,
@@ -64,7 +64,7 @@ libraries_list_table_options = {
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== null && cellData !== '') {
                     $(td).html('<div data-id="' + rowData['row_id'] + '">' +
-                        '<a href="library?section_id=' + rowData['section_id'] + '">' + cellData + '</a>' +
+                        '<a href="' + page('library', rowData['section_id']) + '">' + cellData + '</a>' +
                         '</div>');
                 } else {
                     $(td).html('n/a');

From 4de7884e395c54559d2163361bb9a7708ff438b7 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 14:14:34 -0700
Subject: [PATCH 21/26] Update API docs with all delete function changes

---
 API.md | 46 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/API.md b/API.md
index c160ca68..0d5942db 100644
--- a/API.md
+++ b/API.md
@@ -88,7 +88,8 @@ Required parameters:
     section_id (str):       The id of the Plex library section
 
 Optional parameters:
-    None
+    server_id (str):        The Plex server identifier of the library section
+    row_ids (str):          Comma separated row ids to delete, e.g. "2,3,8"
 
 Returns:
     None
@@ -103,7 +104,7 @@ Required parameters:
     user_id (str):          The id of the Plex user
 
 Optional parameters:
-    None
+    row_ids (str):          Comma separated row ids to delete, e.g. "2,3,8"
 
 Returns:
     None
@@ -114,6 +115,21 @@ Returns:
 Delete and recreate the cache directory.
 
 
+### delete_history
+Delete history rows from Tautulli.
+
+```
+Required parameters:
+    row_ids (str):          Comma separated row ids to delete, e.g. "65,110,2,3645"
+
+Optional parameters:
+    None
+
+Returns:
+    None
+```
+
+
 ### delete_hosted_images
 Delete the images uploaded to image hosting services.
 
@@ -146,7 +162,8 @@ Required parameters:
     section_id (str):       The id of the Plex library section
 
 Optional parameters:
-    None
+    server_id (str):        The Plex server identifier of the library section
+    row_ids (str):          Comma separated row ids to delete, e.g. "2,3,8"
 
 Returns:
     None
@@ -294,7 +311,7 @@ Required parameters:
     user_id (str):          The id of the Plex user
 
 Optional parameters:
-    None
+    row_ids (str):          Comma separated row ids to delete, e.g. "2,3,8"
 
 Returns:
     None
@@ -726,7 +743,6 @@ Returns:
               "group_count": 1,
               "group_ids": "1124",
               "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-              "id": 1124,
               "ip_address": "xxx.xxx.xxx.xxx",
               "live": 0,
               "media_index": 17,
@@ -742,6 +758,7 @@ Returns:
               "player": "Castle-PC",
               "rating_key": 4348,
               "reference_id": 1123,
+              "row_id": 1124,
               "session_key": null,
               "started": 1462688107,
               "state": null,
@@ -895,7 +912,7 @@ Returns:
               "do_notify_created": "Checked",
               "duration": 1578037,
               "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-              "id": 1128,
+              "histroy_row_id": 1128,
               "is_active": 1,
               "keep_history": "Checked",
               "labels": [],
@@ -912,9 +929,11 @@ Returns:
               "parent_title": "",
               "plays": 772,
               "rating_key": 153037,
+              "row_id": 1,
               "section_id": 2,
               "section_name": "TV Shows",
               "section_type": "Show",
+              "server_id": "ds48g4r354a8v9byrrtr697g3g79w",
               "thumb": "/library/metadata/153036/thumb/1462175062",
               "year": 2016
               },
@@ -947,9 +966,11 @@ Returns:
          "library_art": "/:/resources/movie-fanart.jpg",
          "library_thumb": "/:/resources/movie.png",
          "parent_count": null,
+         "row_id": 1,
          "section_id": 1,
          "section_name": "Movies",
-         "section_type": "movie"
+         "section_type": "movie",
+         "server_id": "ds48g4r354a8v9byrrtr697g3g79w"
          }
 ```
 
@@ -1065,11 +1086,11 @@ Get a library's watch time statistics.
 
 ```
 Required parameters:
-    section_id (str):               The id of the Plex library section
+    section_id (str):       The id of the Plex library section
 
 Optional parameters:
     grouping (int):         0 or 1
-    query_days (str):       Comma separated days, e.g. "1, 7, 30, 0"
+    query_days (str):       Comma separated days, e.g. "1,7,30,0"
 
 Returns:
     json:
@@ -2232,6 +2253,7 @@ Returns:
          "is_home_user": 1,
          "is_restricted": 0,
          "keep_history": 1,
+         "row_id": 1,
          "shared_libraries": ["10", "1", "4", "5", "15", "20", "2"],
          "user_id": 133788,
          "user_thumb": "https://plex.tv/users/k10w42309cynaopq/avatar",
@@ -2384,7 +2406,7 @@ Required parameters:
 
 Optional parameters:
     grouping (int):         0 or 1
-    query_days (str):       Comma separated days, e.g. "1, 7, 30, 0"
+    query_days (str):       Comma separated days, e.g. "1,7,30,0"
 
 Returns:
     json:
@@ -2434,6 +2456,7 @@ Returns:
           "is_home_user": 1,
           "is_restricted": 0,
           "keep_history": 1,
+          "row_id": 1,
           "server_token": "PU9cMuQZxJKFBtGqHk68",
           "shared_libraries": "1;2;3",
           "thumb": "https://plex.tv/users/k10w42309cynaopq/avatar",
@@ -2473,7 +2496,7 @@ Returns:
               "duration": 2998290,
               "friendly_name": "Jon Snow",
               "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-              "id": 1121,
+              "history_row_id": 1121,
               "ip_address": "xxx.xxx.xxx.xxx",
               "is_active": 1,
               "keep_history": "Checked",
@@ -2489,6 +2512,7 @@ Returns:
               "player": "Plex Web (Chrome)",
               "plays": 487,
               "rating_key": 153037,
+              "row_id": 1,
               "thumb": "/library/metadata/153036/thumb/1462175062",
               "transcode_decision": "transcode",
               "user_id": 133788,

From 97089846e9a745faeb385781cec0915a4391aa25 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 14:31:12 -0700
Subject: [PATCH 22/26] Make inactive user/library triangle always orange

---
 data/interfaces/default/css/tautulli.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/interfaces/default/css/tautulli.css b/data/interfaces/default/css/tautulli.css
index 59182e37..7d64c4e9 100644
--- a/data/interfaces/default/css/tautulli.css
+++ b/data/interfaces/default/css/tautulli.css
@@ -3127,6 +3127,7 @@ div.dataTables_info {
 }
 .inactive-library-tooltip i.fa,
 .inactive-user-tooltip i.fa {
+    color: #E5A00D;
     position: absolute;
     right: 0;
     bottom: 0;

From 6399c90642463ac49cc35f6189bfb29455168640 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 14:36:51 -0700
Subject: [PATCH 23/26] Fix platform icon size on activity card

---
 data/interfaces/default/css/tautulli.css               | 1 -
 data/interfaces/default/current_activity_instance.html | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/data/interfaces/default/css/tautulli.css b/data/interfaces/default/css/tautulli.css
index 7d64c4e9..50e387c8 100644
--- a/data/interfaces/default/css/tautulli.css
+++ b/data/interfaces/default/css/tautulli.css
@@ -856,7 +856,6 @@ a .users-poster-face:hover {
     z-index: 2;
 }
 .dashboard-activity-info-platform {
-    padding: 6px !important;
     background-position: center;
     background-size: cover;
     width: 50px;
diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html
index 32989dae..45ee7703 100644
--- a/data/interfaces/default/current_activity_instance.html
+++ b/data/interfaces/default/current_activity_instance.html
@@ -143,7 +143,7 @@ DOCUMENTATION :: END
                 <div id="platform-${sk}" class="dashboard-activity-info-platform${no_terminate} svg-icon platform-${data['platform_name']}" title="${data['platform']}"></div>
                 % if _session['user_group'] == 'admin' and plexpy.CONFIG.PMS_PLEXPASS and data['session_id']:
                 <div class="dashboard-activity-terminate-session" id="terminate-button-${sk}" data-key="${sk}" data-id="${data['session_id']}" data-toggle="tooltip" title="Terminate Stream">
-                    <i class="fa fa-times" style="padding-top: 8px;"></i>
+                    <i class="fa fa-times" style="padding-top: 10px;"></i>
                 </div>
                 % endif
             </div>

From 752c7badd245993a7f06e8884ae74a4f7b5606a2 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 14:41:14 -0700
Subject: [PATCH 24/26] Make inactive icon larger on library/user page

---
 data/interfaces/default/library.html | 4 ++--
 data/interfaces/default/user.html    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/interfaces/default/library.html b/data/interfaces/default/library.html
index a3a68296..bd86c04b 100644
--- a/data/interfaces/default/library.html
+++ b/data/interfaces/default/library.html
@@ -65,7 +65,7 @@ DOCUMENTATION :: END
                             <div class="library-info-poster-face" style="background-image: url(${page('pms_image_proxy', data['library_thumb'], None, 80, 80)});">
                                 % if not data['is_active']:
                                 <span class="inactive-library-tooltip" data-toggle="tooltip" title="Library not on Plex server">
-                                    <i class="fa fa-lg fa-exclamation-triangle"></i>
+                                    <i class="fa fa-2x fa-exclamation-triangle"></i>
                                 </span>
                                 % endif
                             </div>
@@ -73,7 +73,7 @@ DOCUMENTATION :: END
                             <div class="library-info-poster-face svg-icon library-${data['section_type']}">
                                 % if not data['is_active']:
                                 <span class="inactive-library-tooltip" data-toggle="tooltip" title="Library not on Plex server">
-                                    <i class="fa fa-lg fa-exclamation-triangle"></i>
+                                    <i class="fa fa-2x fa-exclamation-triangle"></i>
                                 </span>
                                 % endif
                             </div>
diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html
index 1875ba7b..0051afec 100644
--- a/data/interfaces/default/user.html
+++ b/data/interfaces/default/user.html
@@ -54,7 +54,7 @@ DOCUMENTATION :: END
                             <div class="user-info-poster-face" style="background-image: url(${data['user_thumb']});">
                                 % if not data['is_active']:
                                 <span class="inactive-user-tooltip" data-toggle="tooltip" title="User not on Plex server">
-                                    <i class="fa fa-lg fa-exclamation-triangle"></i>
+                                    <i class="fa fa-2x fa-exclamation-triangle"></i>
                                 </span>
                                 % endif
                             </div>

From a4eda99a4ab9dcadb25cd8d225120019f852c0c6 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 14:44:14 -0700
Subject: [PATCH 25/26] Update API docs to mention enabling api_sql while
 Tautulli is shut down

---
 API.md         | 2 +-
 plexpy/api2.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/API.md b/API.md
index 0d5942db..a84647db 100644
--- a/API.md
+++ b/API.md
@@ -2774,7 +2774,7 @@ Returns:
 ### sql
 Query the Tautulli database with raw SQL. Automatically makes a backup of
 the database if the latest backup is older then 24h. `api_sql` must be
-manually enabled in the config file.
+manually enabled in the config file while Tautulli is shut down.
 
 ```
 Required parameters:
diff --git a/plexpy/api2.py b/plexpy/api2.py
index 7a50f803..eb3ced99 100644
--- a/plexpy/api2.py
+++ b/plexpy/api2.py
@@ -292,7 +292,7 @@ class API2:
     def sql(self, query=''):
         """ Query the Tautulli database with raw SQL. Automatically makes a backup of
             the database if the latest backup is older then 24h. `api_sql` must be
-            manually enabled in the config file.
+            manually enabled in the config file while Tautulli is shut down.
 
             ```
             Required parameters:

From 33d860384c4d85295b91e4f2f4dd89c26627d521 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 10 Apr 2020 15:11:32 -0700
Subject: [PATCH 26/26] Add Tautulli database corruption notification trigger

---
 plexpy/__init__.py  | 18 ++++++++++++++++++
 plexpy/database.py  |  1 +
 plexpy/notifiers.py |  8 ++++++++
 3 files changed, 27 insertions(+)

diff --git a/plexpy/__init__.py b/plexpy/__init__.py
index b422c922..c82f265b 100644
--- a/plexpy/__init__.py
+++ b/plexpy/__init__.py
@@ -696,16 +696,19 @@ def dbcheck():
         'on_created INTEGER DEFAULT 0, on_extdown INTEGER DEFAULT 0, on_intdown INTEGER DEFAULT 0, '
         'on_extup INTEGER DEFAULT 0, on_intup INTEGER DEFAULT 0, on_pmsupdate INTEGER DEFAULT 0, '
         'on_concurrent INTEGER DEFAULT 0, on_newdevice INTEGER DEFAULT 0, on_plexpyupdate INTEGER DEFAULT 0, '
+        'on_plexpydbcorrupt INTEGER DEFAULT 0, '
         'on_play_subject TEXT, on_stop_subject TEXT, on_pause_subject TEXT, '
         'on_resume_subject TEXT, on_change_subject TEXT, on_buffer_subject TEXT, on_watched_subject TEXT, '
         'on_created_subject TEXT, on_extdown_subject TEXT, on_intdown_subject TEXT, '
         'on_extup_subject TEXT, on_intup_subject TEXT, on_pmsupdate_subject TEXT, '
         'on_concurrent_subject TEXT, on_newdevice_subject TEXT, on_plexpyupdate_subject TEXT, '
+        'on_plexpydbcorrupt_subject TEXT, '
         'on_play_body TEXT, on_stop_body TEXT, on_pause_body TEXT, '
         'on_resume_body TEXT, on_change_body TEXT, on_buffer_body TEXT, on_watched_body TEXT, '
         'on_created_body TEXT, on_extdown_body TEXT, on_intdown_body TEXT, '
         'on_extup_body TEXT, on_intup_body TEXT, on_pmsupdate_body TEXT, '
         'on_concurrent_body TEXT, on_newdevice_body TEXT, on_plexpyupdate_body TEXT, '
+        'on_plexpydbcorrupt_body TEXT, '
         'custom_conditions TEXT, custom_conditions_logic TEXT)'
     )
 
@@ -2009,6 +2012,21 @@ def dbcheck():
             'ALTER TABLE notifiers ADD COLUMN on_change_body TEXT'
         )
 
+    # Upgrade notifiers table from earlier versions
+    try:
+        c_db.execute('SELECT on_plexpydbcorrupt FROM notifiers')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table notifiers.")
+        c_db.execute(
+            'ALTER TABLE notifiers ADD COLUMN on_plexpydbcorrupt INTEGER DEFAULT 0'
+        )
+        c_db.execute(
+            'ALTER TABLE notifiers ADD COLUMN on_plexpydbcorrupt_subject TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE notifiers ADD COLUMN on_plexpydbcorrupt_body TEXT'
+        )
+
     # Upgrade tvmaze_lookup table from earlier versions
     try:
         c_db.execute('SELECT rating_key FROM tvmaze_lookup')
diff --git a/plexpy/database.py b/plexpy/database.py
index b88b190a..19d0b6e9 100644
--- a/plexpy/database.py
+++ b/plexpy/database.py
@@ -120,6 +120,7 @@ def make_backup(cleanup=False, scheduler=False):
     corrupt = ''
     if not integrity:
         corrupt = '.corrupt'
+        plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_plexpydbcorrupt'})
 
     if scheduler:
         backup_file = 'tautulli.backup-{}{}.sched.db'.format(arrow.now().format('YYYYMMDDHHmmss'), corrupt)
diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index 049554d0..64dd8cbc 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -339,6 +339,14 @@ def available_notification_actions():
                 'body': 'An update is available for Tautulli (version {tautulli_update_version}).',
                 'icon': 'fa-refresh',
                 'media_types': ('server',)
+                },
+               {'label': 'Tautulli Database Corruption',
+                'name': 'on_plexpydbcorrupt',
+                'description': 'Trigger a notification if Tautulli database corruption is detected when backing up the database.',
+                'subject': 'Tautulli ({server_name})',
+                'body': 'Tautulli database corruption detected. Automatic cleanup of database backups is suspended.',
+                'icon': 'fa-database',
+                'media_types': ('server',)
                 }
                ]