aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs3
-rw-r--r--tests/Jellyfin.Server.Implementations.Tests/Library/MovieResolverTests.cs21
2 files changed, 24 insertions, 0 deletions
diff --git a/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs b/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs
index 6d887c5771..fd93532ba6 100644
--- a/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs
@@ -32,6 +32,7 @@ namespace Jellyfin.Naming.Tests.Video
public void TestExpandedExtras()
{
Test("trailer.mp4", ExtraType.Trailer);
+ Test("trailer2.mp4", ExtraType.Trailer);
Test("trailer.mp3", null);
Test("300-trailer.mp4", ExtraType.Trailer);
Test("stuff trailerthings.mkv", null);
@@ -133,6 +134,8 @@ namespace Jellyfin.Naming.Tests.Video
Test("300.sample.mp4", ExtraType.Sample);
Test("300_sample.mp4", ExtraType.Sample);
Test("300 - sample.mp4", ExtraType.Sample);
+ Test("sample1.mp4", ExtraType.Sample);
+ Test("Sample2.mkv", ExtraType.Sample);
}
[Fact]
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"));