New: Add MovieCollectionThe Naming Token (#11145)

frontend/src/Settings/MediaManagement/Naming/NamingModal.tsx

@@ -114,6 +114,11 @@ const movieTokens = [
     example: 'The Movie Collection',
     footNotes: '1',
   },
+  {
+    token: '{Movie CollectionThe}',
+    example: 'Movie Collection, The',
+    footNotes: '1',
+  },
   { token: '{Movie Certification}', example: 'R' },
   { token: '{Release Year}', example: '2009' },
 ];

src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CollectionTheFixture.cs

@@ -0,0 +1,90 @@
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Movies;
+using NzbDrone.Core.Organizer;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
+{
+    [TestFixture]
+    public class CollectionTheFixture : CoreTest<FileNameBuilder>
+    {
+        private Movie _movie;
+        private MovieFile _movieFile;
+        private NamingConfig _namingConfig;
+
+        [SetUp]
+        public void Setup()
+        {
+            _movie = Builder<Movie>
+                    .CreateNew()
+                    .With(e => e.Title = "Movie Title")
+                    .Build();
+
+            _movieFile = new MovieFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "RadarrTest" };
+
+            _namingConfig = NamingConfig.Default;
+            _namingConfig.RenameMovies = true;
+
+            Mocker.GetMock<INamingConfigService>()
+                  .Setup(c => c.GetConfig()).Returns(_namingConfig);
+
+            Mocker.GetMock<IQualityDefinitionService>()
+                .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
+                .Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
+
+            Mocker.GetMock<ICustomFormatService>()
+                .Setup(v => v.All())
+                .Returns(new List<CustomFormat>());
+        }
+
+        [TestCase("The Badger Collection", "Badger Collection, The")]
+        [TestCase("The Mover Collection", "Mover Collection, The")]
+        [TestCase("A Stupid Collection", "Stupid Collection, A")]
+        [TestCase("An Astounding Collection", "Astounding Collection, An")]
+        [TestCase("The Amazing Animal-Hero Collection (2001)", "Amazing Animal-Hero Collection, The (2001)")]
+        [TestCase("A Different Movie (AU)", "Different Movie, A (AU)")]
+        [TestCase("The Repairer (ZH) (2015)", "Repairer, The (ZH) (2015)")]
+        [TestCase("The Eighth Sense 2 (Thai)", "Eighth Sense 2, The (Thai)")]
+        [TestCase("The Astonishing Jog (Latin America)", "Astonishing Jog, The (Latin America)")]
+        [TestCase("The Hampster Pack (B&F)", "Hampster Pack, The (B&F)")]
+        [TestCase("The Gasm: I (Almost) Got Away With It (1900)", "Gasm - I (Almost) Got Away With It, The (1900)")]
+        public void should_get_expected_title_back(string collection, string expected)
+        {
+            SetCollectionName(_movie, collection);
+            _namingConfig.StandardMovieFormat = "{Movie CollectionThe}";
+
+            Subject.BuildFileName(_movie, _movieFile)
+                   .Should().Be(expected);
+        }
+
+        [TestCase("A")]
+        [TestCase("Anne")]
+        [TestCase("Theodore")]
+        [TestCase("3%")]
+        public void should_not_change_title(string collection)
+        {
+            SetCollectionName(_movie, collection);
+            _namingConfig.StandardMovieFormat = "{Movie CollectionThe}";
+
+            Subject.BuildFileName(_movie, _movieFile)
+                   .Should().Be(collection);
+        }
+
+        private void SetCollectionName(Movie movie, string collectionName)
+        {
+            var metadata = new MovieMetadata()
+            {
+                CollectionTitle = collectionName,
+            };
+            movie.MovieMetadata = new Core.Datastore.LazyLoaded<MovieMetadata>(metadata);
+            movie.MovieMetadata.Value.CollectionTitle = collectionName;
+        }
+    }
+}

src/NzbDrone.Core/Organizer/FileNameBuilder.cs

@@ -268,6 +268,7 @@ private void AddMovieTokens(Dictionary<string, Func<TokenMatch, string>> tokenHa
 
             tokenHandlers["{Movie Certification}"] = m => movie.MovieMetadata.Value.Certification ?? string.Empty;
             tokenHandlers["{Movie Collection}"] = m => Truncate(movie.MovieMetadata.Value.CollectionTitle, m.CustomFormat) ?? string.Empty;
+            tokenHandlers["{Movie CollectionThe}"] = m => Truncate(TitleThe(movie.MovieMetadata.Value.CollectionTitle), m.CustomFormat) ?? string.Empty;
         }
 
         private string GetLanguageTitle(Movie movie, string isoCodes)