Remove requirement to restart Bazarr when changing Sonarr settings

bazarr.py

@@ -1,4 +1,4 @@
-bazarr_version = '0.2.0'
+bazarr_version = '0.2.1'
 
 from bottle import route, run, template, static_file, request, redirect
 import bottle
@@ -103,6 +103,9 @@ def download_log():
 
 @route(base_url + 'image_proxy/<url:path>', method='GET')
 def image_proxy(url):
+    from get_sonarr_settings import get_sonarr_settings
+    url_sonarr_short = get_sonarr_settings()[1]
+
     img_pil = Image.open(BytesIO(requests.get(url_sonarr_short + '/' + url).content))
     img_buffer = BytesIO()
     img_pil.tobytes()
@@ -164,6 +167,9 @@ def edit_series(no):
 
 @route(base_url + 'episodes/<no:int>', method='GET')
 def episodes(no):
+    from get_sonarr_settings import get_sonarr_settings
+    url_sonarr_short = get_sonarr_settings()[1]
+    
     conn = sqlite3.connect(os.path.join(os.path.dirname(__file__), 'data/db/bazarr.db'), timeout=30)
     conn.create_function("path_substitution", 1, path_replace)
     c = conn.cursor()

get_episodes.py

@@ -4,10 +4,14 @@ import requests
 import logging
 
 from get_general_settings import *
-from get_sonarr_settings import *
 from list_subtitles import *
-
+    
 def update_all_episodes():
+    from get_sonarr_settings import get_sonarr_settings
+    url_sonarr = get_sonarr_settings()[0]
+    url_sonarr_short = get_sonarr_settings()[1]
+    apikey_sonarr = get_sonarr_settings()[2]
+    
     # Open database connection
     db = sqlite3.connect(os.path.join(os.path.dirname(__file__), 'data/db/bazarr.db'), timeout=30)
     c = db.cursor()
@@ -72,6 +76,11 @@ def update_all_episodes():
     logging.info('All missing subtitles updated in database.')
 
 def add_new_episodes():
+    from get_sonarr_settings import get_sonarr_settings
+    url_sonarr = get_sonarr_settings()[0]
+    url_sonarr_short = get_sonarr_settings()[1]
+    apikey_sonarr = get_sonarr_settings()[2]
+    
     # Open database connection
     db = sqlite3.connect(os.path.join(os.path.dirname(__file__), 'data/db/bazarr.db'), timeout=30)
     c = db.cursor()

get_series.py

@@ -3,9 +3,13 @@ import sqlite3
 import requests
 
 from get_general_settings import *
-from get_sonarr_settings import *
 
 def update_series():
+    from get_sonarr_settings import get_sonarr_settings
+    url_sonarr = get_sonarr_settings()[0]
+    url_sonarr_short = get_sonarr_settings()[1]
+    apikey_sonarr = get_sonarr_settings()[2]
+
     get_profile_list()
 
     # Open database connection
@@ -62,6 +66,11 @@ def update_series():
     db.close()
 
 def get_profile_list():
+    from get_sonarr_settings import get_sonarr_settings
+    url_sonarr = get_sonarr_settings()[0]
+    url_sonarr_short = get_sonarr_settings()[1]
+    apikey_sonarr = get_sonarr_settings()[2]
+
     # Get profiles data from Sonarr
     url_sonarr_api_series = url_sonarr + "/api/profile?apikey=" + apikey_sonarr
     profiles_json = requests.get(url_sonarr_api_series)

get_sonarr_settings.py

@@ -2,32 +2,35 @@ import sqlite3
 import os
 import ast
 
-# Open database connection
-db = sqlite3.connect(os.path.join(os.path.dirname(__file__), 'data/db/bazarr.db'), timeout=30)
-c = db.cursor()
+def get_sonarr_settings():
+	# Open database connection
+	db = sqlite3.connect(os.path.join(os.path.dirname(__file__), 'data/db/bazarr.db'), timeout=30)
+	c = db.cursor()
 
-# Get Sonarr API URL from database config table
-c.execute('''SELECT * FROM table_settings_sonarr''')
-config_sonarr = c.fetchone()
+	# Get Sonarr API URL from database config table
+	c.execute('''SELECT * FROM table_settings_sonarr''')
+	config_sonarr = c.fetchone()
 
-# Close database connection
-db.close()
+	# Close database connection
+	db.close()
 
-# Build Sonarr URL
-ip_sonarr = config_sonarr[0]
-port_sonarr = str(config_sonarr[1])
-baseurl_sonarr = config_sonarr[2]
-ssl_sonarr = config_sonarr[3]
-apikey_sonarr = config_sonarr[4]
+	# Build Sonarr URL
+	ip_sonarr = config_sonarr[0]
+	port_sonarr = str(config_sonarr[1])
+	baseurl_sonarr = config_sonarr[2]
+	ssl_sonarr = config_sonarr[3]
+	apikey_sonarr = config_sonarr[4]
 
-if ssl_sonarr == 1:
-    protocol_sonarr = "https"
-else:
-    protocol_sonarr = "http"
-if baseurl_sonarr == "/":
-    base_url_sonarr = ""
-else:
-    base_url_sonarr = "/" + baseurl_sonarr.strip("/")
+	if ssl_sonarr == 1:
+	    protocol_sonarr = "https"
+	else:
+	    protocol_sonarr = "http"
+	if baseurl_sonarr == "/":
+	    base_url_sonarr = ""
+	else:
+	    base_url_sonarr = "/" + baseurl_sonarr.strip("/")
 
-url_sonarr = protocol_sonarr + "://" + ip_sonarr + ":" + port_sonarr + base_url_sonarr
-url_sonarr_short = protocol_sonarr + "://" + ip_sonarr + ":" + port_sonarr
+	url_sonarr = protocol_sonarr + "://" + ip_sonarr + ":" + port_sonarr + base_url_sonarr
+	url_sonarr_short = protocol_sonarr + "://" + ip_sonarr + ":" + port_sonarr
+
+	return [url_sonarr, url_sonarr_short, apikey_sonarr]