mirror/Lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/Lidarr synced 2024-12-26 09:37:12 +00:00
Code Issues Releases Wiki Activity

Better validation messaging for Newznab Categories

Browse source
This commit is contained in:
Mark McDowall 2015-05-31 00:35:25 -07:00
parent f7adb19474
commit 4de20b09a8
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs
View file

@ -3,6 +3,7 @@
using System.Linq; using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using FluentValidation; using FluentValidation;
using FluentValidation.Results;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations; using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.ThingiProvider;
@ -37,12 +38,19 @@ private static bool ShouldHaveApiKey(NewznabSettings settings)
public NewznabSettingsValidator() public NewznabSettingsValidator()
{ {
Custom(newznab =>
{
if (newznab.Categories.Empty() && newznab.AnimeCategories.Empty())
{
return new ValidationFailure("", "Either 'Categories' or 'Anime Categories' must be provided");
}
return null;
});
RuleFor(c => c.Url).ValidRootUrl(); RuleFor(c => c.Url).ValidRootUrl();
RuleFor(c => c.ApiKey).NotEmpty().When(ShouldHaveApiKey); RuleFor(c => c.ApiKey).NotEmpty().When(ShouldHaveApiKey);
RuleFor(c => c.Categories).NotEmpty().When(c => !c.AnimeCategories.Any()); RuleFor(c => c.AdditionalParameters).Matches(AdditionalParametersRegex)
RuleFor(c => c.AnimeCategories).NotEmpty().When(c => !c.Categories.Any());
RuleFor(c => c.AdditionalParameters)
.Matches(AdditionalParametersRegex)
.When(c => !c.AdditionalParameters.IsNullOrWhiteSpace()); .When(c => !c.AdditionalParameters.IsNullOrWhiteSpace());
} }
} }
@ -63,16 +71,13 @@ public NewznabSettings()
[FieldDefinition(1, Label = "API Key")] [FieldDefinition(1, Label = "API Key")]
public String ApiKey { get; set; } public String ApiKey { get; set; }
[FieldDefinition(2, Label = "Categories", [FieldDefinition(2, Label = "Categories", HelpText = "Comma Separated list, leave blank to disable standard/daily shows", Advanced = true)]
HelpText = "Comma Separated list, leave blank to disable standard/daily shows", Advanced = true)]
public IEnumerable<Int32> Categories { get; set; } public IEnumerable<Int32> Categories { get; set; }
[FieldDefinition(3, Label = "Anime Categories", HelpText = "Comma Separated list, leave blank to disable anime", [FieldDefinition(3, Label = "Anime Categories", HelpText = "Comma Separated list, leave blank to disable anime", Advanced = true)]
Advanced = true)]
public IEnumerable<Int32> AnimeCategories { get; set; } public IEnumerable<Int32> AnimeCategories { get; set; }
[FieldDefinition(4, Label = "Additional Parameters", HelpText = "Additional newznab parameters", Advanced = true [FieldDefinition(4, Label = "Additional Parameters", HelpText = "Additional newznab parameters", Advanced = true)]
)]
public String AdditionalParameters { get; set; } public String AdditionalParameters { get; set; }
public NzbDroneValidationResult Validate() public NzbDroneValidationResult Validate()