self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2025-01-10 23:29:53 +02:00
Code Issues Releases Activity

Simplify ShouldHaveApiKey and HasErrors

Browse Source
This commit is contained in:
Bogdan 2023-05-26 18:32:35 +03:00 committed by Mark McDowall
parent efab1b0793
commit 7343616a47
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/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/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 });
}
}
}