self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-11-28 08:58:41 +02:00
Code Issues Releases Activity

Migrate to FluentValidation 9

Browse Source
This commit is contained in:
Stepan Goremykin 2023-04-01 15:03:53 +02:00 committed by Mark McDowall
parent dec6e14036
commit 40e54685b9
40 changed files with 114 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/NzbDrone.Common/Extensions/UrlExtensions.cs
View File

@ -16,18 +16,7 @@ public static bool IsValidUrl(this string path)
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();
}
}
}

4
src/NzbDrone.Core.Test/NotificationTests/EmailTests/EmailSettingsValidatorFixture.cs
View File

@ -62,7 +62,6 @@ public void should_not_be_valid_if_from_is_empty()
}
[TestCase("sonarr")]
[TestCase("sonarr@sonarr")]
[TestCase("email.me")]
[Ignore("Allowed coz some email servers allow arbitrary source, we probably need to support 'Name <email>' syntax")]
public void should_not_be_valid_if_from_is_invalid(string email)
@ -73,7 +72,6 @@ public void should_not_be_valid_if_from_is_invalid(string email)
}
[TestCase("sonarr")]
[TestCase("sonarr@sonarr")]
[TestCase("email.me")]
public void should_not_be_valid_if_to_is_invalid(string email)
{
@ -83,7 +81,6 @@ public void should_not_be_valid_if_to_is_invalid(string email)
}
[TestCase("sonarr")]
[TestCase("sonarr@sonarr")]
[TestCase("email.me")]
public void should_not_be_valid_if_cc_is_invalid(string email)
{
@ -93,7 +90,6 @@ public void should_not_be_valid_if_cc_is_invalid(string email)
}
[TestCase("sonarr")]
[TestCase("sonarr@sonarr")]
[TestCase("email.me")]
public void should_not_be_valid_if_bcc_is_invalid(string email)
{

4
src/NzbDrone.Core/Download/Clients/rTorrent/RTorrentDirectoryValidator.cs
View File

@ -17,8 +17,8 @@ public RTorrentDirectoryValidator(RootFolderValidator rootFolderValidator,
PathExistsValidator pathExistsValidator,
MappedNetworkDriveValidator mappedNetworkDriveValidator)
{
RuleFor(c => c.TvDirectory).Cascade(CascadeMode.StopOnFirstFailure)
.IsValidPath()
RuleFor(c => c.TvDirectory).Cascade(CascadeMode.Stop)
.IsValidPath()
.SetValidator(rootFolderValidator)
.SetValidator(mappedNetworkDriveValidator)
.SetValidator(pathExistsValidator)

3
src/NzbDrone.Core/ImportLists/Exclusions/ImportListExclusionExistsValidator.cs
View File

@ -7,11 +7,12 @@ public class ImportListExclusionExistsValidator : PropertyValidator
private readonly IImportListExclusionService _importListExclusionService;
public ImportListExclusionExistsValidator(IImportListExclusionService importListExclusionService)
: base("This exclusion has already been added.")
{
_importListExclusionService = importListExclusionService;
}
protected override string GetDefaultMessageTemplate() => "This exclusion has already been added.";
protected override bool IsValid(PropertyValidatorContext context)
{
if (context.PropertyValue == null)

63
src/NzbDrone.Core/Organizer/FileNameValidation.cs
View File

@ -1,4 +1,3 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
@ -66,96 +65,70 @@ public static IRuleBuilderOptions<T, string> ValidSpecialsFolderFormat<T>(this I
public class ValidStandardEpisodeFormatValidator : PropertyValidator
{
public ValidStandardEpisodeFormatValidator()
: base("Must contain season and episode numbers OR Original Title")
{
}
protected override string GetDefaultMessageTemplate() => "Must contain season and episode numbers OR Original Title";
protected override bool IsValid(PropertyValidatorContext context)
{
var value = context.PropertyValue as string;
if (!FileNameBuilder.SeasonEpisodePatternRegex.IsMatch(value) &&
!FileNameValidation.OriginalTokenRegex.IsMatch(value))
if (context.PropertyValue is not string value)
{
return false;
}
return true;
return FileNameBuilder.SeasonEpisodePatternRegex.IsMatch(value) ||
FileNameValidation.OriginalTokenRegex.IsMatch(value);
}
}
public class ValidDailyEpisodeFormatValidator : PropertyValidator
{
public ValidDailyEpisodeFormatValidator()
: base("Must contain Air Date OR Season and Episode OR Original Title")
{
}
protected override string GetDefaultMessageTemplate() => "Must contain Air Date OR Season and Episode OR Original Title";
protected override bool IsValid(PropertyValidatorContext context)
{
var value = context.PropertyValue as string;
if (!FileNameBuilder.SeasonEpisodePatternRegex.IsMatch(value) &&
!FileNameBuilder.AirDateRegex.IsMatch(value) &&
!FileNameValidation.OriginalTokenRegex.IsMatch(value))
if (context.PropertyValue is not string value)
{
return false;
}
return true;
return FileNameBuilder.SeasonEpisodePatternRegex.IsMatch(value) ||
FileNameBuilder.AirDateRegex.IsMatch(value) ||
FileNameValidation.OriginalTokenRegex.IsMatch(value);
}
}
public class ValidAnimeEpisodeFormatValidator : PropertyValidator
{
public ValidAnimeEpisodeFormatValidator()
: base("Must contain Absolute Episode number OR Season and Episode OR Original Title")
{
}
protected override string GetDefaultMessageTemplate() =>
"Must contain Absolute Episode number OR Season and Episode OR Original Title";
protected override bool IsValid(PropertyValidatorContext context)
{
var value = context.PropertyValue as string;
if (!FileNameBuilder.SeasonEpisodePatternRegex.IsMatch(value) &&
!FileNameBuilder.AbsoluteEpisodePatternRegex.IsMatch(value) &&
!FileNameValidation.OriginalTokenRegex.IsMatch(value))
if (context.PropertyValue is not string value)
{
return false;
}
return true;
return FileNameBuilder.SeasonEpisodePatternRegex.IsMatch(value) ||
FileNameBuilder.AbsoluteEpisodePatternRegex.IsMatch(value) ||
FileNameValidation.OriginalTokenRegex.IsMatch(value);
}
}
public class IllegalCharactersValidator : PropertyValidator
{
private readonly char[] _invalidPathChars = Path.GetInvalidPathChars();
private static readonly char[] InvalidPathChars = Path.GetInvalidPathChars();
public IllegalCharactersValidator()
: base("Contains illegal characters: {InvalidCharacters}")
{
}
protected override string GetDefaultMessageTemplate() => "Contains illegal characters: {InvalidCharacters}";
protected override bool IsValid(PropertyValidatorContext context)
{
var value = context.PropertyValue as string;
var invalidCharacters = new List<char>();
if (value.IsNullOrWhiteSpace())
{
return true;
}
foreach (var i in _invalidPathChars)
{
if (value.IndexOf(i) >= 0)
{
invalidCharacters.Add(i);
}
}
var invalidCharacters = InvalidPathChars.Where(i => value!.IndexOf(i) >= 0).ToList();
if (invalidCharacters.Any())
{
context.MessageFormatter.AppendArgument("InvalidCharacters", string.Join("", invalidCharacters));

7
src/NzbDrone.Core/Profiles/Delay/DelayProfileTagInUseValidator.cs
View File

@ -10,11 +10,12 @@ public class DelayProfileTagInUseValidator : PropertyValidator
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 @@ protected override bool IsValid(PropertyValidatorContext context)
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;
}

2
src/NzbDrone.Core/Sonarr.Core.csproj
View File

@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
<PackageReference Include="FluentMigrator.Runner" Version="3.3.2" />
<PackageReference Include="FluentMigrator.Runner.SQLite" Version="3.3.2" />
<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.3" />
<PackageReference Include="NLog" Version="4.7.14" />

4
src/NzbDrone.Core/Tv/AddSeriesValidator.cs
View File

@ -16,8 +16,8 @@ public AddSeriesValidator(RootFolderValidator rootFolderValidator,
SeriesAncestorValidator seriesAncestorValidator,
SeriesTitleSlugValidator seriesTitleSlugValidator)
{
RuleFor(c => c.Path).Cascade(CascadeMode.StopOnFirstFailure)
.IsValidPath()
RuleFor(c => c.Path).Cascade(CascadeMode.Stop)
.IsValidPath()
.SetValidator(rootFolderValidator)
.SetValidator(seriesPathValidator)
.SetValidator(seriesAncestorValidator);

4
src/NzbDrone.Core/Tv/SeriesTitleSlugValidator.cs
View File

@ -9,11 +9,13 @@ public class SeriesTitleSlugValidator : PropertyValidator
private readonly ISeriesService _seriesService;
public SeriesTitleSlugValidator(ISeriesService seriesService)
: base("Title slug '{slug}' is in use by series '{seriesTitle}'. Check the FAQ for more information")
{
_seriesService = seriesService;
}
protected override string GetDefaultMessageTemplate() =>
"Title slug '{slug}' is in use by series '{seriesTitle}'. Check the FAQ for more information";
protected override bool IsValid(PropertyValidatorContext context)
{
if (context.PropertyValue == null)

3
src/NzbDrone.Core/Validation/FileChmodValidator.cs
View File

@ -8,11 +8,12 @@ public class FolderChmodValidator : PropertyValidator
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
src/NzbDrone.Core/Validation/FolderValidator.cs
View File

@ -6,10 +6,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)
{

3
src/NzbDrone.Core/Validation/Paths/FileExistsValidator.cs
View File

@ -8,11 +8,12 @@ public class FileExistsValidator : PropertyValidator
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)

3
src/NzbDrone.Core/Validation/Paths/FolderWritableValidator.cs
View File

@ -9,11 +9,12 @@ public class FolderWritableValidator : PropertyValidator
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)

10
src/NzbDrone.Core/Validation/Paths/MappedNetworkDriveValidator.cs
View File

@ -14,12 +14,13 @@ public class MappedNetworkDriveValidator : PropertyValidator
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 @@ protected override bool IsValid(PropertyValidatorContext context)
var mount = _diskProvider.GetMount(path);
if (mount != null && mount.DriveType == DriveType.Network)
{
return false;
}
return true;
return mount is not { DriveType: DriveType.Network };
}
}
}

3
src/NzbDrone.Core/Validation/Paths/PathExistsValidator.cs
View File

@ -8,11 +8,12 @@ public class PathExistsValidator : PropertyValidator
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)

5
src/NzbDrone.Core/Validation/Paths/PathValidator.cs
View File

@ -15,10 +15,7 @@ public static IRuleBuilderOptions<T, string> IsValidPath<T>(this IRuleBuilder<T,
public class PathValidator : PropertyValidator
{
public PathValidator()
: base("Invalid Path")
{
}
protected override string GetDefaultMessageTemplate() => "Invalid Path";
protected override bool IsValid(PropertyValidatorContext context)
{

3
src/NzbDrone.Core/Validation/Paths/RecycleBinValidator.cs
View File

@ -9,11 +9,12 @@ public class RecycleBinValidator : PropertyValidator
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;

3
src/NzbDrone.Core/Validation/Paths/RootFolderAncestorValidator.cs
View File

@ -10,11 +10,12 @@ public class RootFolderAncestorValidator : PropertyValidator
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)

3
src/NzbDrone.Core/Validation/Paths/RootFolderValidator.cs
View File

@ -9,11 +9,12 @@ public class RootFolderValidator : PropertyValidator
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)

3
src/NzbDrone.Core/Validation/Paths/SeriesAncestorValidator.cs
View File

@ -10,11 +10,12 @@ public class SeriesAncestorValidator : PropertyValidator
private readonly ISeriesService _seriesService;
public SeriesAncestorValidator(ISeriesService seriesService)
: base("Path is an ancestor of an existing series")
{
_seriesService = seriesService;
}
protected override string GetDefaultMessageTemplate() => "Path is an ancestor of an existing series";
protected override bool IsValid(PropertyValidatorContext context)
{
if (context.PropertyValue == null)

3
src/NzbDrone.Core/Validation/Paths/SeriesExistsValidator.cs
View File

@ -9,11 +9,12 @@ public class SeriesExistsValidator : PropertyValidator
private readonly ISeriesService _seriesService;
public SeriesExistsValidator(ISeriesService seriesService)
: base("This series has already been added")
{
_seriesService = seriesService;
}
protected override string GetDefaultMessageTemplate() => "This series has already been added";
protected override bool IsValid(PropertyValidatorContext context)
{
if (context.PropertyValue == null)

3
src/NzbDrone.Core/Validation/Paths/SeriesPathValidator.cs
View File

@ -9,11 +9,12 @@ public class SeriesPathValidator : PropertyValidator
private readonly ISeriesService _seriesService;
public SeriesPathValidator(ISeriesService seriesService)
: base("Path is already configured for another series")
{
_seriesService = seriesService;
}
protected override string GetDefaultMessageTemplate() => "Path is already configured for another series";
protected override bool IsValid(PropertyValidatorContext context)
{
if (context.PropertyValue == null)

3
src/NzbDrone.Core/Validation/Paths/StartupFolderValidator.cs
View File

@ -9,11 +9,12 @@ public class StartupFolderValidator : PropertyValidator
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)

5
src/NzbDrone.Core/Validation/Paths/SystemFolderValidator.cs
View File

@ -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)
{

3
src/NzbDrone.Core/Validation/ProfileExistsValidator.cs
View File

@ -8,11 +8,12 @@ public class ProfileExistsValidator : PropertyValidator
private readonly IQualityProfileService _qualityProfileService;
public ProfileExistsValidator(IQualityProfileService qualityProfileService)
: base("QualityProfile does not exist")
{
_qualityProfileService = qualityProfileService;
}
protected override string GetDefaultMessageTemplate() => "QualityProfile does not exist";
protected override bool IsValid(PropertyValidatorContext context)
{
if (context.PropertyValue == null)

5
src/NzbDrone.Core/Validation/UrlValidator.cs
View File

@ -14,10 +14,7 @@ public static IRuleBuilderOptions<T, string> IsValidUrl<T>(this IRuleBuilder<T,
public class UrlValidator : PropertyValidator
{
public UrlValidator()
: base("Invalid Url")
{
}
protected override string GetDefaultMessageTemplate() => "Invalid Url";
protected override bool IsValid(PropertyValidatorContext context)
{

2
src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj
View File

@ -4,7 +4,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.10.0" />
<PackageReference Include="FluentValidation" Version="8.6.2" />
<PackageReference Include="FluentValidation" Version="9.5.4" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NLog" Version="4.7.14" />
<PackageReference Include="NUnit" Version="3.13.3" />

2
src/Sonarr.Api.V3/Config/HostConfigController.cs
View File

@ -51,7 +51,7 @@ public HostConfigController(IConfigFileProvider configFileProvider,
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)

19
src/Sonarr.Api.V3/Profiles/Quality/QualityCutoffValidator.cs
View File

@ -15,10 +15,7 @@ public static IRuleBuilderOptions<T, int> ValidCutoff<T>(this IRuleBuilder<T, in
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 @@ protected override bool IsValid(PropertyValidatorContext context)
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 };
}
}
}

89
src/Sonarr.Api.V3/Profiles/Quality/QualityItemsValidator.cs
View File

@ -23,139 +23,104 @@ public static IRuleBuilderOptions<T, IList<QualityProfileQualityItemResource>> V
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)

4
src/Sonarr.Api.V3/RemotePathMappings/RemotePathMappingController.cs
View File

@ -28,8 +28,8 @@ public RemotePathMappingController(IRemotePathMappingService remotePathMappingSe
.NotEmpty();
SharedValidator.RuleFor(c => c.LocalPath)
.Cascade(CascadeMode.StopOnFirstFailure)
.IsValidPath()
.Cascade(CascadeMode.Stop)
.IsValidPath()
.SetValidator(mappedNetworkDriveValidator)
.SetValidator(pathExistsValidator);
}

4
src/Sonarr.Api.V3/RootFolders/RootFolderController.cs
View File

@ -30,8 +30,8 @@ public RootFolderController(IRootFolderService rootFolderService,
_rootFolderService = rootFolderService;
SharedValidator.RuleFor(c => c.Path)
.Cascade(CascadeMode.StopOnFirstFailure)
.IsValidPath()
.Cascade(CascadeMode.Stop)
.IsValidPath()
.SetValidator(rootFolderValidator)
.SetValidator(mappedNetworkDriveValidator)
.SetValidator(startupFolderValidator)

4
src/Sonarr.Api.V3/Series/SeriesController.cs
View File

@ -73,8 +73,8 @@ public SeriesController(IBroadcastSignalRMessage signalRBroadcaster,
Http.Validation.RuleBuilderExtensions.ValidId(SharedValidator.RuleFor(s => s.QualityProfileId));
SharedValidator.RuleFor(s => s.Path)
.Cascade(CascadeMode.StopOnFirstFailure)
.IsValidPath()
.Cascade(CascadeMode.Stop)
.IsValidPath()
.SetValidator(rootFolderValidator)
.SetValidator(mappedNetworkDriveValidator)
.SetValidator(seriesPathValidator)

7
src/Sonarr.Api.V3/Series/SeriesFolderAsRootFolderValidator.cs
View File

@ -11,11 +11,12 @@ public class SeriesFolderAsRootFolderValidator : PropertyValidator
private readonly IBuildFileNames _fileNameBuilder;
public SeriesFolderAsRootFolderValidator(IBuildFileNames fileNameBuilder)
: base("Root folder path contains series folder")
{
_fileNameBuilder = fileNameBuilder;
}
protected override string GetDefaultMessageTemplate() => "Root folder path contains series folder";
protected override bool IsValid(PropertyValidatorContext context)
{
if (context.PropertyValue == null)
@ -23,7 +24,7 @@ protected override bool IsValid(PropertyValidatorContext context)
return true;
}
var seriesResource = context.Instance as SeriesResource;
var seriesResource = context.InstanceToValidate as SeriesResource;
if (seriesResource == null)
{
@ -37,7 +38,7 @@ protected override bool IsValid(PropertyValidatorContext context)
return true;
}
var rootFolder = new DirectoryInfo(rootFolderPath).Name;
var rootFolder = new DirectoryInfo(rootFolderPath!).Name;
var series = seriesResource.ToModel();
var seriesFolder = _fileNameBuilder.GetSeriesFolder(series);

2
src/Sonarr.Api.V3/Sonarr.Api.V3.csproj
View File

@ -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="4.7.14" />
</ItemGroup>

10
src/Sonarr.Http/REST/ResourceValidator.cs
View File

@ -4,7 +4,6 @@
using System.Linq.Expressions;
using FluentValidation;
using FluentValidation.Internal;
using FluentValidation.Resources;
using Sonarr.Http.ClientSchema;
namespace Sonarr.Http.REST
@ -15,7 +14,7 @@ public IRuleBuilderInitial<TResource, TProperty> RuleForField<TProperty>(Express
{
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 @@ private static object GetValue(object container, Func<TResource, IEnumerable<Fie
{
var resource = fieldListAccessor((TResource)container).SingleOrDefault(c => c.Name == fieldName);
if (resource == null)
{
return null;
}
return resource.Value;
return resource?.Value;
}
}
}

2
src/Sonarr.Http/Sonarr.Http.csproj
View File

@ -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="4.7.14" />
</ItemGroup>

5
src/Sonarr.Http/Validation/EmptyCollectionValidator.cs
View File

@ -6,10 +6,7 @@ namespace Sonarr.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)
{

12
src/Sonarr.Http/Validation/RssSyncIntervalValidator.cs
View File

@ -4,10 +4,7 @@ namespace Sonarr.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 @@ protected override bool IsValid(PropertyValidatorContext context)
return true;
}
if (value >= 10 && value <= 120)
{
return true;
}
return false;
return value is >= 10 and <= 120;
}
}
}

3
src/Sonarr.sln.DotSettings
View File

@ -1,2 +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/=Sonarr/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Sonarr/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=tvdb/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>