github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-08 14:10:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove shadow database module name

Browse source
This commit is contained in:
JonnyWong16 2020-05-24 01:10:26 -07:00
parent 5b5c4d1a8b
commit 2ef40a6a1c
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plexpy/plexivity_import.py
View file

@ -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.")

12
plexpy/plexwatch_import.py
View file

@ -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.")

8
plexpy/webserve.py
View file

@ -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',