From ae3dd5730e05c5229e7f7092f15c33859524863b Mon Sep 17 00:00:00 2001 From: Bogdan Date: Sat, 29 Jul 2023 04:37:21 +0300 Subject: [PATCH] Fixed: Check only enabled Jackett indexers for '/all' endpoint Closes #5848 --- .../HealthCheck/Checks/IndexerJackettAllCheckFixture.cs | 1 + .../HealthCheck/Checks/IndexerJackettAllCheck.cs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerJackettAllCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerJackettAllCheckFixture.cs index 5263d085b..7820eeec9 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerJackettAllCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerJackettAllCheckFixture.cs @@ -38,6 +38,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks _definition = new IndexerDefinition { Name = "Indexer", + EnableRss = true, ConfigContract = "TorznabSettings", Settings = torznabSettings }; diff --git a/src/NzbDrone.Core/HealthCheck/Checks/IndexerJackettAllCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/IndexerJackettAllCheck.cs index 49c8ca835..366404892 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/IndexerJackettAllCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/IndexerJackettAllCheck.cs @@ -8,6 +8,7 @@ using NzbDrone.Core.ThingiProvider.Events; namespace NzbDrone.Core.HealthCheck.Checks { + [CheckOn(typeof(ProviderAddedEvent))] [CheckOn(typeof(ProviderUpdatedEvent))] [CheckOn(typeof(ProviderDeletedEvent))] [CheckOn(typeof(ProviderStatusChangedEvent))] @@ -25,7 +26,8 @@ namespace NzbDrone.Core.HealthCheck.Checks { var jackettAllProviders = _providerFactory.All() .Where( - i => i.ConfigContract.Equals("TorznabSettings") && + i => i.Enable && + i.ConfigContract.Equals("TorznabSettings") && (((TorznabSettings)i.Settings).BaseUrl.Contains("/torznab/all/api", StringComparison.InvariantCultureIgnoreCase) || ((TorznabSettings)i.Settings).BaseUrl.Contains("/api/v2.0/indexers/all/results/torznab", StringComparison.InvariantCultureIgnoreCase) || ((TorznabSettings)i.Settings).ApiPath.Contains("/torznab/all/api", StringComparison.InvariantCultureIgnoreCase) ||