2 files changed, 155 insertions, 2 deletions
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
index a28c1d6dfb..f717d9b665 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
@@ -29,6 +29,7 @@ public class FindExtrasTests
 {
     private readonly Emby.Server.Implementations.Library.LibraryManager _libraryManager;
     private readonly Mock<IFileSystem> _fileSystemMock;
+    private readonly Mock<IItemRepository> _itemRepositoryMock;
 
     public FindExtrasTests()
     {
@@ -36,8 +37,8 @@ public class FindExtrasTests
         fixture.Register(() => new NamingOptions());
         var configMock = fixture.Freeze<Mock<IServerConfigurationManager>>();
         configMock.Setup(c => c.ApplicationPaths.ProgramDataPath).Returns("/data");
-        var itemRepository = fixture.Freeze<Mock<IItemRepository>>();
-        itemRepository.Setup(i => i.RetrieveItem(It.IsAny<Guid>())).Returns<BaseItem>(null);
+        _itemRepositoryMock = fixture.Freeze<Mock<IItemRepository>>();
+        _itemRepositoryMock.Setup(i => i.RetrieveItem(It.IsAny<Guid>())).Returns<BaseItem>(null);
         _fileSystemMock = fixture.Freeze<Mock<IFileSystem>>();
         _fileSystemMock.Setup(f => f.GetFileInfo(It.IsAny<string>())).Returns<string>(path => new FileSystemMetadata { FullName = path });
 
@@ -482,6 +483,69 @@ public class FindExtrasTests
     }
 
     [Fact]
+    public void FindExtras_ExtraNamedByLocalMetadata_KeepsItsNameOnRescan()
+    {
+        var owner = new Movie { Name = "Up", Path = "/movies/Up (2009)/Up (2009).mkv" };
+        var paths = new List<string>
+        {
+            "/movies/Up (2009)/Up (2009).mkv",
+            "/movies/Up (2009)/Up (2009)-trailer.mkv"
+        };
+
+        var files = paths.Select(p => new FileSystemMetadata
+        {
+            FullName = p,
+            IsDirectory = false
+        }).ToList();
+
+        var directoryService = new DirectoryService(_fileSystemMock.Object);
+        var extra = Assert.Single(_libraryManager.FindExtras(owner, files, directoryService));
+        Assert.Equal("Trailer", extra.Name);
+
+        // A local metadata file gives the extra a title of its own, which the refresh persists
+        extra.Name = "Cannes Teaser";
+        _itemRepositoryMock.Setup(i => i.RetrieveItem(extra.Id)).Returns(extra);
+
+        var rescanned = Assert.Single(_libraryManager.FindExtras(owner, files, directoryService));
+        Assert.Equal("Cannes Teaser", rescanned.Name);
+    }
+
+    [Fact]
+    public void FindExtras_ExtraKeptItsGeneratedName_IsRenumberedOnRescan()
+    {
+        var owner = new Movie { Name = "Up", Path = "/movies/Up (2009)/Up (2009).mkv" };
+        var paths = new List<string>
+        {
+            "/movies/Up (2009)/Up (2009).mkv",
+            "/movies/Up (2009)/Up (2009)-trailer2.mkv"
+        };
+
+        var files = paths.Select(p => new FileSystemMetadata
+        {
+            FullName = p,
+            IsDirectory = false
+        }).ToList();
+
+        var directoryService = new DirectoryService(_fileSystemMock.Object);
+        var extra = Assert.Single(_libraryManager.FindExtras(owner, files, directoryService));
+        Assert.Equal("Trailer", extra.Name);
+        _itemRepositoryMock.Setup(i => i.RetrieveItem(extra.Id)).Returns(extra);
+
+        // A trailer sorting before the known one takes the first number, so the known one moves on
+        files.Add(new FileSystemMetadata
+        {
+            FullName = "/movies/Up (2009)/Up (2009)-trailer1.mkv",
+            IsDirectory = false
+        });
+
+        var rescanned = _libraryManager.FindExtras(owner, files, directoryService)
+            .ToDictionary(e => e.Path, e => e.Name, StringComparer.Ordinal);
+
+        Assert.Equal("Trailer", rescanned["/movies/Up (2009)/Up (2009)-trailer1.mkv"]);
+        Assert.Equal("Trailer 2", rescanned["/movies/Up (2009)/Up (2009)-trailer2.mkv"]);
+    }
+
+    [Fact]
     public void FindExtras_ExtraWithOwnTitleBesideOwner_KeepsTitle()
     {
         var owner = new Movie { Name = "Up", Path = "/movies/Up (2009)/Up (2009).mkv" };
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Library/MovieResolverTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Library/MovieResolverTests.cs
index e1346a8436..3aac3cdc43 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Library/MovieResolverTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Library/MovieResolverTests.cs
@@ -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));
+    }
 }