Merge remote-tracking branch 'origin/development'

morpheus65535 · Jan 21, 2019 · 1b2cfee · 1b2cfee
2 parents b89e160 + 0df21fb
commit 1b2cfee
Show file tree

Hide file tree

Showing 23 changed files with 833 additions and 1,593 deletions.
diff --git a/bazarr/init.py b/bazarr/init.py
@@ -5,10 +5,7 @@
 import time
 
 from cork import Cork
-try:
-    from configparser import ConfigParser
-except ImportError:
-    from configparser2 import ConfigParser
+from ConfigParser2 import ConfigParser
 from config import settings
 from check_update import check_releases
 from get_argv import config_dir

diff --git a/bazarr/main.py b/bazarr/main.py
@@ -1,4 +1,4 @@
-bazarr_version = '0.7.0'
+bazarr_version = '0.7.0.1'
 
 import gc
 gc.enable()
@@ -332,6 +332,13 @@ def save_wizard():
 
     settings_subliminal_providers = request.forms.getall('settings_subliminal_providers')
     settings.general.enabled_providers = u'' if not settings_subliminal_providers else ','.join(settings_subliminal_providers)
+
+    settings.addic7ed.username = request.forms.get('settings_addic7ed_username')
+    settings.addic7ed.password = request.forms.get('settings_addic7ed_password')
+    settings.legendastv.username = request.forms.get('settings_legendastv_username')
+    settings.legendastv.password = request.forms.get('settings_legendastv_password')
+    settings.opensubtitles.username = request.forms.get('settings_opensubtitles_username')
+    settings.opensubtitles.password = request.forms.get('settings_opensubtitles_password')
 
     settings_subliminal_languages = request.forms.getall('settings_subliminal_languages')
     c.execute("UPDATE table_settings_languages SET enabled = 0")