From e417082690f0b60dfcd0b89dd155a695ebcdb12d Mon Sep 17 00:00:00 2001
From: SF4L <36459489+SF4L@users.noreply.github.com>
Date: Fri, 25 Jul 2025 18:33:09 -0400
Subject: [PATCH] Support multiple tokens without breaking re-import/renames
 Radarr: #11174, relevant comment from Sonarr:
 https://github.com/Sonarr/Sonarr/pull/7982#issuecomment-3118258372

---
 src/NzbDrone.Core/Organizer/FileNameBuilder.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index f705b68035..e8a028ab20 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -659,7 +659,12 @@ private string GetOriginalFileName(MovieFile movieFile, bool multipleTokens)
         {
             if (multipleTokens)
             {
-                return string.Empty;
+                if (movieFile.OriginalFilePath.IsNullOrWhiteSpace())
+                {
+                    return string.Empty;
+                }
+
+                return Path.GetFileNameWithoutExtension(movieFile.OriginalFilePath);
             }
 
             if (movieFile.RelativePath.IsNullOrWhiteSpace())