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

Fix notifiers.py

Browse source
This commit is contained in:
JonnyWong16 2023-04-21 16:17:54 -07:00
commit d9d65b25fb
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plexpy/notifiers.py
View file

@ -507,7 +507,7 @@ def get_notifiers(notifier_id=None, notify_action=None):
where += ' AND '.join([w for w in [where_id, where_action] if w]) where += ' AND '.join([w for w in [where_id, where_action] if w])
db = database.MonitorDatabase() db = database.MonitorDatabase()
result = db.select('SELECT id, agent_id, agent_name, agent_label, friendly_name, %s FROM notifiers %s' result = db.select("SELECT id, agent_id, agent_name, agent_label, friendly_name, %s FROM notifiers %s"
% (', '.join(notify_actions), where), args=args) % (', '.join(notify_actions), where), args=args)
for item in result: for item in result:
@ -522,7 +522,7 @@ def delete_notifier(notifier_id=None):
if str(notifier_id).isdigit(): if str(notifier_id).isdigit():
logger.debug("Tautulli Notifiers :: Deleting notifier_id %s from the database." logger.debug("Tautulli Notifiers :: Deleting notifier_id %s from the database."
% notifier_id) % notifier_id)
result = db.action('DELETE FROM notifiers WHERE id = ?', args=[notifier_id]) result = db.action("DELETE FROM notifiers WHERE id = ?", args=[notifier_id])
return True return True
else: else:
return False return False
@ -537,7 +537,7 @@ def get_notifier_config(notifier_id=None, mask_passwords=False):
return None return None
db = database.MonitorDatabase() db = database.MonitorDatabase()
result = db.select_single('SELECT * FROM notifiers WHERE id = ?', args=[notifier_id]) result = db.select_single("SELECT * FROM notifiers WHERE id = ?", args=[notifier_id])
if not result: if not result:
return None return None
@ -3866,8 +3866,8 @@ class TAUTULLIREMOTEAPP(Notifier):
db = database.MonitorDatabase() db = database.MonitorDatabase()
try: try:
query = 'SELECT * FROM mobile_devices WHERE official = 1 ' \ query = "SELECT * FROM mobile_devices WHERE official = 1 " \
'AND onesignal_id IS NOT NULL AND onesignal_id != ""' "AND onesignal_id IS NOT NULL AND onesignal_id != ''"
return db.select(query=query) return db.select(query=query)
except Exception as e: except Exception as e:
logger.warn("Tautulli Notifiers :: Unable to retrieve Tautulli Remote app devices list: %s." % e) logger.warn("Tautulli Notifiers :: Unable to retrieve Tautulli Remote app devices list: %s." % e)
@ -4472,8 +4472,8 @@ def check_browser_enabled():
def get_browser_notifications(): def get_browser_notifications():
db = database.MonitorDatabase() db = database.MonitorDatabase()
result = db.select('SELECT notifier_id, subject_text, body_text FROM notify_log ' result = db.select("SELECT notifier_id, subject_text, body_text FROM notify_log "
'WHERE agent_id = 17 AND timestamp >= ? ', "WHERE agent_id = 17 AND timestamp >= ? ",
args=[time.time() - 5]) args=[time.time() - 5])
notifications = [] notifications = []