morpheus65535/bazarr
1
1
Fork 0
mirror of https://github.com/morpheus65535/bazarr.git synced 2025-01-11 09:17:47 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/development' into development

Browse source
This commit is contained in:
morpheus65535 2019-01-06 13:51:32 -05:00
commit 4feeb3eaa9
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bazarr/init.py
View file

@ -5,7 +5,10 @@ import logging
import time import time
from cork import Cork from cork import Cork
from configparser import ConfigParser try:
from configparser import ConfigParser
except ImportError:
from configparser2 import ConfigParser
from config import settings from config import settings
from check_update import check_releases from check_update import check_releases
from get_argv import config_dir from get_argv import config_dir
@ -93,9 +96,13 @@ try:
db.close() db.close()
providers_list = [] providers_list = []
if len(enabled_providers) > 0: if enabled_providers:
for provider in enabled_providers: for provider in enabled_providers:
providers_list.append(provider[0]) providers_list.append(provider[0])
else:
providers_list = None
if settings_providers:
for provider in settings_providers: for provider in settings_providers:
if provider[0] == 'opensubtitles': if provider[0] == 'opensubtitles':
settings.opensubtitles.username = provider[2] settings.opensubtitles.username = provider[2]
@ -106,8 +113,6 @@ try:
elif provider[0] == 'legendastv': elif provider[0] == 'legendastv':
settings.legendastv.username = provider[2] settings.legendastv.username = provider[2]
settings.legendastv.password = provider[3] settings.legendastv.password = provider[3]
else:
providers_list = None
settings.general.enabled_providers = u'' if not providers_list else ','.join(providers_list) settings.general.enabled_providers = u'' if not providers_list else ','.join(providers_list)
with open(os.path.join(config_dir, 'config', 'config.ini'), 'w+') as handle: with open(os.path.join(config_dir, 'config', 'config.ini'), 'w+') as handle: