Merge pull request #17456 from Shadowghost/fix-extras

Fix extras naming and version assignment

1 files changed, 231 insertions, 19 deletions

diff --git a/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
index 07c537aee1..a28c1d6dfb 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.Json;
 using AutoFixture;
 using AutoFixture.AutoMoq;
 using Emby.Naming.Common;
@@ -17,6 +18,7 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
 using Moq;
 using Xunit;
@@ -38,9 +40,15 @@ public class FindExtrasTests
         itemRepository.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 });
+
+        var strings = LoadCoreStrings();
+        fixture.Freeze<Mock<ILocalizationManager>>()
+            .Setup(l => l.GetServerLocalizedString(It.IsAny<string>()))
+            .Returns<string>(key => strings.TryGetValue(key, out var value) ? value : key);
+
         _libraryManager = fixture.Build<Emby.Server.Implementations.Library.LibraryManager>().Do(s => s.AddParts(
                 fixture.Create<IEnumerable<IResolverIgnoreRule>>(),
-                new List<IItemResolver> { new AudioResolver(fixture.Create<NamingOptions>()) },
+                [new AudioResolver(fixture.Create<NamingOptions>())],
                 fixture.Create<IEnumerable<IIntroProvider>>(),
                 fixture.Create<IEnumerable<IBaseItemComparer>>(),
                 fixture.Create<IEnumerable<ILibraryPostScanTask>>()))
@@ -51,6 +59,16 @@ public class FindExtrasTests
         BaseItem.MediaSourceManager ??= fixture.Create<IMediaSourceManager>();
     }
 
+    private static Dictionary<string, string> LoadCoreStrings()
+    {
+        using var stream = typeof(Emby.Server.Implementations.Library.LibraryManager).Assembly
+            .GetManifestResourceStream("Emby.Server.Implementations.Localization.Core.en-US.json")
+            ?? throw new InvalidOperationException("Core localization resource is missing");
+
+        return JsonSerializer.Deserialize<Dictionary<string, string>>(stream)
+            ?? throw new InvalidOperationException("Core localization resource is empty");
+    }
+
     [Fact]
     public void FindExtras_SeparateMovieFolder_FindsCorrectExtras()
     {
@@ -132,60 +150,60 @@ public class FindExtrasTests
                 It.IsAny<string[]>(),
                 false,
                 false))
-            .Returns(new List<FileSystemMetadata>
-            {
+            .Returns(
+            [
                 new()
                 {
                     FullName = "/movies/Up/trailers/some trailer.mkv",
                     Name = "some trailer.mkv",
                     IsDirectory = false
                 }
-            }).Verifiable();
+            ]).Verifiable();
 
         _fileSystemMock.Setup(f => f.GetFiles(
                 "/movies/Up/behind the scenes",
                 It.IsAny<string[]>(),
                 false,
                 false))
-            .Returns(new List<FileSystemMetadata>
-            {
+            .Returns(
+            [
                 new()
                 {
                     FullName = "/movies/Up/behind the scenes/the making of Up.mkv",
                     Name = "the making of Up.mkv",
                     IsDirectory = false
                 }
-            }).Verifiable();
+            ]).Verifiable();
 
         _fileSystemMock.Setup(f => f.GetFiles(
                 "/movies/Up/theme-music",
                 It.IsAny<string[]>(),
                 false,
                 false))
-            .Returns(new List<FileSystemMetadata>
-            {
+            .Returns(
+            [
                 new()
                 {
                     FullName = "/movies/Up/theme-music/theme2.mp3",
                     Name = "theme2.mp3",
                     IsDirectory = false
                 }
-            }).Verifiable();
+            ]).Verifiable();
 
         _fileSystemMock.Setup(f => f.GetFiles(
                 "/movies/Up/extras",
                 It.IsAny<string[]>(),
                 false,
                 false))
-            .Returns(new List<FileSystemMetadata>
-            {
+            .Returns(
+            [
                 new()
                 {
                     FullName = "/movies/Up/extras/Honest Trailer.mkv",
                     Name = "Honest Trailer.mkv",
                     IsDirectory = false
                 }
-            }).Verifiable();
+            ]).Verifiable();
 
         var files = paths.Select(p => new FileSystemMetadata
         {
@@ -289,15 +307,15 @@ public class FindExtrasTests
                 It.IsAny<string[]>(),
                 false,
                 false))
-            .Returns(new List<FileSystemMetadata>
-            {
+            .Returns(
+            [
                 new()
                 {
                     FullName = "/movies/Up/trailers/trailer.jpg",
                     Name = "trailer.jpg",
                     IsDirectory = false
                 }
-            }).Verifiable();
+            ]).Verifiable();
 
         var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object)).OrderBy(e => e.ExtraType).ToList();
 
@@ -320,15 +338,15 @@ public class FindExtrasTests
                 It.IsAny<string[]>(),
                 false,
                 false))
