mirror of
https://github.com/Radarr/Radarr.git
synced 2026-04-18 21:35:51 -04:00
Fixed: Prevent using Original names with other movie file tokens (#11175)
Co-authored-by: Bogdan <mynameisbogdan@users.noreply.github.com>
This commit is contained in:
committed by
Robin Dadswell
parent
ada3afe022
commit
f48eb2b803
@@ -34,7 +34,7 @@ namespace NzbDrone.Core.Organizer
|
|||||||
|
|
||||||
public class ValidMovieFormatValidator : PropertyValidator
|
public class ValidMovieFormatValidator : PropertyValidator
|
||||||
{
|
{
|
||||||
protected override string GetDefaultMessageTemplate() => "Must contain movie title and release year OR Original Title";
|
protected override string GetDefaultMessageTemplate() => "Must contain either movie title and release year OR Original Title/Filename";
|
||||||
|
|
||||||
protected override bool IsValid(PropertyValidatorContext context)
|
protected override bool IsValid(PropertyValidatorContext context)
|
||||||
{
|
{
|
||||||
@@ -43,7 +43,7 @@ namespace NzbDrone.Core.Organizer
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (FileNameBuilder.MovieTitleRegex.IsMatch(value) && FileNameBuilder.ReleaseYearRegex.IsMatch(value)) ||
|
return (FileNameBuilder.MovieTitleRegex.IsMatch(value) && FileNameBuilder.ReleaseYearRegex.IsMatch(value) && !FileNameValidation.OriginalTokenRegex.IsMatch(value)) ||
|
||||||
FileNameValidation.OriginalTokenRegex.IsMatch(value);
|
FileNameValidation.OriginalTokenRegex.IsMatch(value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user