mirror of
https://github.com/lidarr/lidarr.git
synced 2025-08-19 21:13:28 -07:00
New: Add Validations for Recycle Bin Folder
Fixes 1794 (cherry picked from commit fd4fb88ce1efa8f673c74f04cd632a3f607565c4)
This commit is contained in:
parent
b88adfd171
commit
3e26424797
7 changed files with 97 additions and 3 deletions
|
@ -53,6 +53,7 @@ namespace Lidarr.Api.V1.Artist
|
||||||
IMapCoversToLocal coverMapper,
|
IMapCoversToLocal coverMapper,
|
||||||
IManageCommandQueue commandQueueManager,
|
IManageCommandQueue commandQueueManager,
|
||||||
IRootFolderService rootFolderService,
|
IRootFolderService rootFolderService,
|
||||||
|
RecycleBinValidator recycleBinValidator,
|
||||||
RootFolderValidator rootFolderValidator,
|
RootFolderValidator rootFolderValidator,
|
||||||
MappedNetworkDriveValidator mappedNetworkDriveValidator,
|
MappedNetworkDriveValidator mappedNetworkDriveValidator,
|
||||||
ArtistPathValidator artistPathValidator,
|
ArtistPathValidator artistPathValidator,
|
||||||
|
@ -82,6 +83,7 @@ namespace Lidarr.Api.V1.Artist
|
||||||
.SetValidator(mappedNetworkDriveValidator)
|
.SetValidator(mappedNetworkDriveValidator)
|
||||||
.SetValidator(artistPathValidator)
|
.SetValidator(artistPathValidator)
|
||||||
.SetValidator(artistAncestorValidator)
|
.SetValidator(artistAncestorValidator)
|
||||||
|
.SetValidator(recycleBinValidator)
|
||||||
.SetValidator(systemFolderValidator)
|
.SetValidator(systemFolderValidator)
|
||||||
.When(s => !s.Path.IsNullOrWhiteSpace());
|
.When(s => !s.Path.IsNullOrWhiteSpace());
|
||||||
|
|
||||||
|
|
|
@ -10,12 +10,28 @@ namespace Lidarr.Api.V1.Config
|
||||||
[V1ApiController("config/mediamanagement")]
|
[V1ApiController("config/mediamanagement")]
|
||||||
public class MediaManagementConfigController : ConfigController<MediaManagementConfigResource>
|
public class MediaManagementConfigController : ConfigController<MediaManagementConfigResource>
|
||||||
{
|
{
|
||||||
public MediaManagementConfigController(IConfigService configService, PathExistsValidator pathExistsValidator, FolderChmodValidator folderChmodValidator)
|
public MediaManagementConfigController(IConfigService configService,
|
||||||
|
PathExistsValidator pathExistsValidator,
|
||||||
|
FolderChmodValidator folderChmodValidator,
|
||||||
|
FolderWritableValidator folderWritableValidator,
|
||||||
|
ArtistPathValidator artistPathValidator,
|
||||||
|
StartupFolderValidator startupFolderValidator,
|
||||||
|
SystemFolderValidator systemFolderValidator,
|
||||||
|
RootFolderAncestorValidator rootFolderAncestorValidator,
|
||||||
|
RootFolderValidator rootFolderValidator)
|
||||||
: base(configService)
|
: base(configService)
|
||||||
{
|
{
|
||||||
|
SharedValidator.RuleFor(c => c.RecycleBin).IsValidPath()
|
||||||
|
.SetValidator(folderWritableValidator)
|
||||||
|
.SetValidator(rootFolderValidator)
|
||||||
|
.SetValidator(pathExistsValidator)
|
||||||
|
.SetValidator(artistPathValidator)
|
||||||
|
.SetValidator(rootFolderAncestorValidator)
|
||||||
|
.SetValidator(startupFolderValidator)
|
||||||
|
.SetValidator(systemFolderValidator)
|
||||||
|
.When(c => !string.IsNullOrWhiteSpace(c.RecycleBin));
|
||||||
SharedValidator.RuleFor(c => c.RecycleBinCleanupDays).GreaterThanOrEqualTo(0);
|
SharedValidator.RuleFor(c => c.RecycleBinCleanupDays).GreaterThanOrEqualTo(0);
|
||||||
SharedValidator.RuleFor(c => c.ChmodFolder).SetValidator(folderChmodValidator).When(c => !string.IsNullOrEmpty(c.ChmodFolder) && (OsInfo.IsLinux || OsInfo.IsOsx));
|
SharedValidator.RuleFor(c => c.ChmodFolder).SetValidator(folderChmodValidator).When(c => !string.IsNullOrEmpty(c.ChmodFolder) && (OsInfo.IsLinux || OsInfo.IsOsx));
|
||||||
SharedValidator.RuleFor(c => c.RecycleBin).IsValidPath().SetValidator(pathExistsValidator).When(c => !string.IsNullOrWhiteSpace(c.RecycleBin));
|
|
||||||
SharedValidator.RuleFor(c => c.MinimumFreeSpaceWhenImporting).GreaterThanOrEqualTo(100);
|
SharedValidator.RuleFor(c => c.MinimumFreeSpaceWhenImporting).GreaterThanOrEqualTo(100);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@ namespace Lidarr.Api.V1.RootFolders
|
||||||
RootFolderValidator rootFolderValidator,
|
RootFolderValidator rootFolderValidator,
|
||||||
PathExistsValidator pathExistsValidator,
|
PathExistsValidator pathExistsValidator,
|
||||||
MappedNetworkDriveValidator mappedNetworkDriveValidator,
|
MappedNetworkDriveValidator mappedNetworkDriveValidator,
|
||||||
|
RecycleBinValidator recycleBinValidator,
|
||||||
StartupFolderValidator startupFolderValidator,
|
StartupFolderValidator startupFolderValidator,
|
||||||
SystemFolderValidator systemFolderValidator,
|
SystemFolderValidator systemFolderValidator,
|
||||||
FolderWritableValidator folderWritableValidator,
|
FolderWritableValidator folderWritableValidator,
|
||||||
|
@ -35,6 +36,7 @@ namespace Lidarr.Api.V1.RootFolders
|
||||||
.IsValidPath()
|
.IsValidPath()
|
||||||
.SetValidator(mappedNetworkDriveValidator)
|
.SetValidator(mappedNetworkDriveValidator)
|
||||||
.SetValidator(startupFolderValidator)
|
.SetValidator(startupFolderValidator)
|
||||||
|
.SetValidator(recycleBinValidator)
|
||||||
.SetValidator(pathExistsValidator)
|
.SetValidator(pathExistsValidator)
|
||||||
.SetValidator(systemFolderValidator)
|
.SetValidator(systemFolderValidator)
|
||||||
.SetValidator(folderWritableValidator);
|
.SetValidator(folderWritableValidator);
|
||||||
|
|
|
@ -13,6 +13,7 @@ namespace NzbDrone.Core.Music
|
||||||
public class AddArtistValidator : AbstractValidator<Artist>, IAddArtistValidator
|
public class AddArtistValidator : AbstractValidator<Artist>, IAddArtistValidator
|
||||||
{
|
{
|
||||||
public AddArtistValidator(RootFolderValidator rootFolderValidator,
|
public AddArtistValidator(RootFolderValidator rootFolderValidator,
|
||||||
|
RecycleBinValidator recycleBinValidator,
|
||||||
ArtistPathValidator artistPathValidator,
|
ArtistPathValidator artistPathValidator,
|
||||||
ArtistAncestorValidator artistAncestorValidator,
|
ArtistAncestorValidator artistAncestorValidator,
|
||||||
QualityProfileExistsValidator qualityProfileExistsValidator,
|
QualityProfileExistsValidator qualityProfileExistsValidator,
|
||||||
|
@ -21,6 +22,7 @@ namespace NzbDrone.Core.Music
|
||||||
RuleFor(c => c.Path).Cascade(CascadeMode.StopOnFirstFailure)
|
RuleFor(c => c.Path).Cascade(CascadeMode.StopOnFirstFailure)
|
||||||
.IsValidPath()
|
.IsValidPath()
|
||||||
.SetValidator(rootFolderValidator)
|
.SetValidator(rootFolderValidator)
|
||||||
|
.SetValidator(recycleBinValidator)
|
||||||
.SetValidator(artistPathValidator)
|
.SetValidator(artistPathValidator)
|
||||||
.SetValidator(artistAncestorValidator);
|
.SetValidator(artistAncestorValidator);
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ namespace NzbDrone.Core.Validation.Paths
|
||||||
private readonly IArtistService _artistService;
|
private readonly IArtistService _artistService;
|
||||||
|
|
||||||
public ArtistPathValidator(IArtistService artistService)
|
public ArtistPathValidator(IArtistService artistService)
|
||||||
: base("Path is already configured for another artist")
|
: base("Path is already configured for an existing artist")
|
||||||
{
|
{
|
||||||
_artistService = artistService;
|
_artistService = artistService;
|
||||||
}
|
}
|
||||||
|
|
44
src/NzbDrone.Core/Validation/Paths/RecycleBinValidator.cs
Normal file
44
src/NzbDrone.Core/Validation/Paths/RecycleBinValidator.cs
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
using FluentValidation.Validators;
|
||||||
|
using NzbDrone.Common.Extensions;
|
||||||
|
using NzbDrone.Core.Configuration;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Validation.Paths
|
||||||
|
{
|
||||||
|
public class RecycleBinValidator : PropertyValidator
|
||||||
|
{
|
||||||
|
private readonly IConfigService _configService;
|
||||||
|
|
||||||
|
public RecycleBinValidator(IConfigService configService)
|
||||||
|
: base("Path is {relationship} configured recycle bin folder")
|
||||||
|
{
|
||||||
|
_configService = configService;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override bool IsValid(PropertyValidatorContext context)
|
||||||
|
{
|
||||||
|
var recycleBin = _configService.RecycleBin;
|
||||||
|
var folder = context.PropertyValue.ToString();
|
||||||
|
|
||||||
|
if (context.PropertyValue == null || recycleBin.IsNullOrWhiteSpace())
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (recycleBin.PathEquals(folder))
|
||||||
|
{
|
||||||
|
context.MessageFormatter.AppendArgument("relationship", "set to");
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (recycleBin.IsParentPath(folder))
|
||||||
|
{
|
||||||
|
context.MessageFormatter.AppendArgument("relationship", "child of");
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,28 @@
|
||||||
|
using System.Linq;
|
||||||
|
using FluentValidation.Validators;
|
||||||
|
using NzbDrone.Common.Extensions;
|
||||||
|
using NzbDrone.Core.RootFolders;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Validation.Paths
|
||||||
|
{
|
||||||
|
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 bool IsValid(PropertyValidatorContext context)
|
||||||
|
{
|
||||||
|
if (context.PropertyValue == null)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return !_rootFolderService.All().Any(s => context.PropertyValue.ToString().IsParentPath(s.Path));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue