diff --git a/code/Common/Common.csproj b/code/Common/Common.csproj index 2b07fd7f..d2dcd689 100644 --- a/code/Common/Common.csproj +++ b/code/Common/Common.csproj @@ -8,6 +8,7 @@ + diff --git a/code/Common/Configuration/DownloadClient/ClientConfig.cs b/code/Common/Configuration/DownloadClient/ClientConfig.cs index 947ccf3b..d2500b3c 100644 --- a/code/Common/Configuration/DownloadClient/ClientConfig.cs +++ b/code/Common/Configuration/DownloadClient/ClientConfig.cs @@ -1,3 +1,4 @@ +using Common.Enums; using Microsoft.Extensions.Configuration; namespace Common.Configuration.DownloadClient; @@ -20,18 +21,13 @@ public sealed record ClientConfig /// /// Type of download client /// - public Common.Enums.DownloadClient Type { get; init; } = Common.Enums.DownloadClient.None; + public DownloadClientType Type { get; init; } = DownloadClientType.None; /// /// Host address for the download client /// public string Host { get; init; } = string.Empty; - /// - /// Port for the download client - /// - public int Port { get; init; } - /// /// Username for authentication /// @@ -71,7 +67,7 @@ public sealed record ClientConfig /// /// The computed full URL for the client /// - public Uri Url => new Uri($"{(UseHttps ? "https" : "http")}://{Host}:{Port}/{UrlBase.TrimStart('/').TrimEnd('/')}"); + public Uri Url => new($"{Host.TrimEnd('/')}/{UrlBase.TrimStart('/').TrimEnd('/')}"); /// /// Validates the configuration @@ -93,12 +89,7 @@ public sealed record ClientConfig throw new InvalidOperationException($"Host cannot be empty for client ID: {Id}"); } - if (Port <= 0) - { - throw new InvalidOperationException($"Port must be greater than 0 for client ID: {Id}"); - } - - if (Type == Common.Enums.DownloadClient.None) + if (Type == DownloadClientType.None) { throw new InvalidOperationException($"Client type must be specified for client ID: {Id}"); } diff --git a/code/Common/Configuration/DownloadClient/DownloadClientConfig.cs b/code/Common/Configuration/DownloadClient/DownloadClientConfig.cs index 5f0ca4e6..4c9d0584 100644 --- a/code/Common/Configuration/DownloadClient/DownloadClientConfig.cs +++ b/code/Common/Configuration/DownloadClient/DownloadClientConfig.cs @@ -60,11 +60,6 @@ public sealed record DownloadClientConfig : IConfig { throw new InvalidOperationException($"Host cannot be empty for client ID: {client.Id}"); } - - if (client.Port <= 0) - { - throw new InvalidOperationException($"Port must be greater than 0 for client ID: {client.Id}"); - } } } } \ No newline at end of file diff --git a/code/Common/Configuration/General/HttpConfig.cs b/code/Common/Configuration/General/HttpConfig.cs index 60c3f05b..d54454ff 100644 --- a/code/Common/Configuration/General/HttpConfig.cs +++ b/code/Common/Configuration/General/HttpConfig.cs @@ -1,18 +1,18 @@ using Common.Enums; using Common.Exceptions; -using Microsoft.Extensions.Configuration; +using Newtonsoft.Json; namespace Common.Configuration.General; public sealed record HttpConfig : IConfig { - [ConfigurationKeyName("HTTP_MAX_RETRIES")] + [JsonProperty("http_max_retries")] public ushort MaxRetries { get; init; } - [ConfigurationKeyName("HTTP_TIMEOUT")] + [JsonProperty("http_timeout")] public ushort Timeout { get; init; } = 100; - [ConfigurationKeyName("HTTP_VALIDATE_CERT")] + [JsonProperty("http_validate_cert")] public CertificateValidationType CertificateValidation { get; init; } = CertificateValidationType.Enabled; public void Validate() diff --git a/code/Common/Enums/DownloadClient.cs b/code/Common/Enums/DownloadClientType.cs similarity index 75% rename from code/Common/Enums/DownloadClient.cs rename to code/Common/Enums/DownloadClientType.cs index 7c215064..7911ff23 100644 --- a/code/Common/Enums/DownloadClient.cs +++ b/code/Common/Enums/DownloadClientType.cs @@ -1,6 +1,6 @@ namespace Common.Enums; -public enum DownloadClient +public enum DownloadClientType { QBittorrent, Deluge, diff --git a/code/Executable/Controllers/DownloadClientsController.cs b/code/Executable/Controllers/DownloadClientsController.cs index fe98abca..c2ce60ed 100644 --- a/code/Executable/Controllers/DownloadClientsController.cs +++ b/code/Executable/Controllers/DownloadClientsController.cs @@ -114,15 +114,12 @@ public class DownloadClientsController : ControllerBase config.Clients.Add(clientConfig); // Persist the updated configuration - var result = await _configManager.UpdateDownloadClientConfigAsync(config); + var result = await _configManager.SaveDownloadClientConfigAsync(config); if (!result) { return StatusCode(500, new { Error = "Failed to save download client configuration" }); } - // Refresh the client factory to recognize the new client - await _clientFactory.RefreshClients(); - _logger.LogInformation("Added new download client: {name} ({id})", clientConfig.Name, clientConfig.Id); return CreatedAtAction(nameof(GetClient), new { id = clientConfig.Id }, clientConfig); } @@ -168,15 +165,12 @@ public class DownloadClientsController : ControllerBase config.Clients[existingClientIndex] = clientConfig; // Persist the updated configuration - var result = await _configManager.UpdateDownloadClientConfigAsync(config); + var result = await _configManager.SaveDownloadClientConfigAsync(config); if (!result) { return StatusCode(500, new { Error = "Failed to save download client configuration" }); } - // Refresh the client factory to recognize the updated client - await _clientFactory.RefreshClients(); - _logger.LogInformation("Updated download client: {name} ({id})", clientConfig.Name, clientConfig.Id); return Ok(clientConfig); } @@ -213,15 +207,12 @@ public class DownloadClientsController : ControllerBase config.Clients.RemoveAt(existingClientIndex); // Persist the updated configuration - var result = await _configManager.UpdateDownloadClientConfigAsync(config); + var result = await _configManager.SaveDownloadClientConfigAsync(config); if (!result) { return StatusCode(500, new { Error = "Failed to save download client configuration" }); } - // Refresh the client factory to recognize the deleted client - await _clientFactory.RefreshClients(); - _logger.LogInformation("Deleted download client with ID: {id}", id); return NoContent(); } @@ -282,7 +273,7 @@ public class DownloadClientsController : ControllerBase /// Gets all clients of a specific type /// [HttpGet("type/{type}")] - public async Task GetClientsByType(DownloadClient type) + public async Task GetClientsByType(DownloadClientType type) { try { diff --git a/code/Executable/Controllers/StatusController.cs b/code/Executable/Controllers/StatusController.cs index 1de6415d..d5046fd3 100644 --- a/code/Executable/Controllers/StatusController.cs +++ b/code/Executable/Controllers/StatusController.cs @@ -117,7 +117,6 @@ public class StatusController : ControllerBase client.Name, client.Type, client.Host, - client.Port, client.Enabled, IsConnected = client.Enabled, // We can't check connection status without implementing test methods }); diff --git a/code/Executable/DependencyInjection/MainDI.cs b/code/Executable/DependencyInjection/MainDI.cs index 1f688429..11602f5e 100644 --- a/code/Executable/DependencyInjection/MainDI.cs +++ b/code/Executable/DependencyInjection/MainDI.cs @@ -8,6 +8,8 @@ using Infrastructure.Http; using Infrastructure.Services; using Infrastructure.Verticals.DownloadClient.Factory; using Infrastructure.Verticals.DownloadClient.Deluge; +using Infrastructure.Verticals.DownloadClient.QBittorrent; +using Infrastructure.Verticals.DownloadClient.Transmission; using Infrastructure.Verticals.DownloadRemover.Consumers; using Infrastructure.Verticals.Notifications.Consumers; using Infrastructure.Verticals.Notifications.Models; @@ -77,30 +79,30 @@ public static class MainDI // add dynamic HTTP client provider services.AddSingleton(); - var configManager = services.BuildServiceProvider().GetRequiredService(); - HttpConfig config = configManager.GetConfiguration("http.json") ?? new(); - config.Validate(); - - // add retry HttpClient - services - .AddHttpClient(Constants.HttpClientWithRetryName, x => - { - x.Timeout = TimeSpan.FromSeconds(config.Timeout); - }) - .ConfigurePrimaryHttpMessageHandler(provider => - { - CertificateValidationService service = provider.GetRequiredService(); - - return new HttpClientHandler - { - ServerCertificateCustomValidationCallback = service.ShouldByPassValidationError - }; - }) - .AddRetryPolicyHandler(config); - - // Note: We're no longer configuring specific named HttpClients for each download service - // Instead, we use the DynamicHttpClientProvider to create HttpClients as needed based on client configurations - + // var configManager = services.BuildServiceProvider().GetRequiredService(); + // HttpConfig config = configManager.GetConfiguration("http.json") ?? new(); + // config.Validate(); + // + // // add retry HttpClient + // services + // .AddHttpClient(Constants.HttpClientWithRetryName, x => + // { + // x.Timeout = TimeSpan.FromSeconds(config.Timeout); + // }) + // .ConfigurePrimaryHttpMessageHandler(provider => + // { + // CertificateValidationService service = provider.GetRequiredService(); + // + // return new HttpClientHandler + // { + // ServerCertificateCustomValidationCallback = service.ShouldByPassValidationError + // }; + // }) + // .AddRetryPolicyHandler(config); + // + // // Note: We're no longer configuring specific named HttpClients for each download service + // // Instead, we use the DynamicHttpClientProvider to create HttpClients as needed based on client configurations + return services; } @@ -120,9 +122,9 @@ public static class MainDI // Register all download client service types // The factory will create instances as needed based on the client configuration - .AddTransient() - .AddTransient() - .AddTransient(); + .AddTransient() + .AddTransient() + .AddTransient(); /// /// Adds health check services to the service collection diff --git a/code/Infrastructure.Tests/Health/HealthCheckServiceFixture.cs b/code/Infrastructure.Tests/Health/HealthCheckServiceFixture.cs index ca6abf59..fa575dc0 100644 --- a/code/Infrastructure.Tests/Health/HealthCheckServiceFixture.cs +++ b/code/Infrastructure.Tests/Health/HealthCheckServiceFixture.cs @@ -34,9 +34,8 @@ public class HealthCheckServiceFixture : IDisposable { Id = "qbit1", Name = "Test QBittorrent", - Type = DownloadClient.QBittorrent, + Type = DownloadClientType.QBittorrent, Enabled = true, - Url = "http://localhost:8080", Username = "admin", Password = "adminadmin" }, @@ -44,9 +43,8 @@ public class HealthCheckServiceFixture : IDisposable { Id = "transmission1", Name = "Test Transmission", - Type = DownloadClient.Transmission, + Type = DownloadClientType.Transmission, Enabled = true, - Url = "http://localhost:9091", Username = "admin", Password = "adminadmin" }, @@ -54,9 +52,8 @@ public class HealthCheckServiceFixture : IDisposable { Id = "disabled1", Name = "Disabled Client", - Type = DownloadClient.QBittorrent, + Type = DownloadClientType.QBittorrent, Enabled = false, - Url = "http://localhost:5555" } } }; diff --git a/code/Infrastructure.Tests/Health/HealthCheckServiceTests.cs b/code/Infrastructure.Tests/Health/HealthCheckServiceTests.cs index afab762f..2b90f560 100644 --- a/code/Infrastructure.Tests/Health/HealthCheckServiceTests.cs +++ b/code/Infrastructure.Tests/Health/HealthCheckServiceTests.cs @@ -1,3 +1,4 @@ +using Common.Configuration.DownloadClient; using Infrastructure.Health; using NSubstitute; using Shouldly; @@ -59,7 +60,7 @@ public class HealthCheckServiceTests : IClassFixture // Configure the ConfigManager to return null for the client config _fixture.ConfigManager.GetDownloadClientConfigAsync().Returns( - Task.FromResult(null) + Task.FromResult(null) ); // Act diff --git a/code/Infrastructure.Tests/Http/DynamicHttpClientProviderFixture.cs b/code/Infrastructure.Tests/Http/DynamicHttpClientProviderFixture.cs index c818276a..43a59ba6 100644 --- a/code/Infrastructure.Tests/Http/DynamicHttpClientProviderFixture.cs +++ b/code/Infrastructure.Tests/Http/DynamicHttpClientProviderFixture.cs @@ -1,6 +1,8 @@ using Common.Configuration.DownloadClient; using Common.Enums; +using Infrastructure.Configuration; using Infrastructure.Http; +using Infrastructure.Services; using Microsoft.Extensions.Logging; using NSubstitute; @@ -17,7 +19,15 @@ public class DynamicHttpClientProviderFixture : IDisposable public DynamicHttpClientProvider CreateSut() { - return new DynamicHttpClientProvider(Logger); + var httpClientFactory = Substitute.For(); + var configManager = Substitute.For(); + var certificateValidationService = Substitute.For(); + + return new DynamicHttpClientProvider( + Logger, + httpClientFactory, + configManager, + certificateValidationService); } public ClientConfig CreateQBitClientConfig() @@ -26,9 +36,9 @@ public class DynamicHttpClientProviderFixture : IDisposable { Id = "qbit-test", Name = "QBit Test", - Type = DownloadClient.QBittorrent, + Type = DownloadClientType.QBittorrent, Enabled = true, - Url = "http://localhost:8080", + Host = "http://localhost:8080", Username = "admin", Password = "adminadmin" }; @@ -40,9 +50,9 @@ public class DynamicHttpClientProviderFixture : IDisposable { Id = "transmission-test", Name = "Transmission Test", - Type = DownloadClient.Transmission, + Type = DownloadClientType.Transmission, Enabled = true, - Url = "http://localhost:9091", + Host = "http://localhost:9091", Username = "admin", Password = "adminadmin", UrlBase = "transmission" @@ -55,9 +65,9 @@ public class DynamicHttpClientProviderFixture : IDisposable { Id = "deluge-test", Name = "Deluge Test", - Type = DownloadClient.Deluge, + Type = DownloadClientType.Deluge, Enabled = true, - Url = "http://localhost:8112", + Host = "http://localhost:8112", Username = "admin", Password = "deluge" }; diff --git a/code/Infrastructure.Tests/Http/DynamicHttpClientProviderTests.cs b/code/Infrastructure.Tests/Http/DynamicHttpClientProviderTests.cs index e30e28d2..497404cf 100644 --- a/code/Infrastructure.Tests/Http/DynamicHttpClientProviderTests.cs +++ b/code/Infrastructure.Tests/Http/DynamicHttpClientProviderTests.cs @@ -27,7 +27,7 @@ public class DynamicHttpClientProviderTests : IClassFixture + + + + diff --git a/code/Infrastructure.Tests/Verticals/DownloadClient/DownloadServiceFixture.cs b/code/Infrastructure.Tests/Verticals/DownloadClient/DownloadServiceFixture.cs index 5b89934a..cbc7a9cf 100644 --- a/code/Infrastructure.Tests/Verticals/DownloadClient/DownloadServiceFixture.cs +++ b/code/Infrastructure.Tests/Verticals/DownloadClient/DownloadServiceFixture.cs @@ -1,80 +1,80 @@ -using Common.Configuration.ContentBlocker; -using Common.Configuration.DownloadCleaner; -using Common.Configuration.QueueCleaner; -using Infrastructure.Interceptors; -using Infrastructure.Verticals.ContentBlocker; -using Infrastructure.Verticals.DownloadClient; -using Infrastructure.Verticals.Files; -using Infrastructure.Verticals.ItemStriker; -using Infrastructure.Verticals.Notifications; -using Microsoft.Extensions.Caching.Memory; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using NSubstitute; - -namespace Infrastructure.Tests.Verticals.DownloadClient; - -public class DownloadServiceFixture : IDisposable -{ - public ILogger Logger { get; set; } - public IMemoryCache Cache { get; set; } - public IStriker Striker { get; set; } - - public DownloadServiceFixture() - { - Logger = Substitute.For>(); - Cache = Substitute.For(); - Striker = Substitute.For(); - } - - public TestDownloadService CreateSut( - QueueCleanerConfig? queueCleanerConfig = null, - ContentBlockerConfig? contentBlockerConfig = null - ) - { - queueCleanerConfig ??= new QueueCleanerConfig - { - Enabled = true, - RunSequentially = true, - StalledResetStrikesOnProgress = true, - StalledMaxStrikes = 3 - }; - - var queueCleanerOptions = Substitute.For>(); - queueCleanerOptions.Value.Returns(queueCleanerConfig); - - contentBlockerConfig ??= new ContentBlockerConfig - { - Enabled = true - }; - - var contentBlockerOptions = Substitute.For>(); - contentBlockerOptions.Value.Returns(contentBlockerConfig); - - var downloadCleanerOptions = Substitute.For>(); - downloadCleanerOptions.Value.Returns(new DownloadCleanerConfig()); - - var filenameEvaluator = Substitute.For(); - var notifier = Substitute.For(); - var dryRunInterceptor = Substitute.For(); - var hardlinkFileService = Substitute.For(); - - return new TestDownloadService( - Logger, - queueCleanerOptions, - contentBlockerOptions, - downloadCleanerOptions, - Cache, - filenameEvaluator, - Striker, - notifier, - dryRunInterceptor, - hardlinkFileService - ); - } - - public void Dispose() - { - // Cleanup if needed - } -} \ No newline at end of file +// using Common.Configuration.ContentBlocker; +// using Common.Configuration.DownloadCleaner; +// using Common.Configuration.QueueCleaner; +// using Infrastructure.Interceptors; +// using Infrastructure.Verticals.ContentBlocker; +// using Infrastructure.Verticals.DownloadClient; +// using Infrastructure.Verticals.Files; +// using Infrastructure.Verticals.ItemStriker; +// using Infrastructure.Verticals.Notifications; +// using Microsoft.Extensions.Caching.Memory; +// using Microsoft.Extensions.Logging; +// using Microsoft.Extensions.Options; +// using NSubstitute; +// +// namespace Infrastructure.Tests.Verticals.DownloadClient; +// +// public class DownloadServiceFixture : IDisposable +// { +// public ILogger Logger { get; set; } +// public IMemoryCache Cache { get; set; } +// public IStriker Striker { get; set; } +// +// public DownloadServiceFixture() +// { +// Logger = Substitute.For>(); +// Cache = Substitute.For(); +// Striker = Substitute.For(); +// } +// +// public TestDownloadService CreateSut( +// QueueCleanerConfig? queueCleanerConfig = null, +// ContentBlockerConfig? contentBlockerConfig = null +// ) +// { +// queueCleanerConfig ??= new QueueCleanerConfig +// { +// Enabled = true, +// RunSequentially = true, +// StalledResetStrikesOnProgress = true, +// StalledMaxStrikes = 3 +// }; +// +// var queueCleanerOptions = Substitute.For>(); +// queueCleanerOptions.Value.Returns(queueCleanerConfig); +// +// contentBlockerConfig ??= new ContentBlockerConfig +// { +// Enabled = true +// }; +// +// var contentBlockerOptions = Substitute.For>(); +// contentBlockerOptions.Value.Returns(contentBlockerConfig); +// +// var downloadCleanerOptions = Substitute.For>(); +// downloadCleanerOptions.Value.Returns(new DownloadCleanerConfig()); +// +// var filenameEvaluator = Substitute.For(); +// var notifier = Substitute.For(); +// var dryRunInterceptor = Substitute.For(); +// var hardlinkFileService = Substitute.For(); +// +// return new TestDownloadService( +// Logger, +// queueCleanerOptions, +// contentBlockerOptions, +// downloadCleanerOptions, +// Cache, +// filenameEvaluator, +// Striker, +// notifier, +// dryRunInterceptor, +// hardlinkFileService +// ); +// } +// +// public void Dispose() +// { +// // Cleanup if needed +// } +// } \ No newline at end of file diff --git a/code/Infrastructure.Tests/Verticals/DownloadClient/DownloadServiceTests.cs b/code/Infrastructure.Tests/Verticals/DownloadClient/DownloadServiceTests.cs index e69c21c2..1c0be68e 100644 --- a/code/Infrastructure.Tests/Verticals/DownloadClient/DownloadServiceTests.cs +++ b/code/Infrastructure.Tests/Verticals/DownloadClient/DownloadServiceTests.cs @@ -1,214 +1,214 @@ -using Common.Configuration.DownloadCleaner; -using Domain.Enums; -using Domain.Models.Cache; -using Infrastructure.Helpers; -using Infrastructure.Verticals.Context; -using Infrastructure.Verticals.DownloadClient; -using NSubstitute; -using NSubstitute.ClearExtensions; -using Shouldly; - -namespace Infrastructure.Tests.Verticals.DownloadClient; - -public class DownloadServiceTests : IClassFixture -{ - private readonly DownloadServiceFixture _fixture; - - public DownloadServiceTests(DownloadServiceFixture fixture) - { - _fixture = fixture; - _fixture.Cache.ClearSubstitute(); - _fixture.Striker.ClearSubstitute(); - } - - public class ResetStrikesOnProgressTests : DownloadServiceTests - { - public ResetStrikesOnProgressTests(DownloadServiceFixture fixture) : base(fixture) - { - } - - [Fact] - public void WhenStalledStrikeDisabled_ShouldNotResetStrikes() - { - // Arrange - TestDownloadService sut = _fixture.CreateSut(queueCleanerConfig: new() - { - Enabled = true, - RunSequentially = true, - StalledResetStrikesOnProgress = false, - }); - - // Act - sut.ResetStalledStrikesOnProgress("test-hash", 100); - - // Assert - _fixture.Cache.ReceivedCalls().ShouldBeEmpty(); - } - - [Fact] - public void WhenProgressMade_ShouldResetStrikes() - { - // Arrange - const string hash = "test-hash"; - StalledCacheItem stalledCacheItem = new StalledCacheItem { Downloaded = 100 }; - - _fixture.Cache.TryGetValue(Arg.Any(), out Arg.Any()) - .Returns(x => - { - x[1] = stalledCacheItem; - return true; - }); - - TestDownloadService sut = _fixture.CreateSut(); - - // Act - sut.ResetStalledStrikesOnProgress(hash, 200); - - // Assert - _fixture.Cache.Received(1).Remove(CacheKeys.Strike(StrikeType.Stalled, hash)); - } - - [Fact] - public void WhenNoProgress_ShouldNotResetStrikes() - { - // Arrange - const string hash = "test-hash"; - StalledCacheItem stalledCacheItem = new StalledCacheItem { Downloaded = 200 }; - - _fixture.Cache - .TryGetValue(Arg.Any(), out Arg.Any()) - .Returns(x => - { - x[1] = stalledCacheItem; - return true; - }); - - TestDownloadService sut = _fixture.CreateSut(); - - // Act - sut.ResetStalledStrikesOnProgress(hash, 100); - - // Assert - _fixture.Cache.DidNotReceive().Remove(Arg.Any()); - } - } - - public class StrikeAndCheckLimitTests : DownloadServiceTests - { - public StrikeAndCheckLimitTests(DownloadServiceFixture fixture) : base(fixture) - { - } - } - - public class ShouldCleanDownloadTests : DownloadServiceTests - { - public ShouldCleanDownloadTests(DownloadServiceFixture fixture) : base(fixture) - { - ContextProvider.Set("downloadName", "test-download"); - } - - [Fact] - public void WhenRatioAndMinSeedTimeReached_ShouldReturnTrue() - { - // Arrange - CleanCategory category = new() - { - Name = "test", - MaxRatio = 1.0, - MinSeedTime = 1, - MaxSeedTime = -1 - }; - const double ratio = 1.5; - TimeSpan seedingTime = TimeSpan.FromHours(2); - - TestDownloadService sut = _fixture.CreateSut(); - - // Act - var result = sut.ShouldCleanDownload(ratio, seedingTime, category); - - // Assert - result.ShouldSatisfyAllConditions( - () => result.ShouldClean.ShouldBeTrue(), - () => result.Reason.ShouldBe(CleanReason.MaxRatioReached) - ); - } - - [Fact] - public void WhenRatioReachedAndMinSeedTimeNotReached_ShouldReturnFalse() - { - // Arrange - CleanCategory category = new() - { - Name = "test", - MaxRatio = 1.0, - MinSeedTime = 3, - MaxSeedTime = -1 - }; - const double ratio = 1.5; - TimeSpan seedingTime = TimeSpan.FromHours(2); - - TestDownloadService sut = _fixture.CreateSut(); - - // Act - var result = sut.ShouldCleanDownload(ratio, seedingTime, category); - - // Assert - result.ShouldSatisfyAllConditions( - () => result.ShouldClean.ShouldBeFalse(), - () => result.Reason.ShouldBe(CleanReason.None) - ); - } - - [Fact] - public void WhenMaxSeedTimeReached_ShouldReturnTrue() - { - // Arrange - CleanCategory category = new() - { - Name = "test", - MaxRatio = -1, - MinSeedTime = 0, - MaxSeedTime = 1 - }; - const double ratio = 0.5; - TimeSpan seedingTime = TimeSpan.FromHours(2); - - TestDownloadService sut = _fixture.CreateSut(); - - // Act - SeedingCheckResult result = sut.ShouldCleanDownload(ratio, seedingTime, category); - - // Assert - result.ShouldSatisfyAllConditions( - () => result.ShouldClean.ShouldBeTrue(), - () => result.Reason.ShouldBe(CleanReason.MaxSeedTimeReached) - ); - } - - [Fact] - public void WhenNeitherConditionMet_ShouldReturnFalse() - { - // Arrange - CleanCategory category = new() - { - Name = "test", - MaxRatio = 2.0, - MinSeedTime = 0, - MaxSeedTime = 3 - }; - const double ratio = 1.0; - TimeSpan seedingTime = TimeSpan.FromHours(1); - - TestDownloadService sut = _fixture.CreateSut(); - - // Act - var result = sut.ShouldCleanDownload(ratio, seedingTime, category); - - // Assert - result.ShouldSatisfyAllConditions( - () => result.ShouldClean.ShouldBeFalse(), - () => result.Reason.ShouldBe(CleanReason.None) - ); - } - } -} \ No newline at end of file +// using Common.Configuration.DownloadCleaner; +// using Domain.Enums; +// using Domain.Models.Cache; +// using Infrastructure.Helpers; +// using Infrastructure.Verticals.Context; +// using Infrastructure.Verticals.DownloadClient; +// using NSubstitute; +// using NSubstitute.ClearExtensions; +// using Shouldly; +// +// namespace Infrastructure.Tests.Verticals.DownloadClient; +// +// public class DownloadServiceTests : IClassFixture +// { +// private readonly DownloadServiceFixture _fixture; +// +// public DownloadServiceTests(DownloadServiceFixture fixture) +// { +// _fixture = fixture; +// _fixture.Cache.ClearSubstitute(); +// _fixture.Striker.ClearSubstitute(); +// } +// +// public class ResetStrikesOnProgressTests : DownloadServiceTests +// { +// public ResetStrikesOnProgressTests(DownloadServiceFixture fixture) : base(fixture) +// { +// } +// +// [Fact] +// public void WhenStalledStrikeDisabled_ShouldNotResetStrikes() +// { +// // Arrange +// TestDownloadService sut = _fixture.CreateSut(queueCleanerConfig: new() +// { +// Enabled = true, +// RunSequentially = true, +// StalledResetStrikesOnProgress = false, +// }); +// +// // Act +// sut.ResetStalledStrikesOnProgress("test-hash", 100); +// +// // Assert +// _fixture.Cache.ReceivedCalls().ShouldBeEmpty(); +// } +// +// [Fact] +// public void WhenProgressMade_ShouldResetStrikes() +// { +// // Arrange +// const string hash = "test-hash"; +// StalledCacheItem stalledCacheItem = new StalledCacheItem { Downloaded = 100 }; +// +// _fixture.Cache.TryGetValue(Arg.Any(), out Arg.Any()) +// .Returns(x => +// { +// x[1] = stalledCacheItem; +// return true; +// }); +// +// TestDownloadService sut = _fixture.CreateSut(); +// +// // Act +// sut.ResetStalledStrikesOnProgress(hash, 200); +// +// // Assert +// _fixture.Cache.Received(1).Remove(CacheKeys.Strike(StrikeType.Stalled, hash)); +// } +// +// [Fact] +// public void WhenNoProgress_ShouldNotResetStrikes() +// { +// // Arrange +// const string hash = "test-hash"; +// StalledCacheItem stalledCacheItem = new StalledCacheItem { Downloaded = 200 }; +// +// _fixture.Cache +// .TryGetValue(Arg.Any(), out Arg.Any()) +// .Returns(x => +// { +// x[1] = stalledCacheItem; +// return true; +// }); +// +// TestDownloadService sut = _fixture.CreateSut(); +// +// // Act +// sut.ResetStalledStrikesOnProgress(hash, 100); +// +// // Assert +// _fixture.Cache.DidNotReceive().Remove(Arg.Any()); +// } +// } +// +// public class StrikeAndCheckLimitTests : DownloadServiceTests +// { +// public StrikeAndCheckLimitTests(DownloadServiceFixture fixture) : base(fixture) +// { +// } +// } +// +// public class ShouldCleanDownloadTests : DownloadServiceTests +// { +// public ShouldCleanDownloadTests(DownloadServiceFixture fixture) : base(fixture) +// { +// ContextProvider.Set("downloadName", "test-download"); +// } +// +// [Fact] +// public void WhenRatioAndMinSeedTimeReached_ShouldReturnTrue() +// { +// // Arrange +// CleanCategory category = new() +// { +// Name = "test", +// MaxRatio = 1.0, +// MinSeedTime = 1, +// MaxSeedTime = -1 +// }; +// const double ratio = 1.5; +// TimeSpan seedingTime = TimeSpan.FromHours(2); +// +// TestDownloadService sut = _fixture.CreateSut(); +// +// // Act +// var result = sut.ShouldCleanDownload(ratio, seedingTime, category); +// +// // Assert +// result.ShouldSatisfyAllConditions( +// () => result.ShouldClean.ShouldBeTrue(), +// () => result.Reason.ShouldBe(CleanReason.MaxRatioReached) +// ); +// } +// +// [Fact] +// public void WhenRatioReachedAndMinSeedTimeNotReached_ShouldReturnFalse() +// { +// // Arrange +// CleanCategory category = new() +// { +// Name = "test", +// MaxRatio = 1.0, +// MinSeedTime = 3, +// MaxSeedTime = -1 +// }; +// const double ratio = 1.5; +// TimeSpan seedingTime = TimeSpan.FromHours(2); +// +// TestDownloadService sut = _fixture.CreateSut(); +// +// // Act +// var result = sut.ShouldCleanDownload(ratio, seedingTime, category); +// +// // Assert +// result.ShouldSatisfyAllConditions( +// () => result.ShouldClean.ShouldBeFalse(), +// () => result.Reason.ShouldBe(CleanReason.None) +// ); +// } +// +// [Fact] +// public void WhenMaxSeedTimeReached_ShouldReturnTrue() +// { +// // Arrange +// CleanCategory category = new() +// { +// Name = "test", +// MaxRatio = -1, +// MinSeedTime = 0, +// MaxSeedTime = 1 +// }; +// const double ratio = 0.5; +// TimeSpan seedingTime = TimeSpan.FromHours(2); +// +// TestDownloadService sut = _fixture.CreateSut(); +// +// // Act +// SeedingCheckResult result = sut.ShouldCleanDownload(ratio, seedingTime, category); +// +// // Assert +// result.ShouldSatisfyAllConditions( +// () => result.ShouldClean.ShouldBeTrue(), +// () => result.Reason.ShouldBe(CleanReason.MaxSeedTimeReached) +// ); +// } +// +// [Fact] +// public void WhenNeitherConditionMet_ShouldReturnFalse() +// { +// // Arrange +// CleanCategory category = new() +// { +// Name = "test", +// MaxRatio = 2.0, +// MinSeedTime = 0, +// MaxSeedTime = 3 +// }; +// const double ratio = 1.0; +// TimeSpan seedingTime = TimeSpan.FromHours(1); +// +// TestDownloadService sut = _fixture.CreateSut(); +// +// // Act +// var result = sut.ShouldCleanDownload(ratio, seedingTime, category); +// +// // Assert +// result.ShouldSatisfyAllConditions( +// () => result.ShouldClean.ShouldBeFalse(), +// () => result.Reason.ShouldBe(CleanReason.None) +// ); +// } +// } +// } \ No newline at end of file diff --git a/code/Infrastructure.Tests/Verticals/DownloadClient/Factory/DownloadClientFactoryFixture.cs b/code/Infrastructure.Tests/Verticals/DownloadClient/Factory/DownloadClientFactoryFixture.cs deleted file mode 100644 index dcab94a0..00000000 --- a/code/Infrastructure.Tests/Verticals/DownloadClient/Factory/DownloadClientFactoryFixture.cs +++ /dev/null @@ -1,109 +0,0 @@ -using Common.Configuration.DownloadClient; -using Common.Enums; -using Infrastructure.Configuration; -using Infrastructure.Http; -using Infrastructure.Verticals.DownloadClient; -using Infrastructure.Verticals.DownloadClient.Deluge; -using Infrastructure.Verticals.DownloadClient.Factory; -using Infrastructure.Verticals.DownloadClient.QBittorrent; -using Infrastructure.Verticals.DownloadClient.Transmission; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using NSubstitute; - -namespace Infrastructure.Tests.Verticals.DownloadClient.Factory; - -public class DownloadClientFactoryFixture : IDisposable -{ - public ILogger Logger { get; } - public IConfigManager ConfigManager { get; } - public IServiceProvider ServiceProvider { get; } - public DownloadClientConfig DownloadClientConfig { get; } - - public DownloadClientFactoryFixture() - { - Logger = Substitute.For>(); - ConfigManager = Substitute.For(); - - // Set up test download client config - DownloadClientConfig = new DownloadClientConfig - { - Clients = new List - { - new() - { - Id = "qbit1", - Name = "Test QBittorrent", - Type = DownloadClient.QBittorrent, - Enabled = true, - Url = "http://localhost:8080", - Username = "admin", - Password = "adminadmin" - }, - new() - { - Id = "transmission1", - Name = "Test Transmission", - Type = DownloadClient.Transmission, - Enabled = true, - Url = "http://localhost:9091", - Username = "admin", - Password = "adminadmin" - }, - new() - { - Id = "deluge1", - Name = "Test Deluge", - Type = DownloadClient.Deluge, - Enabled = true, - Url = "http://localhost:8112", - Username = "admin", - Password = "adminadmin" - }, - new() - { - Id = "disabled1", - Name = "Disabled Client", - Type = DownloadClient.QBittorrent, - Enabled = false, - Url = "http://localhost:5555" - } - } - }; - - // Configure the ConfigManager to return our test config - ConfigManager.GetDownloadClientConfigAsync().Returns(Task.FromResult(DownloadClientConfig)); - - // Set up mock services - var serviceCollection = new ServiceCollection(); - - // Mock the services that will be resolved - var qbitService = Substitute.For(); - var transmissionService = Substitute.For(); - var delugeService = Substitute.For(); - var httpClientProvider = Substitute.For(); - - // Register our mock services in the service collection - serviceCollection.AddSingleton(qbitService); - serviceCollection.AddSingleton(transmissionService); - serviceCollection.AddSingleton(delugeService); - serviceCollection.AddSingleton(httpClientProvider); - - // Build the service provider - ServiceProvider = serviceCollection.BuildServiceProvider(); - } - - public DownloadClientFactory CreateSut() - { - return new DownloadClientFactory( - Logger, - ConfigManager, - ServiceProvider - ); - } - - public void Dispose() - { - // Clean up if needed - } -} diff --git a/code/Infrastructure.Tests/Verticals/DownloadClient/Factory/DownloadClientFactoryTests.cs b/code/Infrastructure.Tests/Verticals/DownloadClient/Factory/DownloadClientFactoryTests.cs deleted file mode 100644 index 714a1b88..00000000 --- a/code/Infrastructure.Tests/Verticals/DownloadClient/Factory/DownloadClientFactoryTests.cs +++ /dev/null @@ -1,201 +0,0 @@ -using System.Collections.Concurrent; -using Common.Configuration.DownloadClient; -using Common.Enums; -using Infrastructure.Verticals.DownloadClient; -using Infrastructure.Verticals.DownloadClient.Deluge; -using Infrastructure.Verticals.DownloadClient.Factory; -using Infrastructure.Verticals.DownloadClient.QBittorrent; -using Infrastructure.Verticals.DownloadClient.Transmission; -using NSubstitute; -using Shouldly; - -namespace Infrastructure.Tests.Verticals.DownloadClient.Factory; - -public class DownloadClientFactoryTests : IClassFixture -{ - private readonly DownloadClientFactoryFixture _fixture; - - public DownloadClientFactoryTests(DownloadClientFactoryFixture fixture) - { - _fixture = fixture; - } - - [Fact] - public async Task Initialize_ShouldCreateClientsForEnabledConfigurations() - { - // Arrange - var sut = _fixture.CreateSut(); - - // Act - await sut.Initialize(); - - // Assert - var clients = GetPrivateClientsCollection(sut); - clients.Count.ShouldBe(3); // Only enabled clients should be initialized - clients.Keys.ShouldContain("qbit1"); - clients.Keys.ShouldContain("transmission1"); - clients.Keys.ShouldContain("deluge1"); - clients.Keys.ShouldNotContain("disabled1"); - } - - [Fact] - public async Task GetClient_WithExistingId_ShouldReturnExistingClient() - { - // Arrange - var sut = _fixture.CreateSut(); - await sut.Initialize(); - - // Get an initial reference to the client - var firstClient = sut.GetClient("qbit1"); - firstClient.ShouldNotBeNull(); - - // Act - var secondClient = sut.GetClient("qbit1"); - - // Assert - secondClient.ShouldBeSameAs(firstClient); // Should return the same instance - } - - [Fact] - public async Task GetClient_WithNonExistingId_ShouldCreateNewClient() - { - // Arrange - var sut = _fixture.CreateSut(); - await sut.Initialize(); - - // Clear the internal clients collection to simulate a client that hasn't been created yet - var clients = GetPrivateClientsCollection(sut); - clients.Clear(); - - // Act - var client = sut.GetClient("qbit1"); - - // Assert - client.ShouldNotBeNull(); - client.ShouldBeOfType(); - clients.Count.ShouldBe(1); - } - - [Fact] - public void GetClient_WithEmptyId_ShouldThrowArgumentException() - { - // Arrange - var sut = _fixture.CreateSut(); - - // Act & Assert - Should.Throw(() => sut.GetClient(string.Empty)); - } - - [Fact] - public async Task GetClient_WithInvalidId_ShouldThrowKeyNotFoundException() - { - // Arrange - var sut = _fixture.CreateSut(); - await sut.Initialize(); - - // Act & Assert - Should.Throw(() => sut.GetClient("invalid-client-id")); - } - - [Fact] - public async Task GetAllClients_ShouldReturnAllEnabledClients() - { - // Arrange - var sut = _fixture.CreateSut(); - await sut.Initialize(); - - // Act - var clients = sut.GetAllClients(); - - // Assert - clients.Count().ShouldBe(3); - clients.Select(c => c.GetClientId()).ShouldContain("qbit1"); - clients.Select(c => c.GetClientId()).ShouldContain("transmission1"); - clients.Select(c => c.GetClientId()).ShouldContain("deluge1"); - } - - [Fact] - public async Task GetClientByType_ShouldReturnCorrectClientType() - { - // Arrange - var sut = _fixture.CreateSut(); - await sut.Initialize(); - - // Act - var qbitClients = sut.GetClientsByType(DownloadClient.QBittorrent); - var transmissionClients = sut.GetClientsByType(DownloadClient.Transmission); - var delugeClients = sut.GetClientsByType(DownloadClient.Deluge); - - // Assert - qbitClients.Count().ShouldBe(1); - qbitClients.First().ShouldBeOfType(); - - transmissionClients.Count().ShouldBe(1); - transmissionClients.First().ShouldBeOfType(); - - delugeClients.Count().ShouldBe(1); - delugeClients.First().ShouldBeOfType(); - } - - [Fact] - public async Task CreateClient_WithValidConfig_ShouldReturnInitializedClient() - { - // Arrange - var sut = _fixture.CreateSut(); - var config = _fixture.DownloadClientConfig.Clients.First(c => c.Type == DownloadClient.QBittorrent); - - // Act - var client = await sut.CreateClient(config.Id); - - // Assert - client.ShouldNotBeNull(); - client.GetClientId().ShouldBe(config.Id); - } - - [Fact] - public async Task RefreshClients_ShouldReinitializeAllClients() - { - // Arrange - var sut = _fixture.CreateSut(); - await sut.Initialize(); - - // Get initial collection of clients - var initialClients = sut.GetAllClients().ToList(); - - // Now modify the config to add a new client - var updatedConfig = new DownloadClientConfig - { - Clients = new List(_fixture.DownloadClientConfig.Clients) - }; - - // Add a new client - updatedConfig.Clients.Add(new ClientConfig - { - Id = "new-client", - Name = "New QBittorrent", - Type = DownloadClient.QBittorrent, - Enabled = true, - Url = "http://localhost:9999" - }); - - // Update the mock ConfigManager to return the updated config - _fixture.ConfigManager.GetDownloadClientConfigAsync().Returns(Task.FromResult(updatedConfig)); - - // Act - await sut.RefreshClients(); - var refreshedClients = sut.GetAllClients().ToList(); - - // Assert - refreshedClients.Count.ShouldBe(4); // Should have one more client now - refreshedClients.Select(c => c.GetClientId()).ShouldContain("new-client"); - } - - // Helper method to access the private _clients field using reflection - private ConcurrentDictionary GetPrivateClientsCollection(DownloadClientFactory factory) - { - var field = typeof(DownloadClientFactory).GetField("_clients", - System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance); - - return (ConcurrentDictionary)field!.GetValue(factory)!; - } -} diff --git a/code/Infrastructure.Tests/Verticals/DownloadClient/TestDownloadService.cs b/code/Infrastructure.Tests/Verticals/DownloadClient/TestDownloadService.cs deleted file mode 100644 index 5869ba14..00000000 --- a/code/Infrastructure.Tests/Verticals/DownloadClient/TestDownloadService.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System.Collections.Concurrent; -using System.Text.RegularExpressions; -using Common.Configuration.ContentBlocker; -using Common.Configuration.DownloadCleaner; -using Common.Configuration.QueueCleaner; -using Domain.Enums; -using Infrastructure.Interceptors; -using Infrastructure.Verticals.ContentBlocker; -using Infrastructure.Verticals.DownloadClient; -using Infrastructure.Verticals.Files; -using Infrastructure.Verticals.ItemStriker; -using Infrastructure.Verticals.Notifications; -using Microsoft.Extensions.Caching.Memory; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; - -namespace Infrastructure.Tests.Verticals.DownloadClient; - -public class TestDownloadService : DownloadService -{ - public TestDownloadService( - ILogger logger, - IOptions queueCleanerConfig, - IOptions contentBlockerConfig, - IOptions downloadCleanerConfig, - IMemoryCache cache, - IFilenameEvaluator filenameEvaluator, - IStriker striker, - INotificationPublisher notifier, - IDryRunInterceptor dryRunInterceptor, - IHardLinkFileService hardLinkFileService - ) : base( - logger, queueCleanerConfig, contentBlockerConfig, downloadCleanerConfig, cache, - filenameEvaluator, striker, notifier, dryRunInterceptor, hardLinkFileService - ) - { - } - - public override void Dispose() { } - public override Task LoginAsync() => Task.CompletedTask; - public override Task ShouldRemoveFromArrQueueAsync(string hash, IReadOnlyList ignoredDownloads) => Task.FromResult(new DownloadCheckResult()); - public override Task BlockUnwantedFilesAsync(string hash, BlocklistType blocklistType, - ConcurrentBag patterns, ConcurrentBag regexes, IReadOnlyList ignoredDownloads) => Task.FromResult(new BlockFilesResult()); - public override Task DeleteDownload(string hash) => Task.CompletedTask; - public override Task CreateCategoryAsync(string name) => Task.CompletedTask; - public override Task?> GetSeedingDownloads() => Task.FromResult?>(null); - public override List? FilterDownloadsToBeCleanedAsync(List? downloads, List categories) => null; - public override List? FilterDownloadsToChangeCategoryAsync(List? downloads, List categories) => null; - public override Task CleanDownloadsAsync(List? downloads, List categoriesToClean, HashSet excludedHashes, IReadOnlyList ignoredDownloads) => Task.CompletedTask; - public override Task ChangeCategoryForNoHardLinksAsync(List? downloads, HashSet excludedHashes, IReadOnlyList ignoredDownloads) => Task.CompletedTask; - // Expose protected methods for testing - public new void ResetStalledStrikesOnProgress(string hash, long downloaded) => base.ResetStalledStrikesOnProgress(hash, downloaded); - public new SeedingCheckResult ShouldCleanDownload(double ratio, TimeSpan seedingTime, CleanCategory category) => base.ShouldCleanDownload(ratio, seedingTime, category); -} \ No newline at end of file diff --git a/code/Infrastructure/Health/HealthCheckService.cs b/code/Infrastructure/Health/HealthCheckService.cs index 18ca7d5e..13417f9a 100644 --- a/code/Infrastructure/Health/HealthCheckService.cs +++ b/code/Infrastructure/Health/HealthCheckService.cs @@ -80,7 +80,7 @@ public class HealthCheckService : IHealthCheckService { ClientId = clientId, ClientName = config.Name, - ClientType = config.Type, + ClientTypeType = config.Type, IsHealthy = true, LastChecked = DateTime.UtcNow, ResponseTime = stopwatch.Elapsed @@ -99,7 +99,7 @@ public class HealthCheckService : IHealthCheckService { ClientId = clientId, ClientName = config.Name, - ClientType = config.Type, + ClientTypeType = config.Type, IsHealthy = false, LastChecked = DateTime.UtcNow, ErrorMessage = $"Connection failed: {ex.Message}", diff --git a/code/Infrastructure/Health/HealthStatus.cs b/code/Infrastructure/Health/HealthStatus.cs index ae8f8857..7f36a63b 100644 --- a/code/Infrastructure/Health/HealthStatus.cs +++ b/code/Infrastructure/Health/HealthStatus.cs @@ -38,5 +38,5 @@ public class HealthStatus /// /// Gets or sets the client type /// - public Common.Enums.DownloadClient ClientType { get; set; } + public Common.Enums.DownloadClientType ClientTypeType { get; set; } } diff --git a/code/Infrastructure/Http/DynamicHttpClientProvider.cs b/code/Infrastructure/Http/DynamicHttpClientProvider.cs index 088338d7..2346a56a 100644 --- a/code/Infrastructure/Http/DynamicHttpClientProvider.cs +++ b/code/Infrastructure/Http/DynamicHttpClientProvider.cs @@ -74,11 +74,18 @@ public class DynamicHttpClientProvider : IDynamicHttpClientProvider // Create handler with certificate validation var handler = new HttpClientHandler { - ServerCertificateCustomValidationCallback = _certificateValidationService.ShouldByPassValidationError, + ServerCertificateCustomValidationCallback = (sender, certificate, chain, sslPolicyErrors) => + _certificateValidationService.ShouldByPassValidationError( + httpConfig.CertificateValidation, + sender, + certificate, + chain, + sslPolicyErrors + ), UseDefaultCredentials = false }; - if (clientConfig.Type == Common.Enums.DownloadClient.Deluge) + if (clientConfig.Type == Common.Enums.DownloadClientType.Deluge) { handler.AllowAutoRedirect = true; handler.UseCookies = true; diff --git a/code/Infrastructure/Services/CertificateValidationService.cs b/code/Infrastructure/Services/CertificateValidationService.cs index d40457ac..f0079969 100644 --- a/code/Infrastructure/Services/CertificateValidationService.cs +++ b/code/Infrastructure/Services/CertificateValidationService.cs @@ -12,15 +12,19 @@ namespace Infrastructure.Services; public class CertificateValidationService { private readonly ILogger _logger; - private readonly HttpConfig _config; - public CertificateValidationService(ILogger logger, IConfigManager configManager) + public CertificateValidationService(ILogger logger) { _logger = logger; - _config = configManager.GetConfiguration("http.json") ?? new HttpConfig(); } - public bool ShouldByPassValidationError(object sender, X509Certificate? certificate, X509Chain? chain, SslPolicyErrors sslPolicyErrors) + public bool ShouldByPassValidationError( + CertificateValidationType certificateValidationType, + object sender, + X509Certificate? certificate, + X509Chain? chain, + SslPolicyErrors sslPolicyErrors + ) { var targetHostName = string.Empty; @@ -58,12 +62,12 @@ public class CertificateValidationService var ipAddresses = GetIpAddresses(targetHostName); - if (_config.CertificateValidation == CertificateValidationType.Disabled) + if (certificateValidationType == CertificateValidationType.Disabled) { return true; } - if (_config.CertificateValidation == CertificateValidationType.DisabledForLocalAddresses && + if (certificateValidationType == CertificateValidationType.DisabledForLocalAddresses && ipAddresses.All(i => i.IsLocalAddress())) { return true; diff --git a/code/Infrastructure/Verticals/Arr/LidarrClient.cs b/code/Infrastructure/Verticals/Arr/LidarrClient.cs index a9e1820f..1c279202 100644 --- a/code/Infrastructure/Verticals/Arr/LidarrClient.cs +++ b/code/Infrastructure/Verticals/Arr/LidarrClient.cs @@ -113,8 +113,6 @@ public class LidarrClient : ArrClient, ILidarrClient { try { - if (!_loggingConfig.Enhanced) return null; - StringBuilder log = new(); var albums = await GetAlbumsAsync(arrInstance, command.AlbumIds); diff --git a/code/Infrastructure/Verticals/Arr/RadarrClient.cs b/code/Infrastructure/Verticals/Arr/RadarrClient.cs index e91e4274..2c775328 100644 --- a/code/Infrastructure/Verticals/Arr/RadarrClient.cs +++ b/code/Infrastructure/Verticals/Arr/RadarrClient.cs @@ -114,11 +114,6 @@ public class RadarrClient : ArrClient, IRadarrClient { try { - if (!_loggingConfig.Enhanced) - { - return null; - } - StringBuilder log = new(); foreach (long movieId in command.MovieIds) diff --git a/code/Infrastructure/Verticals/Arr/SonarrClient.cs b/code/Infrastructure/Verticals/Arr/SonarrClient.cs index ca37a592..b92b87b1 100644 --- a/code/Infrastructure/Verticals/Arr/SonarrClient.cs +++ b/code/Infrastructure/Verticals/Arr/SonarrClient.cs @@ -123,11 +123,6 @@ public class SonarrClient : ArrClient, ISonarrClient { try { - if (!_loggingConfig.Enhanced) - { - return null; - } - StringBuilder log = new(); if (searchType is SonarrSearchType.Episode) diff --git a/code/Infrastructure/Verticals/DownloadCleaner/DownloadCleaner.cs b/code/Infrastructure/Verticals/DownloadCleaner/DownloadCleaner.cs index 9d8afc19..06dba5cf 100644 --- a/code/Infrastructure/Verticals/DownloadCleaner/DownloadCleaner.cs +++ b/code/Infrastructure/Verticals/DownloadCleaner/DownloadCleaner.cs @@ -168,7 +168,7 @@ public sealed class DownloadCleaner : GenericHandler { try { - if (_downloadClientConfig.Clients.Any(x => x.Type == Common.Enums.DownloadClient.QBittorrent) && !_config.UnlinkedUseTag) + if (_downloadClientConfig.Clients.Any(x => x.Type == Common.Enums.DownloadClientType.QBittorrent) && !_config.UnlinkedUseTag) { _logger.LogDebug("creating category {cat}", _config.UnlinkedTargetCategory); await downloadService.CreateCategoryAsync(_config.UnlinkedTargetCategory); diff --git a/code/Infrastructure/Verticals/DownloadClient/Deluge/DelugeService.cs b/code/Infrastructure/Verticals/DownloadClient/Deluge/DelugeService.cs index abb2b2bc..5dc52c38 100644 --- a/code/Infrastructure/Verticals/DownloadClient/Deluge/DelugeService.cs +++ b/code/Infrastructure/Verticals/DownloadClient/Deluge/DelugeService.cs @@ -54,7 +54,7 @@ public class DelugeService : DownloadService, IDelugeService base.Initialize(clientConfig); // Ensure client type is correct - if (clientConfig.Type != Common.Enums.DownloadClient.Deluge) + if (clientConfig.Type != Common.Enums.DownloadClientType.Deluge) { throw new InvalidOperationException($"Cannot initialize DelugeService with client type {clientConfig.Type}"); } @@ -187,7 +187,8 @@ public class DelugeService : DownloadService, IDelugeService } result.IsPrivate = download.Private; - + + var _contentBlockerConfig = await _configManager.GetContentBlockerConfigAsync(); if (_contentBlockerConfig.IgnorePrivate && download.Private) { // ignore private trackers @@ -322,6 +323,7 @@ public class DelugeService : DownloadService, IDelugeService continue; } + var _downloadCleanerConfig = await _configManager.GetDownloadCleanerConfigAsync(); if (!_downloadCleanerConfig.DeletePrivate && download.Private) { _logger.LogDebug("skip | download is private | {name}", download.Name); @@ -372,6 +374,7 @@ public class DelugeService : DownloadService, IDelugeService return; } + var _downloadCleanerConfig = await _configManager.GetDownloadCleanerConfigAsync(); if (!string.IsNullOrEmpty(_downloadCleanerConfig.UnlinkedIgnoredRootDir)) { _hardLinkFileService.PopulateFileCounts(_downloadCleanerConfig.UnlinkedIgnoredRootDir); diff --git a/code/Infrastructure/Verticals/DownloadClient/DownloadServiceFactory.cs b/code/Infrastructure/Verticals/DownloadClient/DownloadServiceFactory.cs index deb4689a..bc94d152 100644 --- a/code/Infrastructure/Verticals/DownloadClient/DownloadServiceFactory.cs +++ b/code/Infrastructure/Verticals/DownloadClient/DownloadServiceFactory.cs @@ -81,9 +81,9 @@ public sealed class DownloadServiceFactory return clientConfig.Type switch { - Common.Enums.DownloadClient.QBittorrent => CreateClientService(clientConfig), - Common.Enums.DownloadClient.Deluge => CreateClientService(clientConfig), - Common.Enums.DownloadClient.Transmission => CreateClientService(clientConfig), + Common.Enums.DownloadClientType.QBittorrent => CreateClientService(clientConfig), + Common.Enums.DownloadClientType.Deluge => CreateClientService(clientConfig), + Common.Enums.DownloadClientType.Transmission => CreateClientService(clientConfig), _ => null }; } diff --git a/code/Infrastructure/Verticals/DownloadClient/Factory/DownloadClientFactory.cs b/code/Infrastructure/Verticals/DownloadClient/Factory/DownloadClientFactory.cs index becd0f44..7c06831a 100644 --- a/code/Infrastructure/Verticals/DownloadClient/Factory/DownloadClientFactory.cs +++ b/code/Infrastructure/Verticals/DownloadClient/Factory/DownloadClientFactory.cs @@ -1,8 +1,8 @@ using System.Collections.Concurrent; using Common.Configuration.DownloadClient; using Common.Enums; -using Domain.Exceptions; using Infrastructure.Configuration; +using Infrastructure.Http; using Infrastructure.Interceptors; using Infrastructure.Verticals.ContentBlocker; using Infrastructure.Verticals.DownloadClient.Deluge; @@ -61,7 +61,7 @@ public class DownloadClientFactory : IDownloadClientFactory } /// - public IEnumerable GetClientsByType(DownloadClient clientType) + public IEnumerable GetClientsByType(DownloadClientType clientType) { var downloadClientConfig = _configManager.GetConfiguration("downloadclients.json") ?? new DownloadClientConfig(); @@ -109,14 +109,14 @@ public class DownloadClientFactory : IDownloadClientFactory if (clientConfig == null) { - throw new NotFoundException($"No configuration found for client with ID {clientId}"); + throw new Exception($"No configuration found for client with ID {clientId}"); } IDownloadService service = clientConfig.Type switch { - DownloadClient.QBittorrent => CreateQBitService(clientConfig), - DownloadClient.Transmission => CreateTransmissionService(clientConfig), - DownloadClient.Deluge => CreateDelugeService(clientConfig), + DownloadClientType.QBittorrent => CreateQBitService(clientConfig), + DownloadClientType.Transmission => CreateTransmissionService(clientConfig), + DownloadClientType.Deluge => CreateDelugeService(clientConfig), _ => throw new NotSupportedException($"Download client type {clientConfig.Type} is not supported") }; @@ -131,44 +131,22 @@ public class DownloadClientFactory : IDownloadClientFactory private QBitService CreateQBitService(ClientConfig clientConfig) { - return new QBitService( - _serviceProvider.GetRequiredService>(), - _serviceProvider.GetRequiredService(), - _configManager, - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService() - ); + var client = _serviceProvider.GetRequiredService(); + client.Initialize(clientConfig); + return client; } private TransmissionService CreateTransmissionService(ClientConfig clientConfig) { - return new TransmissionService( - _serviceProvider.GetRequiredService>(), - _configManager, - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService() - ); + var client = _serviceProvider.GetRequiredService(); + client.Initialize(clientConfig); + return client; } private DelugeService CreateDelugeService(ClientConfig clientConfig) { - return new DelugeService( - _serviceProvider.GetRequiredService>(), - _configManager, - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService(), - _serviceProvider.GetRequiredService() - ); + var client = _serviceProvider.GetRequiredService(); + client.Initialize(clientConfig); + return client; } } diff --git a/code/Infrastructure/Verticals/DownloadClient/Factory/IDownloadClientFactory.cs b/code/Infrastructure/Verticals/DownloadClient/Factory/IDownloadClientFactory.cs index b8886f64..64997a19 100644 --- a/code/Infrastructure/Verticals/DownloadClient/Factory/IDownloadClientFactory.cs +++ b/code/Infrastructure/Verticals/DownloadClient/Factory/IDownloadClientFactory.cs @@ -25,7 +25,7 @@ public interface IDownloadClientFactory /// /// The client type /// Collection of enabled download client services of the specified type - IEnumerable GetClientsByType(DownloadClient clientType); + IEnumerable GetClientsByType(DownloadClientType clientType); /// /// Refreshes a specific client instance (disposes and recreates) diff --git a/code/Infrastructure/Verticals/DownloadClient/QBittorrent/QBitService.cs b/code/Infrastructure/Verticals/DownloadClient/QBittorrent/QBitService.cs index 2a000c42..a2430b5f 100644 --- a/code/Infrastructure/Verticals/DownloadClient/QBittorrent/QBitService.cs +++ b/code/Infrastructure/Verticals/DownloadClient/QBittorrent/QBitService.cs @@ -53,7 +53,7 @@ public class QBitService : DownloadService, IQBitService base.Initialize(clientConfig); // Ensure client type is correct - if (clientConfig.Type != Common.Enums.DownloadClient.QBittorrent) + if (clientConfig.Type != Common.Enums.DownloadClientType.QBittorrent) { throw new InvalidOperationException($"Cannot initialize QBitService with client type {clientConfig.Type}"); } @@ -637,7 +637,8 @@ public class QBitService : DownloadService, IQBitService private async Task<(bool ShouldRemove, DeleteReason Reason)> CheckIfStuck(TorrentInfo torrent, bool isPrivate) { - if (_configManager.GetConfiguration("queuecleaner.json").StalledMaxStrikes is 0 && _configManager.GetConfiguration("queuecleaner.json").DownloadingMetadataMaxStrikes is 0) + var _queueCleanerConfig = await _configManager.GetQueueCleanerConfigAsync(); + if (_queueCleanerConfig.StalledMaxStrikes is 0 && _configManager.GetConfiguration("queuecleaner.json").DownloadingMetadataMaxStrikes is 0) { return (false, DeleteReason.None); } diff --git a/code/Infrastructure/Verticals/DownloadClient/Transmission/TransmissionService.cs b/code/Infrastructure/Verticals/DownloadClient/Transmission/TransmissionService.cs index bf889e5b..6ea34bae 100644 --- a/code/Infrastructure/Verticals/DownloadClient/Transmission/TransmissionService.cs +++ b/code/Infrastructure/Verticals/DownloadClient/Transmission/TransmissionService.cs @@ -74,7 +74,7 @@ public class TransmissionService : DownloadService, ITransmissionService base.Initialize(clientConfig); // Ensure client type is correct - if (clientConfig.Type != Common.Enums.DownloadClient.Transmission) + if (clientConfig.Type != Common.Enums.DownloadClientType.Transmission) { throw new InvalidOperationException($"Cannot initialize TransmissionService with client type {clientConfig.Type}"); } @@ -201,6 +201,7 @@ public class TransmissionService : DownloadService, ITransmissionService bool isPrivate = download.IsPrivate ?? false; result.IsPrivate = isPrivate; + var _contentBlockerConfig = await _configManager.GetContentBlockerConfigAsync(); if (_contentBlockerConfig.IgnorePrivate && isPrivate) { // ignore private trackers @@ -333,6 +334,7 @@ public class TransmissionService : DownloadService, ITransmissionService continue; } + var _downloadCleanerConfig = await _configManager.GetDownloadCleanerConfigAsync(); if (!_downloadCleanerConfig.DeletePrivate && download.IsPrivate is true) { _logger.LogDebug("skip | download is private | {name}", download.Name); @@ -376,6 +378,7 @@ public class TransmissionService : DownloadService, ITransmissionService return; } + var _downloadCleanerConfig = await _configManager.GetDownloadCleanerConfigAsync(); if (!string.IsNullOrEmpty(_downloadCleanerConfig.UnlinkedIgnoredRootDir)) { _hardLinkFileService.PopulateFileCounts(_downloadCleanerConfig.UnlinkedIgnoredRootDir);