Backport pull request #18255 from jellyfin/release-12.z

Recognize numbered sample and trailer files as extras

Original-merge: b69a53578821e4e8136892615d5d62b7095e8b21

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Cody Robibero <cody@robibe.ro>

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/Jellyfin.Server.Implementations.Tests/Library/MovieResolverTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Library/MovieResolverTests.cs
index 3aac3cdc43..743ac6055b 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Library/MovieResolverTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Library/MovieResolverTests.cs
@@ -92,6 +92,27 @@ public class MovieResolverTests
     }
 
     [Fact]
+    public void ResolveMultiple_GivenNumberedSampleFiles_IgnoresSamples()
+    {
+        var movieResolver = new MovieResolver(Mock.Of<IImageProcessor>(), Mock.Of<ILogger<MovieResolver>>(), _namingOptions, Mock.Of<IDirectoryService>(), _videoListResolver);
+
+        var parent = new Folder { Path = "/movies/La Chimera (2023)" };
+        var files = new List<FileSystemMetadata>
+        {
+            new() { FullName = "/movies/La Chimera (2023)/La Chimera (2023).mkv", Name = "La Chimera (2023).mkv", IsDirectory = false },
+            new() { FullName = "/movies/La Chimera (2023)/Sample1.mkv", Name = "Sample1.mkv", IsDirectory = false },
+            new() { FullName = "/movies/La Chimera (2023)/Sample2.mkv", Name = "Sample2.mkv", IsDirectory = false }
+        };
+
+        var result = movieResolver.ResolveMultiple(parent, files, CollectionType.movies, Mock.Of<IDirectoryService>());
+
+        Assert.NotNull(result);
+        var movie = Assert.Single(result.Items);
+        Assert.IsType<Movie>(movie);
+        Assert.Equal(files[0].FullName, movie.Path);
+    }
+
+    [Fact]
     public void AllExtrasTypesFolderNames_ContainsSampleSingularAndPlural()
     {
         Assert.True(_namingOptions.AllExtrasTypesFolderNames.ContainsKey("sample"));