From c281a7818adce8db728d2a104f4444cb9c0baf2c Mon Sep 17 00:00:00 2001 From: Qstick Date: Sat, 12 Aug 2023 20:49:24 -0500 Subject: [PATCH] Cleanup other provider status code --- src/NzbDrone.Core/Download/DownloadClientFactory.cs | 4 ++-- .../CleanupOrphanedDownloadClientStatus.cs | 4 ++-- .../Housekeepers/FixFutureImportListStatusTimes.cs | 12 ++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 src/NzbDrone.Core/Housekeeping/Housekeepers/FixFutureImportListStatusTimes.cs diff --git a/src/NzbDrone.Core/Download/DownloadClientFactory.cs b/src/NzbDrone.Core/Download/DownloadClientFactory.cs index ba5ea27f2..9b11e05ac 100644 --- a/src/NzbDrone.Core/Download/DownloadClientFactory.cs +++ b/src/NzbDrone.Core/Download/DownloadClientFactory.cs @@ -56,11 +56,11 @@ namespace NzbDrone.Core.Download private IEnumerable FilterBlockedClients(IEnumerable clients) { - var blockedIndexers = _downloadClientStatusService.GetBlockedProviders().ToDictionary(v => v.ProviderId, v => v); + var blockedClients = _downloadClientStatusService.GetBlockedProviders().ToDictionary(v => v.ProviderId, v => v); foreach (var client in clients) { - if (blockedIndexers.TryGetValue(client.Definition.Id, out var downloadClientStatus)) + if (blockedClients.TryGetValue(client.Definition.Id, out var downloadClientStatus)) { _logger.Debug("Temporarily ignoring download client {0} till {1} due to recent failures.", client.Definition.Name, downloadClientStatus.DisabledTill.Value.ToLocalTime()); continue; diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedDownloadClientStatus.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedDownloadClientStatus.cs index 846ddae2f..27d9cfced 100644 --- a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedDownloadClientStatus.cs +++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedDownloadClientStatus.cs @@ -1,4 +1,4 @@ -using Dapper; +using Dapper; using NzbDrone.Core.Datastore; namespace NzbDrone.Core.Housekeeping.Housekeepers @@ -14,7 +14,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers public void Clean() { - var mapper = _database.OpenConnection(); + using var mapper = _database.OpenConnection(); mapper.Execute(@"DELETE FROM ""DownloadClientStatus"" WHERE ""Id"" IN ( diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/FixFutureImportListStatusTimes.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/FixFutureImportListStatusTimes.cs new file mode 100644 index 000000000..2c0ce3fa0 --- /dev/null +++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/FixFutureImportListStatusTimes.cs @@ -0,0 +1,12 @@ +using NzbDrone.Core.ImportLists; + +namespace NzbDrone.Core.Housekeeping.Housekeepers +{ + public class FixFutureImportListStatusTimes : FixFutureProviderStatusTimes, IHousekeepingTask + { + public FixFutureImportListStatusTimes(IImportListStatusRepository importListStatusRepository) + : base(importListStatusRepository) + { + } + } +}