1
0
Fork 0
mirror of https://github.com/lidarr/Lidarr synced 2025-02-25 23:32:41 +00:00

Continue Test in case of validation warnings.

This commit is contained in:
Taloth Saldono 2019-03-24 15:22:50 +01:00 committed by Qstick
parent bbcdac2377
commit 50ac0c8235
11 changed files with 30 additions and 15 deletions

View file

@ -197,7 +197,7 @@ public override DownloadClientInfo GetStatus()
protected override void Test(List<ValidationFailure> failures)
{
failures.AddIfNotNull(TestConnection());
if (failures.Any()) return;
if (failures.HasErrors()) return;
failures.AddIfNotNull(TestCategory());
failures.AddIfNotNull(TestGetTorrents());
}

View file

@ -197,7 +197,7 @@ protected override string AddFromTorrentFile(RemoteAlbum remoteAlbum, string has
protected override void Test(List<ValidationFailure> failures)
{
failures.AddIfNotNull(TestConnection());
if (failures.Any()) return;
if (failures.HasErrors()) return;
failures.AddIfNotNull(TestOutputPath());
failures.AddIfNotNull(TestGetTorrents());
}

View file

@ -192,7 +192,7 @@ protected override string AddFromNzbFile(RemoteAlbum remoteAlbum, string filenam
protected override void Test(List<ValidationFailure> failures)
{
failures.AddIfNotNull(TestConnection());
if (failures.Any()) return;
if (failures.HasErrors()) return;
failures.AddIfNotNull(TestOutputPath());
failures.AddIfNotNull(TestGetNZB());
}

View file

@ -130,7 +130,7 @@ public override DownloadClientInfo GetStatus()
protected override void Test(List<ValidationFailure> failures)
{
failures.AddIfNotNull(TestConnection());
if (failures.Any()) return;
if (failures.HasErrors()) return;
failures.AddIfNotNull(TestGetTorrents());
}

View file

@ -215,10 +215,7 @@ public override DownloadClientInfo GetStatus()
protected override void Test(List<ValidationFailure> failures)
{
failures.AddIfNotNull(TestConnection());
if (failures.Any())
{
return;
}
if (failures.HasErrors()) return;
failures.AddIfNotNull(TestPrioritySupport());
failures.AddIfNotNull(TestGetTorrents());
}

View file

@ -165,7 +165,7 @@ protected override string AddFromTorrentFile(RemoteAlbum remoteAlbum, string has
protected override void Test(List<ValidationFailure> failures)
{
failures.AddIfNotNull(TestConnection());
if (failures.Any()) return;
if (failures.HasErrors()) return;
failures.AddIfNotNull(TestGetTorrents());
}

View file

@ -163,7 +163,7 @@ public override DownloadClientInfo GetStatus()
protected override void Test(List<ValidationFailure> failures)
{
failures.AddIfNotNull(TestConnection());
if (failures.Any()) return;
if (failures.HasErrors()) return;
failures.AddIfNotNull(TestGetTorrents());
failures.AddIfNotNull(TestDirectory());
}

View file

@ -224,7 +224,7 @@ public override DownloadClientInfo GetStatus()
protected override void Test(List<ValidationFailure> failures)
{
failures.AddIfNotNull(TestConnection());
if (failures.Any()) return;
if (failures.HasErrors()) return;
failures.AddIfNotNull(TestGetTorrents());
}

View file

@ -8,6 +8,7 @@
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Parser;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Indexers.Newznab
{
@ -91,8 +92,7 @@ private NewznabSettings GetSettings(string url, params int[] categories)
protected override void Test(List<ValidationFailure> failures)
{
base.Test(failures);
if (failures.Any()) return;
if (failures.HasErrors()) return;
failures.AddIfNotNull(TestCapabilities());
}

View file

@ -9,6 +9,7 @@
using NzbDrone.Core.Indexers.Newznab;
using NzbDrone.Core.Parser;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Indexers.Torznab
{
@ -72,8 +73,7 @@ private TorznabSettings GetSettings(string url, params int[] categories)
protected override void Test(List<ValidationFailure> failures)
{
base.Test(failures);
if (failures.Any()) return;
if (failures.HasErrors()) return;
failures.AddIfNotNull(TestCapabilities());
}

View file

@ -1,5 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using FluentValidation;
using FluentValidation.Results;
namespace NzbDrone.Core.Validation
{
@ -19,5 +21,21 @@ public static void ThrowOnError(this NzbDroneValidationResult result)
throw new ValidationException(result.Errors);
}
}
public static bool HasErrors(this List<ValidationFailure> list)
{
foreach (var item in list)
{
var extended = item as NzbDroneValidationFailure;
if (extended != null && extended.IsWarning)
{
continue;
}
return true;
}
return false;
}
}
}