From 2ef40a6a1cc6a01574269a360a24b5edc23a0854 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Sun, 24 May 2020 01:10:26 -0700
Subject: [PATCH] Remove shadow database module name

---
 plexpy/plexivity_import.py | 12 ++++++------
 plexpy/plexwatch_import.py | 12 ++++++------
 plexpy/webserve.py         |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/plexpy/plexivity_import.py b/plexpy/plexivity_import.py
index 6e51fa23..b79f834f 100644
--- a/plexpy/plexivity_import.py
+++ b/plexpy/plexivity_import.py
@@ -24,14 +24,12 @@ from xml.dom import minidom
 
 import plexpy
 if plexpy.PYTHON2:
-    import activity_pinger
     import activity_processor
     import database
     import helpers
     import logger
     import users
 else:
-    from plexpy import activity_pinger
     from plexpy import activity_processor
     from plexpy import database
     from plexpy import helpers
@@ -248,9 +246,10 @@ def extract_plexivity_xml(xml=None):
 
     return output
 
-def validate_database(database=None, table_name=None):
+
+def validate_database(database_file=None, table_name=None):
     try:
-        connection = sqlite3.connect(database, timeout=20)
+        connection = sqlite3.connect(database_file, timeout=20)
     except sqlite3.OperationalError:
         logger.error("Tautulli Importer :: Invalid database specified.")
         return 'Invalid database specified.'
@@ -273,10 +272,11 @@ def validate_database(database=None, table_name=None):
 
     return 'success'
 
-def import_from_plexivity(database=None, table_name=None, import_ignore_interval=0):
+
+def import_from_plexivity(database_file=None, table_name=None, import_ignore_interval=0):
 
     try:
-        connection = sqlite3.connect(database, timeout=20)
+        connection = sqlite3.connect(database_file, timeout=20)
         connection.row_factory = sqlite3.Row
     except sqlite3.OperationalError:
         logger.error("Tautulli Importer :: Invalid filename.")
diff --git a/plexpy/plexwatch_import.py b/plexpy/plexwatch_import.py
index e23975f6..7b6bc908 100644
--- a/plexpy/plexwatch_import.py
+++ b/plexpy/plexwatch_import.py
@@ -23,14 +23,12 @@ from xml.dom import minidom
 
 import plexpy
 if plexpy.PYTHON2:
-    import activity_pinger
     import activity_processor
     import database
     import helpers
     import logger
     import users
 else:
-    from plexpy import activity_pinger
     from plexpy import activity_processor
     from plexpy import database
     from plexpy import helpers
@@ -239,9 +237,10 @@ def extract_plexwatch_xml(xml=None):
 
     return output
 
-def validate_database(database=None, table_name=None):
+
+def validate_database(database_file=None, table_name=None):
     try:
-        connection = sqlite3.connect(database, timeout=20)
+        connection = sqlite3.connect(database_file, timeout=20)
     except sqlite3.OperationalError:
         logger.error("Tautulli Importer :: Invalid database specified.")
         return 'Invalid database specified.'
@@ -264,10 +263,11 @@ def validate_database(database=None, table_name=None):
 
     return 'success'
 
-def import_from_plexwatch(database=None, table_name=None, import_ignore_interval=0):
+
+def import_from_plexwatch(database_file=None, table_name=None, import_ignore_interval=0):
 
     try:
-        connection = sqlite3.connect(database, timeout=20)
+        connection = sqlite3.connect(database_file, timeout=20)
         connection.row_factory = sqlite3.Row
     except sqlite3.OperationalError:
         logger.error("Tautulli Importer :: Invalid filename.")
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 9f42672c..c36bcc97 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -3802,11 +3802,11 @@ class WebInterface(object):
                 return {'result': 'error', 'message': db_check_msg}
 
         elif app.lower() == 'plexwatch':
-            db_check_msg = plexwatch_import.validate_database(database=database_path,
+            db_check_msg = plexwatch_import.validate_database(database_file=database_path,
                                                               table_name=table_name)
             if db_check_msg == 'success':
                 threading.Thread(target=plexwatch_import.import_from_plexwatch,
-                                 kwargs={'database': database_path,
+                                 kwargs={'database_file': database_path,
                                          'table_name': table_name,
                                          'import_ignore_interval': import_ignore_interval}).start()
                 return {'result': 'success',
@@ -3817,11 +3817,11 @@ class WebInterface(object):
                 return {'result': 'error', 'message': db_check_msg}
 
         elif app.lower() == 'plexivity':
-            db_check_msg = plexivity_import.validate_database(database=database_path,
+            db_check_msg = plexivity_import.validate_database(database_file=database_path,
                                                               table_name=table_name)
             if db_check_msg == 'success':
                 threading.Thread(target=plexivity_import.import_from_plexivity,
-                                 kwargs={'database': database_path,
+                                 kwargs={'database_file': database_path,
                                          'table_name': table_name,
                                          'import_ignore_interval': import_ignore_interval}).start()
                 return {'result': 'success',