Backup_Repos/Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr synced 2025-12-06 08:34:28 +01:00
Code Issues Projects Releases Wiki Activity

Simplify ShouldHaveApiKey and HasErrors

Browse source 
(cherry picked from commit 7343616a47cd538bba4c9128d2c1094561f9b3a5)
This commit is contained in:
Bogdan 2023-05-26 18:32:35 +03:00
parent 65541017dd
commit fcfec1b859
3 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabSettings.cs
View file

@ -23,12 +23,7 @@ public class NewznabSettingsValidator : AbstractValidator<NewznabSettings>
private static bool ShouldHaveApiKey(NewznabSettings settings)
{
if (settings.BaseUrl == null)
{
return false;
}
return ApiKeyWhiteList.Any(c => settings.BaseUrl.ToLowerInvariant().Contains(c));
return settings.BaseUrl != null && ApiKeyWhiteList.Any(c => settings.BaseUrl.ToLowerInvariant().Contains(c));
}
private static readonly Regex AdditionalParametersRegex = new Regex(@"(&.+?\=.+?)+", RegexOptions.Compiled);

7
src/NzbDrone.Core/Indexers/Definitions/Torznab/TorznabSettings.cs
View file

@ -17,12 +17,7 @@ public class TorznabSettingsValidator : AbstractValidator<TorznabSettings>
private static bool ShouldHaveApiKey(TorznabSettings settings)
{
if (settings.BaseUrl == null)
{
return false;
}
return ApiKeyWhiteList.Any(c => settings.BaseUrl.ToLowerInvariant().Contains(c));
return settings.BaseUrl != null && ApiKeyWhiteList.Any(c => settings.BaseUrl.ToLowerInvariant().Contains(c));
}
private static readonly Regex AdditionalParametersRegex = new Regex(@"(&.+?\=.+?)+", RegexOptions.Compiled);

12
src/NzbDrone.Core/Validation/NzbDroneValidationExtensions.cs
View file

@ -24,17 +24,7 @@ public static void ThrowOnError(this NzbDroneValidationResult result)
public static bool HasErrors(this List<ValidationFailure> list)
{
foreach (var item in list)
{
if (item is NzbDroneValidationFailure { IsWarning: true })
{
continue;
}
return true;
}
return false;
return list.Any(item => item is not NzbDroneValidationFailure { IsWarning: true });
}
}
}