Backup_Repos/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-12-07 08:54:57 +01:00
Code Issues Projects Releases Wiki Activity

Fixed: Prevent using Original names with other movie file tokens (#11175)

Browse source 
Co-authored-by: Bogdan <mynameisbogdan@users.noreply.github.com>
This commit is contained in:
bakerboy448 2025-07-25 08:16:18 -05:00 committed by Robin Dadswell
parent ada3afe022
commit f48eb2b803
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/NzbDrone.Core/Organizer/FileNameValidation.cs
View file

@ -34,7 +34,7 @@ public static IRuleBuilderOptions<T, string> ValidMovieFolderFormat<T>(this IRul
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 @@ protected override bool IsValid(PropertyValidatorContext context)
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);
} }
} }