From 6eb457ed8f88c8b66e6f8f05bdd8cd317e3fabe9 Mon Sep 17 00:00:00 2001 From: Flaminel Date: Thu, 15 May 2025 18:18:41 +0300 Subject: [PATCH] fix #2 --- .../Configuration/ContentBlocker/ContentBlockerConfig.cs | 2 +- .../Configuration/DownloadCleaner/DownloadCleanerConfig.cs | 2 +- .../Common/Configuration/QueueCleaner/QueueCleanerConfig.cs | 2 +- code/Executable/DependencyInjection/QuartzDI.cs | 1 + code/Executable/DependencyInjection/ServicesDI.cs | 5 ----- code/Infrastructure/Configuration/ConfigInitializer.cs | 6 +++--- code/Infrastructure/Services/ConfigurationService.cs | 1 + .../Verticals/ContentBlocker/BlocklistProvider.cs | 2 +- .../Verticals/ContentBlocker/ContentBlocker.cs | 2 +- 9 files changed, 10 insertions(+), 13 deletions(-) diff --git a/code/Common/Configuration/ContentBlocker/ContentBlockerConfig.cs b/code/Common/Configuration/ContentBlocker/ContentBlockerConfig.cs index bcc6a9c4..90d1283c 100644 --- a/code/Common/Configuration/ContentBlocker/ContentBlockerConfig.cs +++ b/code/Common/Configuration/ContentBlocker/ContentBlockerConfig.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Configuration; namespace Common.Configuration.ContentBlocker; -public sealed record ContentBlockerConfig : IJobConfig, IIgnoredDownloadsConfig +public sealed record ContentBlockerConfig : IJobConfig { public const string SectionName = "ContentBlocker"; diff --git a/code/Common/Configuration/DownloadCleaner/DownloadCleanerConfig.cs b/code/Common/Configuration/DownloadCleaner/DownloadCleanerConfig.cs index 8c296d1d..42651ee0 100644 --- a/code/Common/Configuration/DownloadCleaner/DownloadCleanerConfig.cs +++ b/code/Common/Configuration/DownloadCleaner/DownloadCleanerConfig.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Configuration; namespace Common.Configuration.DownloadCleaner; -public sealed record DownloadCleanerConfig : IJobConfig, IIgnoredDownloadsConfig +public sealed record DownloadCleanerConfig : IJobConfig { public const string SectionName = "DownloadCleaner"; diff --git a/code/Common/Configuration/QueueCleaner/QueueCleanerConfig.cs b/code/Common/Configuration/QueueCleaner/QueueCleanerConfig.cs index 83021633..8dc61d04 100644 --- a/code/Common/Configuration/QueueCleaner/QueueCleanerConfig.cs +++ b/code/Common/Configuration/QueueCleaner/QueueCleanerConfig.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Configuration; namespace Common.Configuration.QueueCleaner; -public sealed record QueueCleanerConfig : IJobConfig, IIgnoredDownloadsConfig +public sealed record QueueCleanerConfig : IJobConfig { public const string SectionName = "QueueCleaner"; diff --git a/code/Executable/DependencyInjection/QuartzDI.cs b/code/Executable/DependencyInjection/QuartzDI.cs index 9eff6e3d..78f846fa 100644 --- a/code/Executable/DependencyInjection/QuartzDI.cs +++ b/code/Executable/DependencyInjection/QuartzDI.cs @@ -11,6 +11,7 @@ using Infrastructure.Verticals.Jobs; using Infrastructure.Verticals.QueueCleaner; using Quartz; using Quartz.Spi; +using IConfigurationManager = Infrastructure.Configuration.IConfigurationManager; namespace Executable.DependencyInjection; diff --git a/code/Executable/DependencyInjection/ServicesDI.cs b/code/Executable/DependencyInjection/ServicesDI.cs index 4ba70d1c..48301b4e 100644 --- a/code/Executable/DependencyInjection/ServicesDI.cs +++ b/code/Executable/DependencyInjection/ServicesDI.cs @@ -1,8 +1,4 @@ -using Common.Configuration.ContentBlocker; -using Common.Configuration.DownloadCleaner; -using Common.Configuration.QueueCleaner; using Infrastructure.Interceptors; -using Infrastructure.Providers; using Infrastructure.Services; using Infrastructure.Verticals.Arr; using Infrastructure.Verticals.ContentBlocker; @@ -16,7 +12,6 @@ using Infrastructure.Verticals.DownloadRemover.Interfaces; using Infrastructure.Verticals.Files; using Infrastructure.Verticals.ItemStriker; using Infrastructure.Verticals.QueueCleaner; -using Infrastructure.Services; namespace Executable.DependencyInjection; diff --git a/code/Infrastructure/Configuration/ConfigInitializer.cs b/code/Infrastructure/Configuration/ConfigInitializer.cs index 4da05a0d..276c1d29 100644 --- a/code/Infrastructure/Configuration/ConfigInitializer.cs +++ b/code/Infrastructure/Configuration/ConfigInitializer.cs @@ -56,19 +56,19 @@ public class ConfigInitializer Sonarr = new BlocklistSettings { Enabled = false, - Type = Domain.Enums.BlocklistType.Blacklist, + Type = BlocklistType.Blacklist, Path = "" }, Radarr = new BlocklistSettings { Enabled = false, - Type = Domain.Enums.BlocklistType.Blacklist, + Type = BlocklistType.Blacklist, Path = "" }, Lidarr = new BlocklistSettings { Enabled = false, - Type = Domain.Enums.BlocklistType.Blacklist, + Type = BlocklistType.Blacklist, Path = "" } }; diff --git a/code/Infrastructure/Services/ConfigurationService.cs b/code/Infrastructure/Services/ConfigurationService.cs index 93d274f9..7faa00d3 100644 --- a/code/Infrastructure/Services/ConfigurationService.cs +++ b/code/Infrastructure/Services/ConfigurationService.cs @@ -1,4 +1,5 @@ using Common.Configuration; +using Common.Configuration.Arr; using Common.Configuration.ContentBlocker; using Common.Configuration.DownloadCleaner; using Common.Configuration.DownloadClient; diff --git a/code/Infrastructure/Verticals/ContentBlocker/BlocklistProvider.cs b/code/Infrastructure/Verticals/ContentBlocker/BlocklistProvider.cs index 3a786077..9bf8e918 100644 --- a/code/Infrastructure/Verticals/ContentBlocker/BlocklistProvider.cs +++ b/code/Infrastructure/Verticals/ContentBlocker/BlocklistProvider.cs @@ -15,7 +15,7 @@ public sealed class BlocklistProvider { private readonly ILogger _logger; private readonly IConfigurationManager _configManager; - private readonly ContentBlockerConfig _contentBlockerConfig; + private ContentBlockerConfig _contentBlockerConfig; private readonly HttpClient _httpClient; private readonly IMemoryCache _cache; private bool _initialized; diff --git a/code/Infrastructure/Verticals/ContentBlocker/ContentBlocker.cs b/code/Infrastructure/Verticals/ContentBlocker/ContentBlocker.cs index 65f67bc7..df72d081 100644 --- a/code/Infrastructure/Verticals/ContentBlocker/ContentBlocker.cs +++ b/code/Infrastructure/Verticals/ContentBlocker/ContentBlocker.cs @@ -25,7 +25,7 @@ namespace Infrastructure.Verticals.ContentBlocker; public sealed class ContentBlocker : GenericHandler { - private readonly ContentBlockerConfig _config; + private ContentBlockerConfig _config; private readonly BlocklistProvider _blocklistProvider; private readonly IIgnoredDownloadsService _ignoredDownloadsService; private readonly IConfigurationManager _configManager;