From e870fd5215e9382066e254af59657289878b9695 Mon Sep 17 00:00:00 2001
From: ta264 <ta264@users.noreply.github.com>
Date: Fri, 19 Jun 2020 21:50:41 +0100
Subject: [PATCH] Fixed: Use originalFilePath in CF if scene name missing

---
 .../CustomFormatCalculationService.cs           | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs b/src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs
index 8ff472528..e58dedea6 100644
--- a/src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs
+++ b/src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Blacklisting;
@@ -59,10 +60,24 @@ namespace NzbDrone.Core.CustomFormats
 
         public static List<CustomFormat> ParseCustomFormat(MovieFile movieFile, List<CustomFormat> allCustomFormats)
         {
+            var sceneName = string.Empty;
+            if (movieFile.SceneName.IsNotNullOrWhiteSpace())
+            {
+                sceneName = movieFile.SceneName;
+            }
+            else if (movieFile.OriginalFilePath.IsNotNullOrWhiteSpace())
+            {
+                sceneName = movieFile.OriginalFilePath;
+            }
+            else if (movieFile.RelativePath.IsNotNullOrWhiteSpace())
+            {
+                sceneName = Path.GetFileName(movieFile.RelativePath);
+            }
+
             var info = new ParsedMovieInfo
             {
                 MovieTitle = movieFile.Movie.Title,
-                SimpleReleaseTitle = movieFile.GetSceneOrFileName().SimplifyReleaseTitle(),
+                SimpleReleaseTitle = sceneName.SimplifyReleaseTitle(),
                 Quality = movieFile.Quality,
                 Languages = movieFile.Languages,
                 ReleaseGroup = movieFile.ReleaseGroup,