From 6693b988115450e7823d1735cb2eb431ab72db39 Mon Sep 17 00:00:00 2001 From: morpheus65535 Date: Thu, 15 Dec 2022 11:00:56 -0500 Subject: [PATCH] Fixed issues with new database creation since e6d089381285ab3e945971dad7899e17062062a6 --- bazarr/app/get_providers.py | 8 -------- bazarr/init.py | 10 +++++++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/bazarr/app/get_providers.py b/bazarr/app/get_providers.py index ba41a0ea2..72842dc36 100644 --- a/bazarr/app/get_providers.py +++ b/bazarr/app/get_providers.py @@ -108,14 +108,6 @@ PROVIDERS_FORCED_OFF = ["addic7ed", "tvsubtitles", "legendasdivx", "legendastv", throttle_count = {} -def clean_enabled_providers(): - existing_providers = provider_registry.names() - enabled_providers = get_array_from(settings.general.enabled_providers) - settings.general.enabled_providers = str([x for x in enabled_providers if x in existing_providers]) - with open(os.path.join(args.config_dir, 'config', 'config.ini'), 'w+') as handle: - settings.write(handle) - - def provider_pool(): if settings.general.getboolean('multithreading'): return subliminal_patch.core.SZAsyncProviderPool diff --git a/bazarr/init.py b/bazarr/init.py index b9110dfb9..ce434acbf 100644 --- a/bazarr/init.py +++ b/bazarr/init.py @@ -10,11 +10,11 @@ import time import rarfile from dogpile.cache.region import register_backend as register_cache_backend +from subliminal_patch.extensions import provider_registry -from app.config import settings, configure_captcha_func +from app.config import settings, configure_captcha_func, get_array_from from app.get_args import args from app.logger import configure_logging -from app.get_providers import clean_enabled_providers from utilities.binaries import get_binary, BinaryNotFound from utilities.path_mappings import path_mappings from utilities.backup import restore_from_backup @@ -195,7 +195,11 @@ with open(os.path.normpath(os.path.join(args.config_dir, 'config', 'config.ini') # Remove deprecated providers from enabled providers in config.ini -clean_enabled_providers() +existing_providers = provider_registry.names() +enabled_providers = get_array_from(settings.general.enabled_providers) +settings.general.enabled_providers = str([x for x in enabled_providers if x in existing_providers]) +with open(os.path.join(args.config_dir, 'config', 'config.ini'), 'w+') as handle: + settings.write(handle) def init_binaries():