From e32e6e0bec953354d3dfa9ba10d2b2023cc90fb3 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 19 Feb 2019 18:48:54 -0800 Subject: [PATCH] Groups must contain multiple qualities --- .../Profiles/Quality/QualityItemsValidator.cs | 10 +++++----- .../Profiles/Quality/QualityProfileModule.cs | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Sonarr.Api.V3/Profiles/Quality/QualityItemsValidator.cs b/src/Sonarr.Api.V3/Profiles/Quality/QualityItemsValidator.cs index 2a6849ff4..940435b3a 100644 --- a/src/Sonarr.Api.V3/Profiles/Quality/QualityItemsValidator.cs +++ b/src/Sonarr.Api.V3/Profiles/Quality/QualityItemsValidator.cs @@ -13,7 +13,7 @@ namespace Sonarr.Api.V3.Profiles.Quality ruleBuilder.SetValidator(new NotEmptyValidator(null)); ruleBuilder.SetValidator(new AllowedValidator()); ruleBuilder.SetValidator(new QualityNameValidator()); - ruleBuilder.SetValidator(new EmptyItemGroupNameValidator()); + ruleBuilder.SetValidator(new GroupItemValidator()); ruleBuilder.SetValidator(new ItemGroupIdValidator()); ruleBuilder.SetValidator(new UniqueIdValidator()); ruleBuilder.SetValidator(new UniqueQualityIdValidator()); @@ -47,10 +47,10 @@ namespace Sonarr.Api.V3.Profiles.Quality } } - public class EmptyItemGroupNameValidator : PropertyValidator + public class GroupItemValidator : PropertyValidator { - public EmptyItemGroupNameValidator() - : base("Groups must not be empty") + public GroupItemValidator() + : base("Groups must contain multiple qualities") { } @@ -59,7 +59,7 @@ namespace Sonarr.Api.V3.Profiles.Quality { var items = context.PropertyValue as IList; - if (items.Any(i => i.Name.IsNotNullOrWhiteSpace() && i.Items.Empty())) + if (items.Any(i => i.Name.IsNotNullOrWhiteSpace() && i.Items.Count <= 1)) { return false; } diff --git a/src/Sonarr.Api.V3/Profiles/Quality/QualityProfileModule.cs b/src/Sonarr.Api.V3/Profiles/Quality/QualityProfileModule.cs index a57fb3253..1c8614312 100644 --- a/src/Sonarr.Api.V3/Profiles/Quality/QualityProfileModule.cs +++ b/src/Sonarr.Api.V3/Profiles/Quality/QualityProfileModule.cs @@ -13,8 +13,6 @@ namespace Sonarr.Api.V3.Profiles.Quality { _profileService = profileService; SharedValidator.RuleFor(c => c.Name).NotEmpty(); - // TODO: Need to validate the cutoff is allowed and the ID/quality ID exists - // TODO: Need to validate the Items to ensure groups have names and at no item has no name, no items and no quality SharedValidator.RuleFor(c => c.Cutoff).ValidCutoff(); SharedValidator.RuleFor(c => c.Items).ValidItems();