From f48eb2b80320b3173f70dc7fe7b48e4e2ada7122 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Fri, 25 Jul 2025 08:16:18 -0500 Subject: [PATCH] Fixed: Prevent using Original names with other movie file tokens (#11175) Co-authored-by: Bogdan --- src/NzbDrone.Core/Organizer/FileNameValidation.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core/Organizer/FileNameValidation.cs b/src/NzbDrone.Core/Organizer/FileNameValidation.cs index d4c667dd9a..1bd7d176b4 100644 --- a/src/NzbDrone.Core/Organizer/FileNameValidation.cs +++ b/src/NzbDrone.Core/Organizer/FileNameValidation.cs @@ -34,7 +34,7 @@ public static IRuleBuilderOptions ValidMovieFolderFormat(this IRul 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) { @@ -43,7 +43,7 @@ protected override bool IsValid(PropertyValidatorContext context) 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); } }