shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-17 17:14:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Missing Proxy Validation Translations

Browse Source
This commit is contained in:
bakerboy448
2021-08-31 19:16:42 -05:00
committed by Qstick
parent 593a0e9658
commit f3a33cf817
5 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/NzbDrone.Core/IndexerProxies/FlareSolverr/FlareSolverr.cs
View File

@@ -7,14 +7,15 @@ using NLog;
using NzbDrone.Common.Cloud; using NzbDrone.Common.Cloud;
using NzbDrone.Common.Http; using NzbDrone.Common.Http;
using NzbDrone.Common.Serializer; using NzbDrone.Common.Serializer;
using NzbDrone.Core.Localization;
using NzbDrone.Core.Validation; using NzbDrone.Core.Validation;
namespace NzbDrone.Core.IndexerProxies.FlareSolverr namespace NzbDrone.Core.IndexerProxies.FlareSolverr
{ {
public class FlareSolverr : HttpIndexerProxyBase<FlareSolverrSettings> public class FlareSolverr : HttpIndexerProxyBase<FlareSolverrSettings>
{ {
public FlareSolverr(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger) public FlareSolverr(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger, ILocalizationService localizationService)
: base(cloudRequestBuilder, httpClient, logger) : base(cloudRequestBuilder, httpClient, logger, localizationService)
{ {
} }
@@ -133,13 +134,13 @@ namespace NzbDrone.Core.IndexerProxies.FlareSolverr
if (response.StatusCode == HttpStatusCode.BadRequest) if (response.StatusCode == HttpStatusCode.BadRequest)
{ {
_logger.Error("Proxy Health Check failed: {0}", response.StatusCode); _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) catch (Exception ex)
{ {
_logger.Error(ex, "Proxy Health Check failed"); _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); return new ValidationResult(failures);

5
src/NzbDrone.Core/IndexerProxies/Http/Http.cs
View File

@@ -3,13 +3,14 @@ using NLog;
using NzbDrone.Common.Cloud; using NzbDrone.Common.Cloud;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http; using NzbDrone.Common.Http;
using NzbDrone.Core.Localization;
namespace NzbDrone.Core.IndexerProxies.Http namespace NzbDrone.Core.IndexerProxies.Http
{ {
public class Http : HttpIndexerProxyBase<HttpSettings> public class Http : HttpIndexerProxyBase<HttpSettings>
{ {
public Http(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger) public Http(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger, ILocalizationService localizationService)
: base(cloudRequestBuilder, httpClient, logger) : base(cloudRequestBuilder, httpClient, logger, localizationService)
{ {
} }

7
src/NzbDrone.Core/IndexerProxies/HttpIndexerProxyBase.cs
View File

@@ -6,6 +6,7 @@ using FluentValidation.Results;
using NLog; using NLog;
using NzbDrone.Common.Cloud; using NzbDrone.Common.Cloud;
using NzbDrone.Common.Http; using NzbDrone.Common.Http;
using NzbDrone.Core.Localization;
using NzbDrone.Core.Validation; using NzbDrone.Core.Validation;
namespace NzbDrone.Core.IndexerProxies namespace NzbDrone.Core.IndexerProxies
@@ -16,12 +17,14 @@ namespace NzbDrone.Core.IndexerProxies
protected readonly IHttpClient _httpClient; protected readonly IHttpClient _httpClient;
protected readonly IHttpRequestBuilderFactory _cloudRequestBuilder; protected readonly IHttpRequestBuilderFactory _cloudRequestBuilder;
protected readonly Logger _logger; 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; _httpClient = httpClient;
_logger = logger; _logger = logger;
_cloudRequestBuilder = cloudRequestBuilder.Services; _cloudRequestBuilder = cloudRequestBuilder.Services;
_localizationService = localizationService;
} }
public override ValidationResult Test() public override ValidationResult Test()
@@ -31,7 +34,7 @@ namespace NzbDrone.Core.IndexerProxies
var addresses = Dns.GetHostAddresses(Settings.Host); var addresses = Dns.GetHostAddresses(Settings.Host);
if (!addresses.Any()) 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() var request = PreRequest(_cloudRequestBuilder.Create()

5
src/NzbDrone.Core/IndexerProxies/Socks4/Socks4.cs
View File

@@ -8,13 +8,14 @@ using NLog;
using NzbDrone.Common.Cloud; using NzbDrone.Common.Cloud;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http; using NzbDrone.Common.Http;
using NzbDrone.Core.Localization;
namespace NzbDrone.Core.IndexerProxies.Socks4 namespace NzbDrone.Core.IndexerProxies.Socks4
{ {
public class Socks4 : HttpIndexerProxyBase<Socks4Settings> public class Socks4 : HttpIndexerProxyBase<Socks4Settings>
{ {
public Socks4(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger) public Socks4(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger, ILocalizationService localizationService)
: base(cloudRequestBuilder, httpClient, logger) : base(cloudRequestBuilder, httpClient, logger, localizationService)
{ {
} }

5
src/NzbDrone.Core/IndexerProxies/Socks5/Socks5.cs
View File

@@ -8,13 +8,14 @@ using NLog;
using NzbDrone.Common.Cloud; using NzbDrone.Common.Cloud;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http; using NzbDrone.Common.Http;
using NzbDrone.Core.Localization;
namespace NzbDrone.Core.IndexerProxies.Socks5 namespace NzbDrone.Core.IndexerProxies.Socks5
{ {
public class Socks5 : HttpIndexerProxyBase<Socks5Settings> public class Socks5 : HttpIndexerProxyBase<Socks5Settings>
{ {
public Socks5(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger) public Socks5(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger, ILocalizationService localizationService)
: base(cloudRequestBuilder, httpClient, logger) : base(cloudRequestBuilder, httpClient, logger, localizationService)
{ {
} }