github-mirrors/prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-04-24 22:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: Validate if equals or child for startup folder

Browse source 
(cherry picked from commit 0991cfe27efd6ddb533227b25754661e18d7e9ad)
This commit is contained in:
Qstick 2022-06-05 20:07:47 -05:00 • committed by Bogdan
parent 88e3f86262
commit a9e1204a9b
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/NzbDrone.Core/Validation/Paths/StartupFolderValidator.cs
View file

@ -13,7 +13,7 @@ namespace NzbDrone.Core.Validation.Paths
_appFolderInfo = appFolderInfo;
}
protected override string GetDefaultMessageTemplate() => "Path cannot be an ancestor of the start up folder";
protected override string GetDefaultMessageTemplate() => "Path cannot be {relationship} the start up folder";
protected override bool IsValid(PropertyValidatorContext context)
{
@ -22,7 +22,24 @@ namespace NzbDrone.Core.Validation.Paths
return true;
}
return !_appFolderInfo.StartUpFolder.IsParentPath(context.PropertyValue.ToString());
var startupFolder = _appFolderInfo.StartUpFolder;
var folder = context.PropertyValue.ToString();
if (startupFolder.PathEquals(folder))
{
context.MessageFormatter.AppendArgument("relationship", "set to");
return false;
}
if (startupFolder.IsParentPath(folder))
{
context.MessageFormatter.AppendArgument("relationship", "child of");
return false;
}
return true;
}
}
}