-            .Returns(new List<FileSystemMetadata>
-            {
+            .Returns(
+            [
                 new()
                 {
                     FullName = "/movies/Up/trailers/Trailer 1 (2013).mkv",
                     Name = "Trailer 1 (2013).mkv",
                     IsDirectory = false
                 }
-            }).Verifiable();
+            ]).Verifiable();
 
         var files = paths.Select(p => new FileSystemMetadata
         {
@@ -372,4 +390,198 @@ public class FindExtrasTests
         Assert.Equal("/series/Dexter/trailer.mkv", extras[0].Path);
         Assert.Equal("/series/Dexter/trailers/trailer2.mkv", extras[1].Path);
     }
+
+    [Fact]
+    public void FindExtras_SameExtraInSeveralContainers_ReturnsEach()
+    {
+        var owner = new Movie { Name = "Skyscraper", Path = "/movies/Skyscraper (2018)/Skyscraper (2018) - [1080p HEVC].mkv" };
+        var paths = new List<string>
+        {
+            "/movies/Skyscraper (2018)/Skyscraper (2018) - [1080p HEVC].mkv",
+            "/movies/Skyscraper (2018)/Skyscraper (2018) - [1080p HEVC]-trailer.mkv",
+            "/movies/Skyscraper (2018)/Skyscraper (2018) - [1080p HEVC]-trailer.mp4",
+            "/movies/Skyscraper (2018)/Skyscraper (2018) - [1080p HEVC]-behindthescenes.mkv",
+            "/movies/Skyscraper (2018)/Skyscraper (2018) - [1080p HEVC]-behindthescenes.mp4"
+        };
+
+        var files = paths.Select(p => new FileSystemMetadata
+        {
+            FullName = p,
+            IsDirectory = false
+        }).ToList();
+
+        var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object))
+            .ToDictionary(e => e.Path, e => e.Name, StringComparer.Ordinal);
+
+        // A container is a separate file that plays on its own, so it is a separate extra
+        Assert.Equal(4, extras.Count);
+        Assert.Equal("Behind The Scenes", extras["/movies/Skyscraper (2018)/Skyscraper (2018) - [1080p HEVC]-behindthescenes.mkv"]);
+        Assert.Equal("Behind The Scenes 2", extras["/movies/Skyscraper (2018)/Skyscraper (2018) - [1080p HEVC]-behindthescenes.mp4"]);
+        Assert.Equal("Trailer", extras["/movies/Skyscraper (2018)/Skyscraper (2018) - [1080p HEVC]-trailer.mkv"]);
+        Assert.Equal("Trailer 2", extras["/movies/Skyscraper (2018)/Skyscraper (2018) - [1080p HEVC]-trailer.mp4"]);
+    }
+
+    [Fact]
+    public void FindExtras_SameExtraInSeveralResolutions_ReturnsEach()
+    {
+        var owner = new Movie { Name = "Dragon 2", Path = "/movies/Dragon 2 (2014)/Dragon 2 (2014) - [2160p].mkv" };
+        var paths = new List<string>
+        {
+            "/movies/Dragon 2 (2014)/Dragon 2 (2014) - [2160p].mkv",
+            "/movies/Dragon 2 (2014)/Dragon 2 (2014) - [1080p]-trailer.mkv",
+            "/movies/Dragon 2 (2014)/Dragon 2 (2014) - [2160p]-trailer.mkv"
+        };
+
+        var files = paths.Select(p => new FileSystemMetadata
+        {
+            FullName = p,
+            IsDirectory = false
+        }).ToList();
+
+        var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object))
+            .ToDictionary(e => e.Path, e => e.Name, StringComparer.Ordinal);
+
+        Assert.Equal(2, extras.Count);
+        Assert.Equal("Trailer", extras["/movies/Dragon 2 (2014)/Dragon 2 (2014) - [1080p]-trailer.mkv"]);
+        Assert.Equal("Trailer 2", extras["/movies/Dragon 2 (2014)/Dragon 2 (2014) - [2160p]-trailer.mkv"]);
+    }
+
+    [Fact]
+    public void FindExtras_NumberedExtras_AreKeptApart()
+    {
+        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",
+            "/movies/Up (2009)/Up (2009)-trailer2.mkv",
+            "/movies/Up (2009)/Up (2009)-trailer2.mp4",
+            "/movies/Up (2009)/Up (2009)-trailer3.mkv"
+        };
+
+        var files = paths.Select(p => new FileSystemMetadata
+        {
+            FullName = p,
+            IsDirectory = false
+        }).ToList();
+
+        var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object)).OrderBy(e => e.Path, StringComparer.Ordinal).ToList();
+
+        Assert.Equal(4, extras.Count);
+        Assert.Equal("/movies/Up (2009)/Up (2009)-trailer.mkv", extras[0].Path);
+        Assert.Equal("/movies/Up (2009)/Up (2009)-trailer2.mkv", extras[1].Path);
+        Assert.Equal("/movies/Up (2009)/Up (2009)-trailer2.mp4", extras[2].Path);
+        Assert.Equal("/movies/Up (2009)/Up (2009)-trailer3.mkv", extras[3].Path);
+
+        // The index in the file name is not the number the extra is given, which counts the
+        // extras of a type as they are found
+        Assert.Equal("Trailer", extras[0].Name);
+        Assert.Equal("Trailer 2", extras[1].Name);
+        Assert.Equal("Trailer 3", extras[2].Name);
+        Assert.Equal("Trailer 4", extras[3].Name);
+    }
+
+    [Fact]
+    public void FindExtras_ExtraWithOwnTitleBesideOwner_KeepsTitle()
+    {
+        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",
+            "/movies/Up (2009)/Recording the audio-behindthescenes.mkv",
+            "/movies/Up (2009)/Up (2009)-behindthescenes.mkv"
+        };
+
+        var files = paths.Select(p => new FileSystemMetadata
+        {
+            FullName = p,
+            IsDirectory = false
+        }).ToList();
+
+        var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object))
+            .ToDictionary(e => e.Path, e => e.Name, StringComparer.Ordinal);
+
+        Assert.Equal(3, extras.Count);
+        Assert.Equal("Trailer", extras["/movies/Up (2009)/Up (2009)-trailer.mkv"]);
+
+        // A descriptive file name is a real title and survives, and does not consume a number
+        Assert.Equal("Recording the audio", extras["/movies/Up (2009)/Recording the audio-behindthescenes.mkv"]);
+        Assert.Equal("Behind The Scenes", extras["/movies/Up (2009)/Up (2009)-behindthescenes.mkv"]);
+    }
+
+    [Fact]
+    public void FindExtras_ExtraInOwnFolder_IsNamedAfterItsFile()
+    {
+        var owner = new Movie { Name = "Up", Path = "/movies/Up/Up.mkv" };
+        var paths = new List<string>
+        {
+            "/movies/Up/Up.mkv",
+            "/movies/Up/trailers"
+        };
+
+        _fileSystemMock.Setup(f => f.GetFiles(
+                "/movies/Up/trailers",
+                It.IsAny<string[]>(),
+                false,
+                false))
+            .Returns(
+            [
+                new() { FullName = "/movies/Up/trailers/Teaser.mkv", Name = "Teaser.mkv", IsDirectory = false },
+                new() { FullName = "/movies/Up/trailers/Comic-Con Reel.mkv", Name = "Comic-Con Reel.mkv", IsDirectory = false }
+            ]).Verifiable();
+
+        var files = paths.Select(p => new FileSystemMetadata
+        {
+            FullName = p,
+            Name = Path.GetFileName(p),
+            IsDirectory = !Path.HasExtension(p)
+        }).ToList();
+
+        var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object))
+            .ToDictionary(e => e.Path, e => e.Name, StringComparer.Ordinal);
+
+        _fileSystemMock.Verify();
+        Assert.Equal(2, extras.Count);
+        Assert.Equal("Teaser", extras["/movies/Up/trailers/Teaser.mkv"]);
+        Assert.Equal("Comic-Con Reel", extras["/movies/Up/trailers/Comic-Con Reel.mkv"]);
+    }
+
+    [Fact]
+    public void FindExtras_DistinctExtrasInSameFolder_AreKeptApart()
+    {
+        var owner = new Movie { Name = "Up", Path = "/movies/Up/Up.mkv" };
+        var paths = new List<string>
+        {
+            "/movies/Up/Up.mkv",
+            "/movies/Up/trailers"
+        };
+
+        _fileSystemMock.Setup(f => f.GetFiles(
+                "/movies/Up/trailers",
+                It.IsAny<string[]>(),
+                false,
+                false))
+            .Returns(
+            [
+                new() { FullName = "/movies/Up/trailers/Teaser.mkv", Name = "Teaser.mkv", IsDirectory = false },
+                new() { FullName = "/movies/Up/trailers/Official.mkv", Name = "Official.mkv", IsDirectory = false },
+                new() { FullName = "/movies/Up/trailers/Official.mp4", Name = "Official.mp4", IsDirectory = false }
+            ]).Verifiable();
+
+        var files = paths.Select(p => new FileSystemMetadata
+        {
+            FullName = p,
+            Name = Path.GetFileName(p),
+            IsDirectory = !Path.HasExtension(p)
+        }).ToList();
+
+        var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object)).OrderBy(e => e.Path, StringComparer.Ordinal).ToList();
+
+        _fileSystemMock.Verify();
+        Assert.Equal(3, extras.Count);
+        Assert.Equal("/movies/Up/trailers/Official.mkv", extras[0].Path);
+        Assert.Equal("/movies/Up/trailers/Official.mp4", extras[1].Path);
+        Assert.Equal("/movies/Up/trailers/Teaser.mkv", extras[2].Path);
+    }
 }