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 newsletters.py

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

18
plexpy/newsletters.py
View file

@ -117,15 +117,15 @@ def get_newsletters(newsletter_id=None):
args = [] args = []
if newsletter_id: if newsletter_id:
where = 'WHERE ' where = "WHERE "
if newsletter_id: if newsletter_id:
where_id += 'id = ?' where_id += "id = ?"
args.append(newsletter_id) args.append(newsletter_id)
where += ' AND '.join([w for w in [where_id] if w]) where += " AND ".join([w for w in [where_id] if w])
db = database.MonitorDatabase() db = database.MonitorDatabase()
result = db.select('SELECT id, agent_id, agent_name, agent_label, ' result = db.select("SELECT id, agent_id, agent_name, agent_label, "
'friendly_name, cron, active FROM newsletters %s' % where, args=args) "friendly_name, cron, active FROM newsletters %s" % where, args=args)
return result return result
@ -136,7 +136,7 @@ def delete_newsletter(newsletter_id=None):
if str(newsletter_id).isdigit(): if str(newsletter_id).isdigit():
logger.debug("Tautulli Newsletters :: Deleting newsletter_id %s from the database." logger.debug("Tautulli Newsletters :: Deleting newsletter_id %s from the database."
% newsletter_id) % newsletter_id)
result = db.action('DELETE FROM newsletters WHERE id = ?', args=[newsletter_id]) result = db.action("DELETE FROM newsletters WHERE id = ?", args=[newsletter_id])
return True return True
else: else:
return False return False
@ -151,7 +151,7 @@ def get_newsletter_config(newsletter_id=None, mask_passwords=False):
return None return None
db = database.MonitorDatabase() db = database.MonitorDatabase()
result = db.select_single('SELECT * FROM newsletters WHERE id = ?', args=[newsletter_id]) result = db.select_single("SELECT * FROM newsletters WHERE id = ?", args=[newsletter_id])
if not result: if not result:
return None return None
@ -309,7 +309,7 @@ def send_newsletter(newsletter_id=None, subject=None, body=None, message=None, n
def blacklist_logger(): def blacklist_logger():
db = database.MonitorDatabase() db = database.MonitorDatabase()
notifiers = db.select('SELECT newsletter_config, email_config FROM newsletters') notifiers = db.select("SELECT newsletter_config, email_config FROM newsletters")
for n in notifiers: for n in notifiers:
config = json.loads(n['newsletter_config'] or '{}') config = json.loads(n['newsletter_config'] or '{}')
@ -346,7 +346,7 @@ def generate_newsletter_uuid():
while not uuid or uuid_exists: while not uuid or uuid_exists:
uuid = plexpy.generate_uuid()[:8] uuid = plexpy.generate_uuid()[:8]
result = db.select_single( result = db.select_single(
'SELECT EXISTS(SELECT uuid FROM newsletter_log WHERE uuid = ?) as uuid_exists', [uuid]) "SELECT EXISTS(SELECT uuid FROM newsletter_log WHERE uuid = ?) as uuid_exists", [uuid])
uuid_exists = result['uuid_exists'] uuid_exists = result['uuid_exists']
return uuid return uuid