mirror of https://github.com/Radarr/Radarr
Migrate to FluentValidation 9
(cherry picked from commit 40e54685b9e83ed24a3979bfe965c453339ad02e)
This commit is contained in:
parent
89fd3e4671
commit
d2787d8181
|
@ -16,18 +16,7 @@ namespace NzbDrone.Common.Extensions
|
|||
return false;
|
||||
}
|
||||
|
||||
Uri uri;
|
||||
if (!Uri.TryCreate(path, UriKind.Absolute, out uri))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!uri.IsWellFormedOriginalString())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
return Uri.TryCreate(path, UriKind.Absolute, out var uri) && uri.IsWellFormedOriginalString();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -61,7 +61,6 @@ namespace NzbDrone.Core.Test.NotificationTests.EmailTests
|
|||
}
|
||||
|
||||
[TestCase("radarr")]
|
||||
[TestCase("radarr@radarr")]
|
||||
[TestCase("radarr.video")]
|
||||
public void should_not_be_valid_if_to_is_invalid(string email)
|
||||
{
|
||||
|
@ -71,7 +70,6 @@ namespace NzbDrone.Core.Test.NotificationTests.EmailTests
|
|||
}
|
||||
|
||||
[TestCase("radarr")]
|
||||
[TestCase("radarr@radarr")]
|
||||
[TestCase("radarr.video")]
|
||||
public void should_not_be_valid_if_cc_is_invalid(string email)
|
||||
{
|
||||
|
@ -81,7 +79,6 @@ namespace NzbDrone.Core.Test.NotificationTests.EmailTests
|
|||
}
|
||||
|
||||
[TestCase("radarr")]
|
||||
[TestCase("radarr@radarr")]
|
||||
[TestCase("radarr.video")]
|
||||
public void should_not_be_valid_if_bcc_is_invalid(string email)
|
||||
{
|
||||
|
|
|
@ -17,7 +17,7 @@ namespace NzbDrone.Core.Download.Clients.rTorrent
|
|||
PathExistsValidator pathExistsValidator,
|
||||
MappedNetworkDriveValidator mappedNetworkDriveValidator)
|
||||
{
|
||||
RuleFor(c => c.MovieDirectory).Cascade(CascadeMode.StopOnFirstFailure)
|
||||
RuleFor(c => c.MovieDirectory).Cascade(CascadeMode.Stop)
|
||||
.IsValidPath()
|
||||
.SetValidator(rootFolderValidator)
|
||||
.SetValidator(mappedNetworkDriveValidator)
|
||||
|
|
|
@ -16,7 +16,7 @@ namespace NzbDrone.Core.Movies
|
|||
MoviePathValidator moviePathValidator,
|
||||
MovieAncestorValidator movieAncestorValidator)
|
||||
{
|
||||
RuleFor(c => c.Path).Cascade(CascadeMode.StopOnFirstFailure)
|
||||
RuleFor(c => c.Path).Cascade(CascadeMode.Stop)
|
||||
.IsValidPath()
|
||||
.SetValidator(rootFolderValidator)
|
||||
.SetValidator(recycleBinValidator)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
using FluentValidation;
|
||||
using FluentValidation;
|
||||
using FluentValidation.Validators;
|
||||
|
||||
namespace NzbDrone.Core.Organizer
|
||||
|
|
|
@ -10,11 +10,12 @@ namespace NzbDrone.Core.Profiles.Delay
|
|||
private readonly IDelayProfileService _delayProfileService;
|
||||
|
||||
public DelayProfileTagInUseValidator(IDelayProfileService delayProfileService)
|
||||
: base("One or more tags is used in another profile")
|
||||
{
|
||||
_delayProfileService = delayProfileService;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => "One or more tags is used in another profile";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
|
@ -25,9 +26,7 @@ namespace NzbDrone.Core.Profiles.Delay
|
|||
dynamic instance = context.ParentContext.InstanceToValidate;
|
||||
var instanceId = (int)instance.Id;
|
||||
|
||||
var collection = context.PropertyValue as HashSet<int>;
|
||||
|
||||
if (collection == null || collection.Empty())
|
||||
if (context.PropertyValue is not HashSet<int> collection || collection.Empty())
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
<PackageReference Include="Servarr.FluentMigrator.Runner" Version="3.3.2.9" />
|
||||
<PackageReference Include="Servarr.FluentMigrator.Runner.SQLite" Version="3.3.2.9" />
|
||||
<PackageReference Include="Servarr.FluentMigrator.Runner.Postgres" Version="3.3.2.9" />
|
||||
<PackageReference Include="FluentValidation" Version="8.6.2" />
|
||||
<PackageReference Include="FluentValidation" Version="9.5.4" />
|
||||
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
|
||||
<PackageReference Include="NLog" Version="5.0.1" />
|
||||
|
|
|
@ -8,11 +8,12 @@ namespace NzbDrone.Core.Validation
|
|||
private readonly IDiskProvider _diskProvider;
|
||||
|
||||
public FolderChmodValidator(IDiskProvider diskProvider)
|
||||
: base("Must contain a valid Unix permissions octal")
|
||||
{
|
||||
_diskProvider = diskProvider;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => "Must contain a valid Unix permissions octal";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
|
|
|
@ -5,10 +5,7 @@ namespace NzbDrone.Core.Validation
|
|||
{
|
||||
public class FolderValidator : PropertyValidator
|
||||
{
|
||||
public FolderValidator()
|
||||
: base("Invalid Path")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Invalid Path";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
|
|
|
@ -8,11 +8,12 @@ namespace NzbDrone.Core.Validation.Paths
|
|||
private readonly IDiskProvider _diskProvider;
|
||||
|
||||
public FileExistsValidator(IDiskProvider diskProvider)
|
||||
: base("File does not exist")
|
||||
{
|
||||
_diskProvider = diskProvider;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => "File does not exist";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
|
|
|
@ -9,11 +9,12 @@ namespace NzbDrone.Core.Validation.Paths
|
|||
private readonly IDiskProvider _diskProvider;
|
||||
|
||||
public FolderWritableValidator(IDiskProvider diskProvider)
|
||||
: base($"Folder is not writable by user {Environment.UserName}")
|
||||
{
|
||||
_diskProvider = diskProvider;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => $"Folder is not writable by user {Environment.UserName}";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
|
|
|
@ -14,12 +14,13 @@ namespace NzbDrone.Core.Validation.Paths
|
|||
private static readonly Regex DriveRegex = new Regex(@"[a-z]\:\\", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
||||
|
||||
public MappedNetworkDriveValidator(IRuntimeInfo runtimeInfo, IDiskProvider diskProvider)
|
||||
: base("Mapped Network Drive and Windows Service")
|
||||
{
|
||||
_runtimeInfo = runtimeInfo;
|
||||
_diskProvider = diskProvider;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => "Mapped Network Drive and Windows Service";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
|
@ -46,12 +47,7 @@ namespace NzbDrone.Core.Validation.Paths
|
|||
|
||||
var mount = _diskProvider.GetMount(path);
|
||||
|
||||
if (mount != null && mount.DriveType == DriveType.Network)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
return mount is not { DriveType: DriveType.Network };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -10,11 +10,12 @@ namespace NzbDrone.Core.Validation.Paths
|
|||
private readonly IMovieService _movieService;
|
||||
|
||||
public MovieAncestorValidator(IMovieService movieService)
|
||||
: base("Path is an ancestor of an existing movie")
|
||||
{
|
||||
_movieService = movieService;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => "Path is an ancestor of an existing movie";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
|
|
|
@ -8,11 +8,12 @@ namespace NzbDrone.Core.Validation.Paths
|
|||
private readonly IMovieService _movieService;
|
||||
|
||||
public MovieExistsValidator(IMovieService movieService)
|
||||
: base("This movie has already been added")
|
||||
{
|
||||
_movieService = movieService;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => "This movie has already been added";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
|
|
|
@ -10,11 +10,12 @@ namespace NzbDrone.Core.Validation.Paths
|
|||
private readonly IMovieService _moviesService;
|
||||
|
||||
public MoviePathValidator(IMovieService moviesService)
|
||||
: base("Path is already configured for an existing movie: {moviePath}")
|
||||
{
|
||||
_moviesService = moviesService;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => "Path is already configured for an existing movie: {moviePath}";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
|
|
|
@ -8,11 +8,12 @@ namespace NzbDrone.Core.Validation.Paths
|
|||
private readonly IDiskProvider _diskProvider;
|
||||
|
||||
public PathExistsValidator(IDiskProvider diskProvider)
|
||||
: base("Path does not exist")
|
||||
{
|
||||
_diskProvider = diskProvider;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => "Path does not exist";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
|
|
|
@ -14,10 +14,7 @@ namespace NzbDrone.Core.Validation.Paths
|
|||
|
||||
public class PathValidator : PropertyValidator
|
||||
{
|
||||
public PathValidator()
|
||||
: base("Invalid Path")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Invalid Path";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
|
|
|
@ -9,11 +9,12 @@ namespace NzbDrone.Core.Validation.Paths
|
|||
private readonly IConfigService _configService;
|
||||
|
||||
public RecycleBinValidator(IConfigService configService)
|
||||
: base("Path is {relationship} configured recycle bin folder")
|
||||
{
|
||||
_configService = configService;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => "Path is {relationship} configured recycle bin folder";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
var recycleBin = _configService.RecycleBin;
|
||||
|
|
|
@ -10,11 +10,12 @@ namespace NzbDrone.Core.Validation.Paths
|
|||
private readonly IRootFolderService _rootFolderService;
|
||||
|
||||
public RootFolderAncestorValidator(IRootFolderService rootFolderService)
|
||||
: base("Path is an ancestor of an existing root folder")
|
||||
{
|
||||
_rootFolderService = rootFolderService;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => "Path is an ancestor of an existing root folder";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
|
|
|
@ -9,11 +9,12 @@ namespace NzbDrone.Core.Validation.Paths
|
|||
private readonly IRootFolderService _rootFolderService;
|
||||
|
||||
public RootFolderValidator(IRootFolderService rootFolderService)
|
||||
: base("Path is already configured as a root folder")
|
||||
{
|
||||
_rootFolderService = rootFolderService;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => "Path is already configured as a root folder";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
|
|
|
@ -9,11 +9,12 @@ namespace NzbDrone.Core.Validation.Paths
|
|||
private readonly IAppFolderInfo _appFolderInfo;
|
||||
|
||||
public StartupFolderValidator(IAppFolderInfo appFolderInfo)
|
||||
: base("Path cannot be {relationship} the start up folder")
|
||||
{
|
||||
_appFolderInfo = appFolderInfo;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => "Path cannot be {relationship} the start up folder";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
|
|
|
@ -6,10 +6,7 @@ namespace NzbDrone.Core.Validation.Paths
|
|||
{
|
||||
public class SystemFolderValidator : PropertyValidator
|
||||
{
|
||||
public SystemFolderValidator()
|
||||
: base("Is {relationship} system folder {systemFolder}")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Is {relationship} system folder {systemFolder}";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
|
|
|
@ -8,11 +8,12 @@ namespace NzbDrone.Core.Validation
|
|||
private readonly IProfileService _profileService;
|
||||
|
||||
public ProfileExistsValidator(IProfileService profileService)
|
||||
: base("QualityProfile does not exist")
|
||||
{
|
||||
_profileService = profileService;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => "QualityProfile does not exist";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
|
|
|
@ -14,10 +14,7 @@ namespace NzbDrone.Core.Validation
|
|||
|
||||
public class UrlValidator : PropertyValidator
|
||||
{
|
||||
public UrlValidator()
|
||||
: base("Invalid Url")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Invalid Url";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="FluentAssertions" Version="5.10.3" />
|
||||
<PackageReference Include="FluentValidation" Version="8.6.2" />
|
||||
<PackageReference Include="FluentValidation" Version="9.5.4" />
|
||||
<PackageReference Include="Moq" Version="4.16.1" />
|
||||
<PackageReference Include="NLog" Version="5.0.1" />
|
||||
<PackageReference Include="NUnit" Version="3.13.2" />
|
||||
|
|
|
@ -51,7 +51,7 @@ namespace Radarr.Api.V3.Config
|
|||
SharedValidator.RuleFor(c => c.SslPort).NotEqual(c => c.Port).When(c => c.EnableSsl);
|
||||
|
||||
SharedValidator.RuleFor(c => c.SslCertPath)
|
||||
.Cascade(CascadeMode.StopOnFirstFailure)
|
||||
.Cascade(CascadeMode.Stop)
|
||||
.NotEmpty()
|
||||
.IsValidPath()
|
||||
.SetValidator(fileExistsValidator)
|
||||
|
|
|
@ -81,7 +81,7 @@ namespace Radarr.Api.V3.Movies
|
|||
SharedValidator.RuleFor(s => s.QualityProfileId).ValidId();
|
||||
|
||||
SharedValidator.RuleFor(s => s.Path)
|
||||
.Cascade(CascadeMode.StopOnFirstFailure)
|
||||
.Cascade(CascadeMode.Stop)
|
||||
.IsValidPath()
|
||||
.SetValidator(rootFolderValidator)
|
||||
.SetValidator(mappedNetworkDriveValidator)
|
||||
|
|
|
@ -11,11 +11,12 @@ namespace Radarr.Api.V3.Movies
|
|||
private readonly IBuildFileNames _fileNameBuilder;
|
||||
|
||||
public MovieFolderAsRootFolderValidator(IBuildFileNames fileNameBuilder)
|
||||
: base("Root folder path contains movie folder")
|
||||
{
|
||||
_fileNameBuilder = fileNameBuilder;
|
||||
}
|
||||
|
||||
protected override string GetDefaultMessageTemplate() => "Root folder path contains movie folder";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
if (context.PropertyValue == null)
|
||||
|
@ -23,7 +24,7 @@ namespace Radarr.Api.V3.Movies
|
|||
return true;
|
||||
}
|
||||
|
||||
var movieResource = context.Instance as MovieResource;
|
||||
var movieResource = context.InstanceToValidate as MovieResource;
|
||||
|
||||
if (movieResource == null)
|
||||
{
|
||||
|
@ -37,7 +38,7 @@ namespace Radarr.Api.V3.Movies
|
|||
return true;
|
||||
}
|
||||
|
||||
var rootFolder = new DirectoryInfo(rootFolderPath).Name;
|
||||
var rootFolder = new DirectoryInfo(rootFolderPath!).Name;
|
||||
var movie = movieResource.ToModel();
|
||||
var movieFolder = _fileNameBuilder.GetMovieFolder(movie);
|
||||
|
||||
|
|
|
@ -15,10 +15,7 @@ namespace Radarr.Api.V3.Profiles.Quality
|
|||
|
||||
public class ValidCutoffValidator<T> : PropertyValidator
|
||||
{
|
||||
public ValidCutoffValidator()
|
||||
: base("Cutoff must be an allowed quality or group")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Cutoff must be an allowed quality or group";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
|
@ -26,19 +23,9 @@ namespace Radarr.Api.V3.Profiles.Quality
|
|||
dynamic instance = context.ParentContext.InstanceToValidate;
|
||||
var items = instance.Items as IList<QualityProfileQualityItemResource>;
|
||||
|
||||
var cutoffItem = items.SingleOrDefault(i => (i.Quality == null && i.Id == cutoff) || i.Quality?.Id == cutoff);
|
||||
var cutoffItem = items?.SingleOrDefault(i => (i.Quality == null && i.Id == cutoff) || i.Quality?.Id == cutoff);
|
||||
|
||||
if (cutoffItem == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!cutoffItem.Allowed)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
return cutoffItem is { Allowed: true };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,139 +23,104 @@ namespace Radarr.Api.V3.Profiles.Quality
|
|||
|
||||
public class AllowedValidator<T> : PropertyValidator
|
||||
{
|
||||
public AllowedValidator()
|
||||
: base("Must contain at least one allowed quality")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Must contain at least one allowed quality";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
var list = context.PropertyValue as IList<QualityProfileQualityItemResource>;
|
||||
|
||||
if (list == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!list.Any(c => c.Allowed))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
return context.PropertyValue is IList<QualityProfileQualityItemResource> list &&
|
||||
list.Any(c => c.Allowed);
|
||||
}
|
||||
}
|
||||
|
||||
public class GroupItemValidator<T> : PropertyValidator
|
||||
{
|
||||
public GroupItemValidator()
|
||||
: base("Groups must contain multiple qualities")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Groups must contain multiple qualities";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
var items = context.PropertyValue as IList<QualityProfileQualityItemResource>;
|
||||
|
||||
if (items.Any(i => i.Name.IsNotNullOrWhiteSpace() && i.Items.Count <= 1))
|
||||
if (context.PropertyValue is not IList<QualityProfileQualityItemResource> items)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
return !items.Any(i => i.Name.IsNotNullOrWhiteSpace() && i.Items.Count <= 1);
|
||||
}
|
||||
}
|
||||
|
||||
public class QualityNameValidator<T> : PropertyValidator
|
||||
{
|
||||
public QualityNameValidator()
|
||||
: base("Individual qualities should not be named")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Individual qualities should not be named";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
var items = context.PropertyValue as IList<QualityProfileQualityItemResource>;
|
||||
|
||||
if (items.Any(i => i.Name.IsNotNullOrWhiteSpace() && i.Quality != null))
|
||||
if (context.PropertyValue is not IList<QualityProfileQualityItemResource> items)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
return !items.Any(i => i.Name.IsNotNullOrWhiteSpace() && i.Quality != null);
|
||||
}
|
||||
}
|
||||
|
||||
public class ItemGroupNameValidator<T> : PropertyValidator
|
||||
{
|
||||
public ItemGroupNameValidator()
|
||||
: base("Groups must have a name")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Groups must have a name";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
var items = context.PropertyValue as IList<QualityProfileQualityItemResource>;
|
||||
|
||||
if (items.Any(i => i.Quality == null && i.Name.IsNullOrWhiteSpace()))
|
||||
if (context.PropertyValue is not IList<QualityProfileQualityItemResource> items)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
return !items.Any(i => i.Quality == null && i.Name.IsNullOrWhiteSpace());
|
||||
}
|
||||
}
|
||||
|
||||
public class ItemGroupIdValidator<T> : PropertyValidator
|
||||
{
|
||||
public ItemGroupIdValidator()
|
||||
: base("Groups must have an ID")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Groups must have an ID";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
var items = context.PropertyValue as IList<QualityProfileQualityItemResource>;
|
||||
|
||||
if (items.Any(i => i.Quality == null && i.Id == 0))
|
||||
if (context.PropertyValue is not IList<QualityProfileQualityItemResource> items)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
return !items.Any(i => i.Quality == null && i.Id == 0);
|
||||
}
|
||||
}
|
||||
|
||||
public class UniqueIdValidator<T> : PropertyValidator
|
||||
{
|
||||
public UniqueIdValidator()
|
||||
: base("Groups must have a unique ID")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Groups must have a unique ID";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
var items = context.PropertyValue as IList<QualityProfileQualityItemResource>;
|
||||
|
||||
if (items.Where(i => i.Id > 0).Select(i => i.Id).GroupBy(i => i).Any(g => g.Count() > 1))
|
||||
if (context.PropertyValue is not IList<QualityProfileQualityItemResource> items)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
var ids = items.Where(i => i.Id > 0).Select(i => i.Id);
|
||||
var groupedIds = ids.GroupBy(i => i);
|
||||
|
||||
return groupedIds.All(g => g.Count() == 1);
|
||||
}
|
||||
}
|
||||
|
||||
public class UniqueQualityIdValidator<T> : PropertyValidator
|
||||
{
|
||||
public UniqueQualityIdValidator()
|
||||
: base("Qualities can only be used once")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Qualities can only be used once";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
var items = context.PropertyValue as IList<QualityProfileQualityItemResource>;
|
||||
if (context.PropertyValue is not IList<QualityProfileQualityItemResource> items)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
var qualityIds = new HashSet<int>();
|
||||
|
||||
foreach (var item in items)
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<TargetFrameworks>net6.0</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="FluentValidation" Version="8.6.2" />
|
||||
<PackageReference Include="FluentValidation" Version="9.5.4" />
|
||||
<PackageReference Include="Ical.Net" Version="4.2.0" />
|
||||
<PackageReference Include="NLog" Version="5.0.1" />
|
||||
</ItemGroup>
|
||||
|
|
|
@ -28,8 +28,8 @@ namespace Radarr.Api.V3.RemotePathMappings
|
|||
.NotEmpty();
|
||||
|
||||
SharedValidator.RuleFor(c => c.LocalPath)
|
||||
.Cascade(CascadeMode.StopOnFirstFailure)
|
||||
.IsValidPath()
|
||||
.Cascade(CascadeMode.Stop)
|
||||
.IsValidPath()
|
||||
.SetValidator(mappedNetworkDriveValidator)
|
||||
.SetValidator(pathExistsValidator);
|
||||
}
|
||||
|
|
|
@ -30,8 +30,8 @@ namespace Radarr.Api.V3.RootFolders
|
|||
_rootFolderService = rootFolderService;
|
||||
|
||||
SharedValidator.RuleFor(c => c.Path)
|
||||
.Cascade(CascadeMode.StopOnFirstFailure)
|
||||
.IsValidPath()
|
||||
.Cascade(CascadeMode.Stop)
|
||||
.IsValidPath()
|
||||
.SetValidator(rootFolderValidator)
|
||||
.SetValidator(mappedNetworkDriveValidator)
|
||||
.SetValidator(startupFolderValidator)
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Linq.Expressions;
|
||||
using FluentValidation;
|
||||
using FluentValidation.Internal;
|
||||
using FluentValidation.Resources;
|
||||
using Radarr.Http.ClientSchema;
|
||||
|
||||
namespace Radarr.Http.REST
|
||||
|
@ -15,7 +14,7 @@ namespace Radarr.Http.REST
|
|||
{
|
||||
var rule = new PropertyRule(fieldListAccessor.GetMember(), c => GetValue(c, fieldListAccessor.Compile(), fieldName), null, () => CascadeMode.Continue, typeof(TProperty), typeof(TResource));
|
||||
rule.PropertyName = fieldName;
|
||||
rule.DisplayName = new StaticStringSource(fieldName);
|
||||
rule.SetDisplayName(fieldName);
|
||||
|
||||
AddRule(rule);
|
||||
return new RuleBuilder<TResource, TProperty>(rule, this);
|
||||
|
@ -25,12 +24,7 @@ namespace Radarr.Http.REST
|
|||
{
|
||||
var resource = fieldListAccessor((TResource)container).SingleOrDefault(c => c.Name == fieldName);
|
||||
|
||||
if (resource == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
return resource.Value;
|
||||
return resource?.Value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<TargetFrameworks>net6.0</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="FluentValidation" Version="8.6.2" />
|
||||
<PackageReference Include="FluentValidation" Version="9.5.4" />
|
||||
<PackageReference Include="ImpromptuInterface" Version="7.0.1" />
|
||||
<PackageReference Include="NLog" Version="5.0.1" />
|
||||
</ItemGroup>
|
||||
|
|
|
@ -6,10 +6,7 @@ namespace Radarr.Http.Validation
|
|||
{
|
||||
public class EmptyCollectionValidator<T> : PropertyValidator
|
||||
{
|
||||
public EmptyCollectionValidator()
|
||||
: base("Collection Must Be Empty")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Collection Must Be Empty";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
|
|
|
@ -4,10 +4,7 @@ namespace Radarr.Http.Validation
|
|||
{
|
||||
public class ImportListSyncIntervalValidator : PropertyValidator
|
||||
{
|
||||
public ImportListSyncIntervalValidator()
|
||||
: base("Must be greater than 6 hours")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Must be greater than 6 hours";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
|
@ -18,12 +15,7 @@ namespace Radarr.Http.Validation
|
|||
|
||||
var value = (int)context.PropertyValue;
|
||||
|
||||
if (value >= 6)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
return value >= 6;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,10 +4,7 @@ namespace Radarr.Http.Validation
|
|||
{
|
||||
public class RssSyncIntervalValidator : PropertyValidator
|
||||
{
|
||||
public RssSyncIntervalValidator()
|
||||
: base("Must be between 10 and 120 or 0 to disable")
|
||||
{
|
||||
}
|
||||
protected override string GetDefaultMessageTemplate() => "Must be between 10 and 120 or 0 to disable";
|
||||
|
||||
protected override bool IsValid(PropertyValidatorContext context)
|
||||
{
|
||||
|
@ -23,12 +20,7 @@ namespace Radarr.Http.Validation
|
|||
return true;
|
||||
}
|
||||
|
||||
if (value >= 10 && value <= 120)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
return value is >= 10 and <= 120;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=Radarr/@EntryIndexedValue">True</s:Boolean>
|
||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=tmdb/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
|
Loading…
Reference in New Issue