OpenSource/jellyfin
1
0 Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-10-26 16:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Ignore Sample subfolders when resolving movie folders

Original-merge: 40c7e44953

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

Backported-by: Cody Robibero <cody@robibe.ro>
This commit is contained in:
panko authored and Cody Robibero committed 2026-09-27 16:30:31 -04:00
1 parent 390296c9c8
commit f32b8d3b84
2 files changed
+95
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/Jellyfin.Server.Implementations.Tests/Library/MovieResolverTests.cs
+89
View File
@@ -10,6 +10,7 @@ using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.IO;
using Microsoft.Extensions.Logging;
using Moq;
@@ -89,4 +90,92 @@ public class MovieResolverTests
Assert.All(result.Items, item => Assert.IsType<Movie>(item));
Assert.Single(((Video)result.Items[0]).LocalAlternateVersions);
}
[Fact]
public void AllExtrasTypesFolderNames_ContainsSampleSingularAndPlural()
{
Assert.True(_namingOptions.AllExtrasTypesFolderNames.ContainsKey("sample"));
Assert.True(_namingOptions.AllExtrasTypesFolderNames.ContainsKey("Sample"));
Assert.True(_namingOptions.AllExtrasTypesFolderNames.ContainsKey("samples"));
}
[Theory]
[InlineData("Sample")]
[InlineData("sample")]
[InlineData("SAMPLE")]
[InlineData("samples")]
public void ResolvePath_MovieFolderWithSampleSubfolder_ResolvesToMovie(string sampleDirName)
{
var libraryManager = new Mock<ILibraryManager>();
libraryManager.Setup(m => m.GetLibraryOptions(It.IsAny<BaseItem>())).Returns(new LibraryOptions());
libraryManager.Setup(m => m.IgnoreFile(It.IsAny<FileSystemMetadata>(), It.IsAny<BaseItem>())).Returns(false);
var resolver = new MovieResolver(Mock.Of<IImageProcessor>(), Mock.Of<ILogger<MovieResolver>>(), _namingOptions, Mock.Of<IDirectoryService>(), _videoListResolver);
var args = new ItemResolveArgs(
Mock.Of<IServerApplicationPaths>(),
libraryManager.Object)
{
Parent = new Folder(),
CollectionType = CollectionType.movies,
FileInfo = new FileSystemMetadata
{
FullName = "/media/Outer Colony (2026)",
IsDirectory = true
},
FileSystemChildren = new[]
{
new FileSystemMetadata
{
FullName = "/media/Outer Colony (2026)/Outer Colony (2026).mkv",
Name = "Outer Colony (2026).mkv"
},
new FileSystemMetadata
{
FullName = "/media/Outer Colony (2026)/" + sampleDirName,
Name = sampleDirName,
IsDirectory = true
}
}
};
Assert.IsType<Movie>(resolver.ResolvePath(args));
}
[Fact]
public void ResolvePath_MovieFolderWithRealSubfolder_DoesNotResolveToSingleMovie()
{
var libraryManager = new Mock<ILibraryManager>();
libraryManager.Setup(m => m.GetLibraryOptions(It.IsAny<BaseItem>())).Returns(new LibraryOptions());
libraryManager.Setup(m => m.IgnoreFile(It.IsAny<FileSystemMetadata>(), It.IsAny<BaseItem>())).Returns(false);
var resolver = new MovieResolver(Mock.Of<IImageProcessor>(), Mock.Of<ILogger<MovieResolver>>(), _namingOptions, Mock.Of<IDirectoryService>(), _videoListResolver);
var args = new ItemResolveArgs(
Mock.Of<IServerApplicationPaths>(),
libraryManager.Object)
{
Parent = new Folder(),
CollectionType = CollectionType.movies,
FileInfo = new FileSystemMetadata
{
FullName = "/media/Outer Colony (2026)",
IsDirectory = true
},
FileSystemChildren = new[]
{
new FileSystemMetadata
{
FullName = "/media/Outer Colony (2026)/Outer Colony (2026).mkv",
Name = "Outer Colony (2026).mkv"
},
new FileSystemMetadata
{
FullName = "/media/Outer Colony (2026)/Feature",
Name = "Feature",
IsDirectory = true
}
}
};
Assert.Null(resolver.ResolvePath(args));
}
}