github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 13:10:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

New: Root folder exists validation for import lists

Browse source 
Closes #4820
This commit is contained in:
Bogdan 2024-05-09 20:09:45 +03:00
commit 8ff8c27e24
3 changed files with 42 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Lidarr.Api.V1/ImportLists/ImportListController.cs
View file

@ -1,3 +1,4 @@
using FluentValidation;
using Lidarr.Http; using Lidarr.Http;
using NzbDrone.Core.ImportLists; using NzbDrone.Core.ImportLists;
using NzbDrone.Core.Validation; using NzbDrone.Core.Validation;
@ -12,16 +13,22 @@ namespace Lidarr.Api.V1.ImportLists
public static readonly ImportListBulkResourceMapper BulkResourceMapper = new (); public static readonly ImportListBulkResourceMapper BulkResourceMapper = new ();
public ImportListController(IImportListFactory importListFactory, public ImportListController(IImportListFactory importListFactory,
RootFolderExistsValidator rootFolderExistsValidator,
QualityProfileExistsValidator qualityProfileExistsValidator, QualityProfileExistsValidator qualityProfileExistsValidator,
MetadataProfileExistsValidator metadataProfileExistsValidator) MetadataProfileExistsValidator metadataProfileExistsValidator)
: base(importListFactory, "importlist", ResourceMapper, BulkResourceMapper) : base(importListFactory, "importlist", ResourceMapper, BulkResourceMapper)
{ {
Http.Validation.RuleBuilderExtensions.ValidId(SharedValidator.RuleFor(s => s.QualityProfileId)); SharedValidator.RuleFor(c => c.RootFolderPath).Cascade(CascadeMode.Stop)
Http.Validation.RuleBuilderExtensions.ValidId(SharedValidator.RuleFor(s => s.MetadataProfileId)); .IsValidPath()
.SetValidator(rootFolderExistsValidator);
SharedValidator.RuleFor(c => c.RootFolderPath).IsValidPath(); SharedValidator.RuleFor(c => c.QualityProfileId).Cascade(CascadeMode.Stop)
SharedValidator.RuleFor(c => c.QualityProfileId).SetValidator(qualityProfileExistsValidator); .ValidId()
SharedValidator.RuleFor(c => c.MetadataProfileId).SetValidator(metadataProfileExistsValidator); .SetValidator(qualityProfileExistsValidator);
SharedValidator.RuleFor(c => c.MetadataProfileId).Cascade(CascadeMode.Stop)
.ValidId()
.SetValidator(metadataProfileExistsValidator);
} }
} }
} }

15
src/NzbDrone.Core/Validation/MetadataProfileExistsValidator.cs
View file

@ -5,28 +5,23 @@ namespace NzbDrone.Core.Validation
{ {
public class MetadataProfileExistsValidator : PropertyValidator public class MetadataProfileExistsValidator : PropertyValidator
{ {
private readonly IMetadataProfileService _profileService; private readonly IMetadataProfileService _metadataProfileService;
public MetadataProfileExistsValidator(IMetadataProfileService profileService) public MetadataProfileExistsValidator(IMetadataProfileService metadataProfileService)
{ {
_profileService = profileService; _metadataProfileService = metadataProfileService;
} }
protected override string GetDefaultMessageTemplate() => "Metadata profile does not exist"; protected override string GetDefaultMessageTemplate() => "Metadata profile does not exist";
protected override bool IsValid(PropertyValidatorContext context) protected override bool IsValid(PropertyValidatorContext context)
{ {
if (context.PropertyValue == null) if (context?.PropertyValue == null || (int)context.PropertyValue == 0)
{ {
return true; return true;
} }
if ((int)context.PropertyValue == 0) return _metadataProfileService.Exists((int)context.PropertyValue);
{
return true;
}
return _profileService.Exists((int)context.PropertyValue);
} }
} }
} }

25
src/NzbDrone.Core/Validation/Paths/RootFolderExistsValidator.cs Normal file
View file

@ -0,0 +1,25 @@
using FluentValidation.Validators;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.RootFolders;
namespace NzbDrone.Core.Validation.Paths
{
public class RootFolderExistsValidator : PropertyValidator
{
private readonly IRootFolderService _rootFolderService;
public RootFolderExistsValidator(IRootFolderService rootFolderService)
{
_rootFolderService = rootFolderService;
}
protected override string GetDefaultMessageTemplate() => "Root folder '{path}' does not exist";
protected override bool IsValid(PropertyValidatorContext context)
{
context.MessageFormatter.AppendArgument("path", context.PropertyValue?.ToString());
return context.PropertyValue == null || _rootFolderService.All().Exists(r => r.Path.PathEquals(context.PropertyValue.ToString()));
}
}
}