From 7b7c02c9c4e20d0f92ea8c891d4bad252b748d27 Mon Sep 17 00:00:00 2001 From: morpheus65535 <5130500+morpheus65535@users.noreply.github.com> Date: Mon, 23 Jul 2018 18:06:10 -0400 Subject: [PATCH] Updating notification system to support new services from apprise 0.0.9 --- bazarr.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++- requirements.txt | 2 +- update_db.py | 7 +++++++ 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/bazarr.py b/bazarr.py index c764993a0..4e25d056c 100644 --- a/bazarr.py +++ b/bazarr.py @@ -1,4 +1,4 @@ -bazarr_version = '0.5.5' +bazarr_version = '0.5.6' import gc gc.enable() @@ -934,6 +934,53 @@ def save_settings(): settings_notifier_XBMC_url = request.forms.get('settings_notifier_XBMC_url') c.execute("UPDATE table_settings_notifier SET enabled = ?, url = ? WHERE name = 'XBMC'", (settings_notifier_XBMC_enabled, settings_notifier_XBMC_url)) + settings_notifier_Discord_enabled = request.forms.get('settings_notifier_Discord_enabled') + if settings_notifier_Discord_enabled == 'on': + settings_notifier_Discord_enabled = 1 + else: + settings_notifier_Discord_enabled = 0 + settings_notifier_Discord_url = request.forms.get('settings_notifier_Discord_url') + c.execute("UPDATE table_settings_notifier SET enabled = ?, url = ? WHERE name = 'Discord'", (settings_notifier_Discord_enabled, settings_notifier_Discord_url)) + + settings_notifier_E_Mail_enabled = request.forms.get('settings_notifier_E-Mail_enabled') + if settings_notifier_E_Mail_enabled == 'on': + settings_notifier_E_Mail_enabled = 1 + else: + settings_notifier_E_Mail_enabled = 0 + settings_notifier_E_Mail_url = request.forms.get('settings_notifier_E-Mail_url') + c.execute("UPDATE table_settings_notifier SET enabled = ?, url = ? WHERE name = 'E-Mail'", (settings_notifier_E_Mail_enabled, settings_notifier_E_Mail_url)) + + settings_notifier_Emby_enabled = request.forms.get('settings_notifier_Emby_enabled') + if settings_notifier_Emby_enabled == 'on': + settings_notifier_Emby_enabled = 1 + else: + settings_notifier_Emby_enabled = 0 + settings_notifier_Emby_url = request.forms.get('settings_notifier_Emby_url') + c.execute("UPDATE table_settings_notifier SET enabled = ?, url = ? WHERE name = 'Emby'", (settings_notifier_Emby_enabled, settings_notifier_Emby_url)) + + settings_notifier_IFTTT_enabled = request.forms.get('settings_notifier_IFTTT_enabled') + if settings_notifier_IFTTT_enabled == 'on': + settings_notifier_IFTTT_enabled = 1 + else: + settings_notifier_IFTTT_enabled = 0 + settings_notifier_IFTTT_url = request.forms.get('settings_notifier_IFTTT_url') + c.execute("UPDATE table_settings_notifier SET enabled = ?, url = ? WHERE name = 'IFTTT'", (settings_notifier_IFTTT_enabled, settings_notifier_IFTTT_url)) + + settings_notifier_Stride_enabled = request.forms.get('settings_notifier_Stride_enabled') + if settings_notifier_Stride_enabled == 'on': + settings_notifier_Stride_enabled = 1 + else: + settings_notifier_Stride_enabled = 0 + settings_notifier_Stride_url = request.forms.get('settings_notifier_Stride_url') + c.execute("UPDATE table_settings_notifier SET enabled = ?, url = ? WHERE name = 'Stride'", (settings_notifier_Stride_enabled, settings_notifier_Stride_url)) + + settings_notifier_Windows_enabled = request.forms.get('settings_notifier_Windows_enabled') + if settings_notifier_Windows_enabled == 'on': + settings_notifier_Windows_enabled = 1 + else: + settings_notifier_Windows_enabled = 0 + settings_notifier_Windows_url = request.forms.get('settings_notifier_Windows_url') + c.execute("UPDATE table_settings_notifier SET enabled = ?, url = ? WHERE name = 'Windows'", (settings_notifier_Windows_enabled, settings_notifier_Windows_url)) conn.commit() c.close() diff --git a/requirements.txt b/requirements.txt index 909d98b66..7fe75cc1c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ #Bazarr requirements -apprise>=0.0.8 +apprise>=0.0.9 apscheduler>=3.5.1 babelfish>=0.5.5 bottle>=0.12.13 diff --git a/update_db.py b/update_db.py index d07a315a0..16dcfe616 100644 --- a/update_db.py +++ b/update_db.py @@ -164,6 +164,13 @@ if os.path.exists(os.path.join(os.path.dirname(__file__), 'data/db/bazarr.db')) else: c.execute('UPDATE table_settings_general SET page_size="25"') + try: + providers = ['Discord', 'E-Mail', 'Emby', 'IFTTT', 'Stride', 'Windows'] + for provider in providers: + c.execute('INSERT INTO `table_settings_notifier` (name, enabled) VALUES (?, ?);', (provider, '0')) + except: + pass + # Commit change to db db.commit()