Continuing development

bazarr/check_update.py

@@ -1,6 +1,8 @@
 from get_argv import config_dir
 
 from get_settings import get_general_settings
+from scheduler import shutdown_scheduler
+from main import restart
 
 import os
 import logging
@@ -48,5 +50,8 @@ def updated():
     conn.commit()
     c.close()
 
-    from main import restart
+    # Shutdown the scheduler waiting for jobs to finish
+    shutdown_scheduler()
+
+    # Restart Bazarr
     restart()

bazarr/scheduler.py

@@ -80,3 +80,6 @@ if integration[12] is True or integration[13] is True:
 sonarr_full_update()
 radarr_full_update()
 scheduler.start()
+
+def shutdown_scheduler():
+    scheduler.shutdown(wait=True)

views/menu.tpl

@@ -182,7 +182,7 @@
 	% from get_settings import get_general_settings
 	% ip = get_general_settings()[0]
 	% port = get_general_settings()[1]
-	% base_url = get_general_settings()[2] + "/"
+	% base_url = get_general_settings()[2]
 
 	if ("{{ip}}" == "0.0.0.0") {
 		public_ip = window.location.hostname;

views/system.tpl

@@ -238,7 +238,7 @@
 	% from get_settings import get_general_settings
 	% ip = get_general_settings()[0]
 	% port = get_general_settings()[1]
-	% base_url = get_general_settings()[2] + "/"
+	% base_url = get_general_settings()[2]
 
 	if ("{{ip}}" == "0.0.0.0") {
 		public_ip = window.location.hostname;