1
0
Fork 0
mirror of https://github.com/lidarr/Lidarr synced 2024-12-21 23:32:27 +00:00

Skip duplicate import list exclusions

(cherry picked from commit 9af2f137f41867a29d544fad77551672a79f24b6)

Closes #5003
This commit is contained in:
Bogdan 2024-08-15 06:20:25 +03:00
parent 809db4022e
commit 04e0d3f22e
3 changed files with 14 additions and 4 deletions

View file

@ -20,7 +20,11 @@ public ImportListExclusionController(IImportListExclusionService importListExclu
{
_importListExclusionService = importListExclusionService;
SharedValidator.RuleFor(c => c.ForeignId).NotEmpty().SetValidator(guidValidator).SetValidator(importListExclusionExistsValidator);
SharedValidator.RuleFor(c => c.ForeignId).Cascade(CascadeMode.Stop)
.NotEmpty()
.SetValidator(guidValidator)
.SetValidator(importListExclusionExistsValidator);
SharedValidator.RuleFor(c => c.ArtistName).NotEmpty();
}

View file

@ -1,6 +1,7 @@
using FluentValidation.Validators;
using NzbDrone.Core.ImportLists.Exclusions;
namespace NzbDrone.Core.ImportLists.Exclusions
namespace Lidarr.Api.V1.ImportLists
{
public class ImportListExclusionExistsValidator : PropertyValidator
{
@ -20,7 +21,12 @@ protected override bool IsValid(PropertyValidatorContext context)
return true;
}
return !_importListExclusionService.All().Exists(s => s.ForeignId == context.PropertyValue.ToString());
if (context.InstanceToValidate is not ImportListExclusionResource listExclusionResource)
{
return true;
}
return !_importListExclusionService.All().Exists(v => v.ForeignId == context.PropertyValue.ToString() && v.Id != listExclusionResource.Id);
}
}
}

View file

@ -14,7 +14,7 @@ protected override bool IsValid(PropertyValidatorContext context)
return false;
}
return Guid.TryParse(context.PropertyValue.ToString(), out var guidOutput);
return Guid.TryParse(context.PropertyValue.ToString(), out _);
}
}
}