mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify ShouldHaveApiKey and HasErrors 

(cherry picked from commit 7343616a47cd538bba4c9128d2c1094561f9b3a5)
This commit is contained in:
Bogdan 2023-05-26 18:32:35 +03:00
parent d762d5f756
commit a05082b4c6
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 @@ namespace NzbDrone.Core.Indexers.Newznab
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 @@ namespace NzbDrone.Core.Indexers.Torznab
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 @@ namespace NzbDrone.Core.Validation
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 });
}
}
}