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

Fix API SQL command

Browse source
This commit is contained in:
JonnyWong16 2016-10-28 20:35:39 -07:00
parent 9cd8ed12b9
commit 8b0959aa69
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
plexpy/api2.py
View file

@ -277,18 +277,23 @@ class API2:
None None
``` ```
""" """
if not plexpy.CONFIG.API_SQL or not query: if not plexpy.CONFIG.API_SQL:
self._api_msg = 'SQL not enabled for the API.'
return
if not query:
self._api_msg = 'No SQL query provided.'
return return
# allow the user to shoot them self # allow the user to shoot them self
# in the foot but not in the head.. # in the foot but not in the head..
if not len(os.listdir(plexpy.BACKUP_DIR)): if not len(os.listdir(plexpy.CONFIG.BACKUP_DIR)):
self.backupdb() self.backup_db()
else: else:
# If the backup is less then 24 h old lets make a backup # If the backup is less then 24 h old lets make a backup
if any([os.path.getctime(os.path.join(plexpy.BACKUP_DIR, file_)) < if any([os.path.getctime(os.path.join(plexpy.CONFIG.BACKUP_DIR, file_)) < (time.time() - 86400)
(time.time() - 86400) for file_ in os.listdir(plexpy.BACKUP_DIR)]): and file_.endswith('.db') for file_ in os.listdir(plexpy.CONFIG.BACKUP_DIR)]):
self.backupdb() self.backup_db()
db = database.MonitorDatabase() db = database.MonitorDatabase()
rows = db.select(query) rows = db.select(query)
@ -323,14 +328,14 @@ class API2:
""" Restart PlexPy. """ """ Restart PlexPy. """
plexpy.SIGNAL = 'restart' plexpy.SIGNAL = 'restart'
self.msg = 'Restarting plexpy' self._api_msg = 'Restarting plexpy'
self.result_type = 'success' self.result_type = 'success'
def update(self, **kwargs): def update(self, **kwargs):
""" Check for PlexPy updates on Github. """ """ Check for PlexPy updates on Github. """
plexpy.SIGNAL = 'update' plexpy.SIGNAL = 'update'
self.msg = 'Updating plexpy' self._api_msg = 'Updating plexpy'
self.result_type = 'success' self.result_type = 'success'
def refresh_libraries_list(self, **kwargs): def refresh_libraries_list(self, **kwargs):
@ -429,7 +434,7 @@ General optional parameters:
plexpy.CONFIG.API_KEY = apikey plexpy.CONFIG.API_KEY = apikey
plexpy.CONFIG.write() plexpy.CONFIG.write()
else: else:
self.msg = 'Authentication is enabled, please add the correct username and password to the parameters' self._api_msg = 'Authentication is enabled, please add the correct username and password to the parameters'
else: else:
if plexpy.CONFIG.API_KEY: if plexpy.CONFIG.API_KEY:
self.data = plexpy.CONFIG.API_KEY self.data = plexpy.CONFIG.API_KEY