From c5c04622588b469e23a8629dbce8d112fddc073b Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Sun, 6 Dec 2020 11:33:56 -0800
Subject: [PATCH] Fixed: Using folder as scene name for season packs

---
 .../MediaFiles/ImportApprovedEpisodesFixture.cs | 17 ++++++++++++++++-
 .../EpisodeImport/ImportApprovedEpisodes.cs     |  4 +++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/NzbDrone.Core.Test/MediaFiles/ImportApprovedEpisodesFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/ImportApprovedEpisodesFixture.cs
index 2f6e9c92f..2a423c765 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/ImportApprovedEpisodesFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/ImportApprovedEpisodesFixture.cs
@@ -259,6 +259,22 @@ namespace NzbDrone.Core.Test.MediaFiles
             Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<EpisodeFile>(c => c.SceneName == null)));
         }
 
+        [Test]
+        public void should_not_use_folder_name_as_scenename_if_it_is_for_a_full_season()
+        {
+            GivenNewDownload();
+            _approvedDecisions.First().LocalEpisode.Path = Path.Combine(_downloadClientItem.OutputPath.ToString(), "aaaaa.mkv");
+            _approvedDecisions.First().LocalEpisode.FolderEpisodeInfo = new ParsedEpisodeInfo
+                                                                        {
+                                                                            ReleaseTitle = "series.title.s02.dvdrip.xvid-ingot.mkv",
+                                                                            FullSeason = true
+            };
+
+            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true);
+
+            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<EpisodeFile>(c => c.SceneName == null)));
+        }
+
         [Test]
         public void should_import_larger_files_first()
         {
@@ -467,6 +483,5 @@ namespace NzbDrone.Core.Test.MediaFiles
 
             Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<EpisodeFile>(c => c.OriginalFilePath == $"{name}\\subfolder\\{name}.mkv".AsOsAgnostic())));
         }
-
     }
 }
diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs
index 90e6c03b4..45b084c6e 100644
--- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs
@@ -220,7 +220,9 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
 
             var folderTitle = localEpisode.FolderEpisodeInfo?.ReleaseTitle;
 
-            if (folderTitle.IsNotNullOrWhiteSpace() && SceneChecker.IsSceneTitle(folderTitle))
+            if (localEpisode.FolderEpisodeInfo?.FullSeason == false &&
+                folderTitle.IsNotNullOrWhiteSpace() &&
+                SceneChecker.IsSceneTitle(folderTitle))
             {
                 return folderTitle;
             }