From c2d0d54fabaff8a315b9f5f5c3be5262836f4203 Mon Sep 17 00:00:00 2001 From: morpheus65535 <5130500+morpheus65535@users.noreply.github.com> Date: Sun, 20 May 2018 08:33:12 -0400 Subject: [PATCH] Continuing development --- bazarr.py | 36 ++++++- create_db.sql | 13 ++- get_general_settings.py | 8 +- update_db.py | 14 +++ views/episodes.tpl | 2 +- views/settings.tpl | 211 +++++++++++++++++++++++++++++++++++++++- 6 files changed, 270 insertions(+), 14 deletions(-) diff --git a/bazarr.py b/bazarr.py index 4d48d46dc..0d234817d 100644 --- a/bazarr.py +++ b/bazarr.py @@ -608,10 +608,12 @@ def settings(): settings_providers = c.fetchall() c.execute("SELECT * FROM table_settings_sonarr") settings_sonarr = c.fetchone() + c.execute("SELECT * FROM table_settings_radarr") + settings_radarr = c.fetchone() c.execute("SELECT * FROM table_settings_notifier") settings_notifier = c.fetchall() c.close() - return template('settings', __file__=__file__, bazarr_version=bazarr_version, settings_general=settings_general, settings_languages=settings_languages, settings_providers=settings_providers, settings_sonarr=settings_sonarr, settings_notifier=settings_notifier, base_url=base_url) + return template('settings', __file__=__file__, bazarr_version=bazarr_version, settings_general=settings_general, settings_languages=settings_languages, settings_providers=settings_providers, settings_sonarr=settings_sonarr, settings_radarr=settings_radarr, settings_notifier=settings_notifier, base_url=base_url) @route(base_url + 'save_settings', method='POST') def save_settings(): @@ -651,10 +653,23 @@ def save_settings(): else: settings_general_use_postprocessing = 'True' settings_general_postprocessing_cmd = request.forms.get('settings_general_postprocessing_cmd') + print "toto" + settings_general_use_sonarr = request.forms.get('settings_general_use_sonarr') + print settings_general_use_sonarr + if settings_general_use_sonarr is None: + settings_general_use_sonarr = 'False' + else: + settings_general_use_sonarr = 'True' + settings_general_use_radarr = request.forms.get('settings_general_use_radarr') + print settings_general_use_radarr + if settings_general_use_radarr is None: + settings_general_use_radarr = 'False' + else: + settings_general_use_radarr = 'True' - before = c.execute("SELECT ip, port, base_url FROM table_settings_general").fetchone() - after = (unicode(settings_general_ip), int(settings_general_port), unicode(settings_general_baseurl)) - c.execute("UPDATE table_settings_general SET ip = ?, port = ?, base_url = ?, path_mapping = ?, log_level = ?, branch=?, auto_update=?, single_language=?, minimum_score=?, use_scenename=?, use_postprocessing=?, postprocessing_cmd=?", (unicode(settings_general_ip), int(settings_general_port), unicode(settings_general_baseurl), unicode(settings_general_pathmapping), unicode(settings_general_loglevel), unicode(settings_general_branch), unicode(settings_general_automatic), unicode(settings_general_single_language), unicode(settings_general_minimum_score), unicode(settings_general_scenename), unicode(settings_general_use_postprocessing), unicode(settings_general_postprocessing_cmd) )) + before = c.execute("SELECT ip, port, base_url, log_level, path_mapping FROM table_settings_general").fetchone() + after = (unicode(settings_general_ip), int(settings_general_port), unicode(settings_general_baseurl), unicode(settings_general_loglevel), unicode(settings_general_pathmapping)) + c.execute("UPDATE table_settings_general SET ip = ?, port = ?, base_url = ?, path_mapping = ?, log_level = ?, branch=?, auto_update=?, single_language=?, minimum_score=?, use_scenename=?, use_postprocessing=?, postprocessing_cmd=?, use_sonarr=?, use_radarr=?", (unicode(settings_general_ip), int(settings_general_port), unicode(settings_general_baseurl), unicode(settings_general_pathmapping), unicode(settings_general_loglevel), unicode(settings_general_branch), unicode(settings_general_automatic), unicode(settings_general_single_language), unicode(settings_general_minimum_score), unicode(settings_general_scenename), unicode(settings_general_use_postprocessing), unicode(settings_general_postprocessing_cmd), unicode(settings_general_use_sonarr), unicode(settings_general_use_radarr))) conn.commit() if after != before: configured() @@ -672,6 +687,19 @@ def save_settings(): settings_sonarr_sync = request.forms.get('settings_sonarr_sync') c.execute("UPDATE table_settings_sonarr SET ip = ?, port = ?, base_url = ?, ssl = ?, apikey = ?, full_update = ?", (settings_sonarr_ip, settings_sonarr_port, settings_sonarr_baseurl, settings_sonarr_ssl, settings_sonarr_apikey, settings_sonarr_sync)) + settings_radarr_ip = request.forms.get('settings_radarr_ip') + settings_radarr_port = request.forms.get('settings_radarr_port') + settings_radarr_baseurl = request.forms.get('settings_radarr_baseurl') + settings_radarr_ssl = request.forms.get('settings_radarr_ssl') + if settings_radarr_ssl is None: + settings_radarr_ssl = 'False' + else: + settings_radarr_ssl = 'True' + settings_radarr_apikey = request.forms.get('settings_radarr_apikey') + settings_radarr_sync = request.forms.get('settings_radarr_sync') + c.execute("UPDATE table_settings_radarr SET ip = ?, port = ?, base_url = ?, ssl = ?, apikey = ?, full_update = ?", (settings_radarr_ip, settings_radarr_port, settings_radarr_baseurl, settings_radarr_ssl, settings_radarr_apikey, settings_radarr_sync)) + + settings_subliminal_providers = request.forms.getall('settings_subliminal_providers') c.execute("UPDATE table_settings_providers SET enabled = 0") for item in settings_subliminal_providers: diff --git a/create_db.sql b/create_db.sql index 11f0ef74d..b020cb792 100644 --- a/create_db.sql +++ b/create_db.sql @@ -38,9 +38,18 @@ CREATE TABLE "table_settings_general" ( `path_mapping` TEXT, `log_level` TEXT, `branch` TEXT, - `auto_update` INTEGER + `auto_update` INTEGER, + `configured` INTEGER, + `updated` INTEGER, + `single_language` TEXT, + `minimum_score` TEXT, + `use_scenename` TEXT, + `use_postprocessing` TEXT, + `postprocessing_cmd` TEXT, + `use_sonarr` TEXT, + `use_radarr` TEXT ); -INSERT INTO `table_settings_general` (ip,port,base_url,path_mapping,log_level, branch, auto_update) VALUES ('0.0.0.0',6767,'/',Null,'INFO','master','True'); +INSERT INTO `table_settings_general` (ip,port,base_url,path_mapping,log_level, branch, auto_update, configured, updated, single_language, minimum_score, use_scenename, use_postprocessing, postprocessing_cmd, use_sonarr, use_radarr) VALUES ('0.0.0.0',6767,'/',Null,'INFO','master','True',0,0,'False','0','False','False',Null); CREATE TABLE "table_history" ( `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE, `action` INTEGER NOT NULL, diff --git a/get_general_settings.py b/get_general_settings.py index aa36c8df8..e5bfb455a 100644 --- a/get_general_settings.py +++ b/get_general_settings.py @@ -31,8 +31,10 @@ def get_general_settings(): use_scenename = general_settings[11] use_postprocessing = general_settings[12] postprocessing_cmd = general_settings[13] + use_sonarr = general_settings[14] + use_radarr = general_settings[15] - return [ip, port, base_url, path_mappings, log_level, branch, automatic, single_language, minimum_score, use_scenename, use_postprocessing, postprocessing_cmd] + return [ip, port, base_url, path_mappings, log_level, branch, automatic, single_language, minimum_score, use_scenename, use_postprocessing, postprocessing_cmd, use_sonarr, use_radarr] def path_replace(path): for path_mapping in path_mappings: @@ -78,4 +80,6 @@ single_language = result[7] minimum_score = result[8] use_scenename = result[9] use_processing = result[10] -postprocessing_cmd = result[11] \ No newline at end of file +postprocessing_cmd = result[11] +use_sonarr = result[12] +use_radarr = result[13] \ No newline at end of file diff --git a/update_db.py b/update_db.py index 7b3106250..accc48aad 100644 --- a/update_db.py +++ b/update_db.py @@ -97,6 +97,20 @@ if os.path.exists(os.path.join(os.path.dirname(__file__), 'data/db/bazarr.db')) except: pass + try: + c.execute('alter table table_settings_general add column "use_sonarr" "text"') + except: + pass + else: + c.execute('UPDATE table_settings_general SET use_sonarr="True"') + + try: + c.execute('alter table table_settings_general add column "use_radarr" "text"') + except: + pass + else: + c.execute('UPDATE table_settings_general SET use_radarr="False"') + # Commit change to db db.commit() diff --git a/views/episodes.tpl b/views/episodes.tpl index 029a65bb2..a6dadd1e5 100644 --- a/views/episodes.tpl +++ b/views/episodes.tpl @@ -85,7 +85,7 @@
- +
diff --git a/views/settings.tpl b/views/settings.tpl index 40e730ce1..485c06789 100644 --- a/views/settings.tpl +++ b/views/settings.tpl @@ -45,6 +45,7 @@
General Sonarr + Radarr Subliminal Notifications
@@ -157,6 +158,49 @@
+
Integration settings
+
+
+
+
+ +
+
+
+ + +
+
+ +
+ +
+
+ +
+
+
+ + +
+
+ +
+
+
+
Path Mappings
@@ -449,7 +493,116 @@
- + + + + +
+
+
+
+ + +
+
+
Connection settings
+
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+
+ +
+ +
+
+ +
+
+
+ + +
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+ +
Synchronization
+
+
+
+
+ +
+
+
+