diff --git a/lib/streaming_providers/base/manager.py b/lib/streaming_providers/base/manager.py index 8e673b2..c635a2c 100644 --- a/lib/streaming_providers/base/manager.py +++ b/lib/streaming_providers/base/manager.py @@ -113,7 +113,6 @@ class ProviderManager: enabled_countries = [] for country_code in countries: # CHECK COUNTRY-SPECIFIC ENABLED STATUS - logger.debug(f"DEBUG: Checking enable for {provider_name}_{country_code}") if not self._is_provider_enabled(provider_name, country_code): logger.debug( f"ProviderManager: Provider '{provider_name}_{country_code}' is disabled, skipping") diff --git a/lib/streaming_providers/base/settings/provider_enable_manager.py b/lib/streaming_providers/base/settings/provider_enable_manager.py index dccc00f..153b95e 100644 --- a/lib/streaming_providers/base/settings/provider_enable_manager.py +++ b/lib/streaming_providers/base/settings/provider_enable_manager.py @@ -207,33 +207,26 @@ class ProviderEnableManager: return None def is_provider_enabled(self, provider_name: str) -> bool: - """ - Check if provider is enabled using precedence rules. + logger.debug(f"DEBUG ProviderEnableManager.is_provider_enabled('{provider_name}')") - Precedence: - 1. Kodi settings (if in Kodi and setting exists) - 2. providers_enabled.json file - 3. Default to True - - Args: - provider_name: Provider name (e.g., "joyn_de", "rtlplus") - - Returns: - True if enabled, False if disabled - """ # 1. Check Kodi settings first kodi_enabled = self._get_kodi_enabled_status(provider_name) + logger.debug(f"DEBUG _get_kodi_enabled_status returned: {kodi_enabled}") + if kodi_enabled is not None: + logger.debug(f"DEBUG Using Kodi setting: {kodi_enabled}") return kodi_enabled # 2. Check file data = self._load_file() file_enabled = data["providers"].get(provider_name) + logger.debug(f"DEBUG File check returned: {file_enabled}") if file_enabled is not None: return file_enabled # 3. Default to enabled + logger.debug(f"DEBUG No setting found, defaulting to enabled") return True def get_enabled_source(self, provider_name: str) -> EnableSource: diff --git a/lib/streaming_providers/base/settings/settings_manager.py b/lib/streaming_providers/base/settings/settings_manager.py index 372f9c0..cf0dfad 100644 --- a/lib/streaming_providers/base/settings/settings_manager.py +++ b/lib/streaming_providers/base/settings/settings_manager.py @@ -1320,15 +1320,6 @@ class SettingsManager: def is_provider_enabled(self, provider_name: str, country: Optional[str] = None) -> bool: """Check if provider is enabled (using ProviderEnableManager)""" - logger.debug(f"DEBUG SettingsManager.is_provider_enabled({provider_name}, {country})") - - # Handle country parameter if provider_name doesn't have suffix - if country and '_' not in provider_name: - provider_to_check = f"{provider_name}_{country}" - else: - provider_to_check = provider_name - - logger.debug(f"DEBUG provider_to_check: {provider_to_check}") # Import here to avoid circular imports from .provider_enable_manager import ProviderEnableManager