From f3a33cf817abeb8dd09bc8dded8f14ab96d62327 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Tue, 31 Aug 2021 19:16:42 -0500 Subject: [PATCH] Fixed: Missing Proxy Validation Translations --- .../IndexerProxies/FlareSolverr/FlareSolverr.cs | 9 +++++---- src/NzbDrone.Core/IndexerProxies/Http/Http.cs | 5 +++-- src/NzbDrone.Core/IndexerProxies/HttpIndexerProxyBase.cs | 7 +++++-- src/NzbDrone.Core/IndexerProxies/Socks4/Socks4.cs | 5 +++-- src/NzbDrone.Core/IndexerProxies/Socks5/Socks5.cs | 5 +++-- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/NzbDrone.Core/IndexerProxies/FlareSolverr/FlareSolverr.cs b/src/NzbDrone.Core/IndexerProxies/FlareSolverr/FlareSolverr.cs index f58f9ccaf..4c9b2b511 100644 --- a/src/NzbDrone.Core/IndexerProxies/FlareSolverr/FlareSolverr.cs +++ b/src/NzbDrone.Core/IndexerProxies/FlareSolverr/FlareSolverr.cs @@ -7,14 +7,15 @@ using NLog; using NzbDrone.Common.Cloud; using NzbDrone.Common.Http; using NzbDrone.Common.Serializer; +using NzbDrone.Core.Localization; using NzbDrone.Core.Validation; namespace NzbDrone.Core.IndexerProxies.FlareSolverr { public class FlareSolverr : HttpIndexerProxyBase { - public FlareSolverr(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger) - : base(cloudRequestBuilder, httpClient, logger) + public FlareSolverr(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger, ILocalizationService localizationService) + : base(cloudRequestBuilder, httpClient, logger, localizationService) { } @@ -133,13 +134,13 @@ namespace NzbDrone.Core.IndexerProxies.FlareSolverr if (response.StatusCode == HttpStatusCode.BadRequest) { _logger.Error("Proxy Health Check failed: {0}", response.StatusCode); - failures.Add(new NzbDroneValidationFailure("Host", "ProxyCheckBadRequestMessage")); + failures.Add(new NzbDroneValidationFailure("Host", string.Format(_localizationService.GetLocalizedString("ProxyCheckBadRequestMessage"), response.StatusCode))); } } catch (Exception ex) { _logger.Error(ex, "Proxy Health Check failed"); - failures.Add(new NzbDroneValidationFailure("Host", "ProxyCheckFailedToTestMessage")); + failures.Add(new NzbDroneValidationFailure("Host", string.Format(_localizationService.GetLocalizedString("ProxyCheckFailedToTestMessage"), request.Url.Host))); } return new ValidationResult(failures); diff --git a/src/NzbDrone.Core/IndexerProxies/Http/Http.cs b/src/NzbDrone.Core/IndexerProxies/Http/Http.cs index 03ab6a802..838b3b2c8 100644 --- a/src/NzbDrone.Core/IndexerProxies/Http/Http.cs +++ b/src/NzbDrone.Core/IndexerProxies/Http/Http.cs @@ -3,13 +3,14 @@ using NLog; using NzbDrone.Common.Cloud; using NzbDrone.Common.Extensions; using NzbDrone.Common.Http; +using NzbDrone.Core.Localization; namespace NzbDrone.Core.IndexerProxies.Http { public class Http : HttpIndexerProxyBase { - public Http(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger) - : base(cloudRequestBuilder, httpClient, logger) + public Http(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger, ILocalizationService localizationService) + : base(cloudRequestBuilder, httpClient, logger, localizationService) { } diff --git a/src/NzbDrone.Core/IndexerProxies/HttpIndexerProxyBase.cs b/src/NzbDrone.Core/IndexerProxies/HttpIndexerProxyBase.cs index f37389b4d..6ddc8b6bc 100644 --- a/src/NzbDrone.Core/IndexerProxies/HttpIndexerProxyBase.cs +++ b/src/NzbDrone.Core/IndexerProxies/HttpIndexerProxyBase.cs @@ -6,6 +6,7 @@ using FluentValidation.Results; using NLog; using NzbDrone.Common.Cloud; using NzbDrone.Common.Http; +using NzbDrone.Core.Localization; using NzbDrone.Core.Validation; namespace NzbDrone.Core.IndexerProxies @@ -16,12 +17,14 @@ namespace NzbDrone.Core.IndexerProxies protected readonly IHttpClient _httpClient; protected readonly IHttpRequestBuilderFactory _cloudRequestBuilder; protected readonly Logger _logger; + protected readonly ILocalizationService _localizationService; - public HttpIndexerProxyBase(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger) + public HttpIndexerProxyBase(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger, ILocalizationService localizationService) { _httpClient = httpClient; _logger = logger; _cloudRequestBuilder = cloudRequestBuilder.Services; + _localizationService = localizationService; } public override ValidationResult Test() @@ -31,7 +34,7 @@ namespace NzbDrone.Core.IndexerProxies var addresses = Dns.GetHostAddresses(Settings.Host); if (!addresses.Any()) { - failures.Add(new NzbDroneValidationFailure("Host", "ProxyCheckResolveIpMessage")); + failures.Add(new NzbDroneValidationFailure("Host", string.Format(_localizationService.GetLocalizedString("ProxyCheckResolveIpMessage"), addresses))); } var request = PreRequest(_cloudRequestBuilder.Create() diff --git a/src/NzbDrone.Core/IndexerProxies/Socks4/Socks4.cs b/src/NzbDrone.Core/IndexerProxies/Socks4/Socks4.cs index 22ca0ce2c..54177a917 100644 --- a/src/NzbDrone.Core/IndexerProxies/Socks4/Socks4.cs +++ b/src/NzbDrone.Core/IndexerProxies/Socks4/Socks4.cs @@ -8,13 +8,14 @@ using NLog; using NzbDrone.Common.Cloud; using NzbDrone.Common.Extensions; using NzbDrone.Common.Http; +using NzbDrone.Core.Localization; namespace NzbDrone.Core.IndexerProxies.Socks4 { public class Socks4 : HttpIndexerProxyBase { - public Socks4(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger) - : base(cloudRequestBuilder, httpClient, logger) + public Socks4(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger, ILocalizationService localizationService) + : base(cloudRequestBuilder, httpClient, logger, localizationService) { } diff --git a/src/NzbDrone.Core/IndexerProxies/Socks5/Socks5.cs b/src/NzbDrone.Core/IndexerProxies/Socks5/Socks5.cs index 3ad62e24a..c41c00549 100644 --- a/src/NzbDrone.Core/IndexerProxies/Socks5/Socks5.cs +++ b/src/NzbDrone.Core/IndexerProxies/Socks5/Socks5.cs @@ -8,13 +8,14 @@ using NLog; using NzbDrone.Common.Cloud; using NzbDrone.Common.Extensions; using NzbDrone.Common.Http; +using NzbDrone.Core.Localization; namespace NzbDrone.Core.IndexerProxies.Socks5 { public class Socks5 : HttpIndexerProxyBase { - public Socks5(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger) - : base(cloudRequestBuilder, httpClient, logger) + public Socks5(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger, ILocalizationService localizationService) + : base(cloudRequestBuilder, httpClient, logger, localizationService) { }