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

Improve validating database before import

Browse Source
This commit is contained in:
JonnyWong16
2020-05-02 23:14:17 -07:00
parent 15a638b86e
commit a869859491
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plexpy/database.py
View File

@@ -39,10 +39,17 @@ db_lock = threading.Lock()
def validate_database(database=None): def validate_database(database=None):
try: try:
connection = sqlite3.connect(database, timeout=20) connection = sqlite3.connect(database, timeout=20)
except sqlite3.OperationalError as e: except (sqlite3.OperationalError, sqlite3.DatabaseError, ValueError) as e:
logger.error("Tautulli Database :: Invalid database specified: %s", e) logger.error("Tautulli Database :: Invalid database specified: %s", e)
return 'Invalid database specified' return 'Invalid database specified'
except ValueError as e: except Exception as e:
logger.error("Tautulli Database :: Uncaught exception: %s", e)
return 'Uncaught exception'
try:
connection.execute('SELECT started from session_history')
connection.close()
except (sqlite3.OperationalError, sqlite3.DatabaseError, ValueError) as e:
logger.error("Tautulli Database :: Invalid database specified: %s", e) logger.error("Tautulli Database :: Invalid database specified: %s", e)
return 'Invalid database specified' return 'Invalid database specified'
except Exception as e: except Exception as e: