anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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