From 2749509f001505d35863db4b53bb4bc6c3af6fa4 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Tue, 28 Dec 2021 00:37:40 +0100
Subject: Use dedicated resolvers for extras

---
 Emby.Naming/Video/ExtraResolver.cs                 | 151 ---------------------
 Emby.Naming/Video/ExtraRuleResolver.cs             |  88 ++++++++++++
 Emby.Naming/Video/VideoListResolver.cs             |   7 +-
 Emby.Naming/Video/VideoResolver.cs                 |   2 +-
 .../Library/LibraryManager.cs                      |  87 ++++--------
 .../Library/Resolvers/ExtraResolver.cs             |  93 +++++++++++++
 .../Library/Resolvers/GenericVideoResolver.cs      |  18 +++
 .../Library/Resolvers/VideoExtraResolver.cs        |  55 --------
 tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs    |   4 +-
 .../Library/LibraryManager/FindExtrasTests.cs      |  12 +-
 10 files changed, 240 insertions(+), 277 deletions(-)
 delete mode 100644 Emby.Naming/Video/ExtraResolver.cs
 create mode 100644 Emby.Naming/Video/ExtraRuleResolver.cs
 create mode 100644 Emby.Server.Implementations/Library/Resolvers/ExtraResolver.cs
 create mode 100644 Emby.Server.Implementations/Library/Resolvers/GenericVideoResolver.cs
 delete mode 100644 Emby.Server.Implementations/Library/Resolvers/VideoExtraResolver.cs

diff --git a/Emby.Naming/Video/ExtraResolver.cs b/Emby.Naming/Video/ExtraResolver.cs
deleted file mode 100644
index fbdca859f..000000000
--- a/Emby.Naming/Video/ExtraResolver.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Emby.Naming.Audio;
-using Emby.Naming.Common;
-
-namespace Emby.Naming.Video
-{
-    /// <summary>
-    /// Resolve if file is extra for video.
-    /// </summary>
-    public static class ExtraResolver
-    {
-        private static readonly char[] _digits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
-
-        /// <summary>
-        /// Attempts to resolve if file is extra.
-        /// </summary>
-        /// <param name="path">Path to file.</param>
-        /// <param name="namingOptions">The naming options.</param>
-        /// <returns>Returns <see cref="ExtraResult"/> object.</returns>
-        public static ExtraResult GetExtraInfo(string path, NamingOptions namingOptions)
-        {
-            var result = new ExtraResult();
-
-            for (var i = 0; i < namingOptions.VideoExtraRules.Length; i++)
-            {
-                var rule = namingOptions.VideoExtraRules[i];
-                if ((rule.MediaType == MediaType.Audio && !AudioFileParser.IsAudioFile(path, namingOptions))
-                    || (rule.MediaType == MediaType.Video && !VideoResolver.IsVideoFile(path, namingOptions)))
-                {
-                    continue;
-                }
-
-                var pathSpan = path.AsSpan();
-                if (rule.RuleType == ExtraRuleType.Filename)
-                {
-                    var filename = Path.GetFileNameWithoutExtension(pathSpan);
-
-                    if (filename.Equals(rule.Token, StringComparison.OrdinalIgnoreCase))
-                    {
-                        result.ExtraType = rule.ExtraType;
-                        result.Rule = rule;
-                    }
-                }
-                else if (rule.RuleType == ExtraRuleType.Suffix)
-                {
-                    // Trim the digits from the end of the filename so we can recognize things like -trailer2
-                    var filename = Path.GetFileNameWithoutExtension(pathSpan).TrimEnd(_digits);
-
-                    if (filename.EndsWith(rule.Token, StringComparison.OrdinalIgnoreCase))
-                    {
-                        result.ExtraType = rule.ExtraType;
-                        result.Rule = rule;
-                    }
-                }
-                else if (rule.RuleType == ExtraRuleType.Regex)
-                {
-                    var filename = Path.GetFileName(path);
-
-                    var isMatch = Regex.IsMatch(filename, rule.Token, RegexOptions.IgnoreCase | RegexOptions.Compiled);
-
-                    if (isMatch)
-                    {
-                        result.ExtraType = rule.ExtraType;
-                        result.Rule = rule;
-                    }
-                }
-                else if (rule.RuleType == ExtraRuleType.DirectoryName)
-                {
-                    var directoryName = Path.GetFileName(Path.GetDirectoryName(pathSpan));
-                    if (directoryName.Equals(rule.Token, StringComparison.OrdinalIgnoreCase))
-                    {
-                        result.ExtraType = rule.ExtraType;
-                        result.Rule = rule;
-                    }
-                }
-
-                if (result.ExtraType != null)
-                {
-                    return result;
-                }
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Finds extras matching the video info.
-        /// </summary>
-        /// <param name="files">The list of file video infos.</param>
-        /// <param name="videoInfo">The video to compare against.</param>
-        /// <param name="videoFlagDelimiters">The video flag delimiters.</param>
-        /// <returns>A list of video extras for [videoInfo].</returns>
-        public static IReadOnlyList<VideoFileInfo> GetExtras(IReadOnlyList<VideoInfo> files, VideoFileInfo videoInfo, ReadOnlySpan<char> videoFlagDelimiters)
-        {
-            var parentDir = videoInfo.IsDirectory ? videoInfo.Path : Path.GetDirectoryName(videoInfo.Path.AsSpan());
-
-            var trimmedFileNameWithoutExtension = TrimFilenameDelimiters(videoInfo.FileNameWithoutExtension, videoFlagDelimiters);
-            var trimmedVideoInfoName = TrimFilenameDelimiters(videoInfo.Name, videoFlagDelimiters);
-
-            var result = new List<VideoFileInfo>();
-            for (var pos = files.Count - 1; pos >= 0; pos--)
-            {
-                var current = files[pos];
-                // ignore non-extras and multi-file (can this happen?)
-                if (current.ExtraType == null || current.Files.Count > 1)
-                {
-                    continue;
-                }
-
-                var currentFile = current.Files[0];
-                var trimmedCurrentFileName = TrimFilenameDelimiters(currentFile.Name, videoFlagDelimiters);
-
-                // first check filenames
-                bool isValid = StartsWith(trimmedCurrentFileName, trimmedFileNameWithoutExtension)
-                               || (StartsWith(trimmedCurrentFileName, trimmedVideoInfoName) && currentFile.Year == videoInfo.Year);
-
-                // then by directory
-                if (!isValid)
-                {
-                    // When the extra rule type is DirectoryName we must go one level higher to get the "real" dir name
-                    var currentParentDir = currentFile.ExtraRule?.RuleType == ExtraRuleType.DirectoryName
-                        ? Path.GetDirectoryName(Path.GetDirectoryName(currentFile.Path.AsSpan()))
-                        : Path.GetDirectoryName(currentFile.Path.AsSpan());
-
-                    isValid = !currentParentDir.IsEmpty && !parentDir.IsEmpty && currentParentDir.Equals(parentDir, StringComparison.OrdinalIgnoreCase);
-                }
-
-                if (isValid)
-                {
-                    result.Add(currentFile);
-                }
-            }
-
-            return result.OrderBy(r => r.Path).ToArray();
-        }
-
-        private static ReadOnlySpan<char> TrimFilenameDelimiters(ReadOnlySpan<char> name, ReadOnlySpan<char> videoFlagDelimiters)
-        {
-            return name.IsEmpty ? name : name.TrimEnd().TrimEnd(videoFlagDelimiters).TrimEnd();
-        }
-
-        private static bool StartsWith(ReadOnlySpan<char> fileName, ReadOnlySpan<char> baseName)
-        {
-            return !baseName.IsEmpty && fileName.StartsWith(baseName, StringComparison.OrdinalIgnoreCase);
-        }
-    }
-}
diff --git a/Emby.Naming/Video/ExtraRuleResolver.cs b/Emby.Naming/Video/ExtraRuleResolver.cs
new file mode 100644
index 000000000..0970e509a
--- /dev/null
+++ b/Emby.Naming/Video/ExtraRuleResolver.cs
@@ -0,0 +1,88 @@
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+using Emby.Naming.Audio;
+using Emby.Naming.Common;
+
+namespace Emby.Naming.Video
+{
+    /// <summary>
+    /// Resolve if file is extra for video.
+    /// </summary>
+    public static class ExtraRuleResolver
+    {
+        private static readonly char[] _digits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+
+        /// <summary>
+        /// Attempts to resolve if file is extra.
+        /// </summary>
+        /// <param name="path">Path to file.</param>
+        /// <param name="namingOptions">The naming options.</param>
+        /// <returns>Returns <see cref="ExtraResult"/> object.</returns>
+        public static ExtraResult GetExtraInfo(string path, NamingOptions namingOptions)
+        {
+            var result = new ExtraResult();
+
+            for (var i = 0; i < namingOptions.VideoExtraRules.Length; i++)
+            {
+                var rule = namingOptions.VideoExtraRules[i];
+                if ((rule.MediaType == MediaType.Audio && !AudioFileParser.IsAudioFile(path, namingOptions))
+                    || (rule.MediaType == MediaType.Video && !VideoResolver.IsVideoFile(path, namingOptions)))
+                {
+                    continue;
+                }
+
+                var pathSpan = path.AsSpan();
+                if (rule.RuleType == ExtraRuleType.Filename)
+                {
+                    var filename = Path.GetFileNameWithoutExtension(pathSpan);
+
+                    if (filename.Equals(rule.Token, StringComparison.OrdinalIgnoreCase))
+                    {
+                        result.ExtraType = rule.ExtraType;
+                        result.Rule = rule;
+                    }
+                }
+                else if (rule.RuleType == ExtraRuleType.Suffix)
+                {
+                    // Trim the digits from the end of the filename so we can recognize things like -trailer2
+                    var filename = Path.GetFileNameWithoutExtension(pathSpan).TrimEnd(_digits);
+
+                    if (filename.EndsWith(rule.Token, StringComparison.OrdinalIgnoreCase))
+                    {
+                        result.ExtraType = rule.ExtraType;
+                        result.Rule = rule;
+                    }
+                }
+                else if (rule.RuleType == ExtraRuleType.Regex)
+                {
+                    var filename = Path.GetFileName(path);
+
+                    var isMatch = Regex.IsMatch(filename, rule.Token, RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+                    if (isMatch)
+                    {
+                        result.ExtraType = rule.ExtraType;
+                        result.Rule = rule;
+                    }
+                }
+                else if (rule.RuleType == ExtraRuleType.DirectoryName)
+                {
+                    var directoryName = Path.GetFileName(Path.GetDirectoryName(pathSpan));
+                    if (directoryName.Equals(rule.Token, StringComparison.OrdinalIgnoreCase))
+                    {
+                        result.ExtraType = rule.ExtraType;
+                        result.Rule = rule;
+                    }
+                }
+
+                if (result.ExtraType != null)
+                {
+                    return result;
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Emby.Naming/Video/VideoListResolver.cs b/Emby.Naming/Video/VideoListResolver.cs
index 4fc849256..11f82525f 100644
--- a/Emby.Naming/Video/VideoListResolver.cs
+++ b/Emby.Naming/Video/VideoListResolver.cs
@@ -42,11 +42,14 @@ namespace Emby.Naming.Video
                     continue;
                 }
 
-                remainingFiles.Add(current);
                 if (current.ExtraType == null)
                 {
                     standaloneMedia.Add(current);
                 }
+                else
+                {
+                    remainingFiles.Add(current);
+                }
             }
 
             var list = new List<VideoInfo>();
@@ -69,8 +72,6 @@ namespace Emby.Naming.Video
                 var info = new VideoInfo(media.Name) { Files = new[] { media } };
 
                 info.Year = info.Files[0].Year;
-
-                remainingFiles.Remove(media);
                 list.Add(info);
             }
 
diff --git a/Emby.Naming/Video/VideoResolver.cs b/Emby.Naming/Video/VideoResolver.cs
index 9cadc1465..de8e177d8 100644
--- a/Emby.Naming/Video/VideoResolver.cs
+++ b/Emby.Naming/Video/VideoResolver.cs
@@ -75,7 +75,7 @@ namespace Emby.Naming.Video
 
             var format3DResult = Format3DParser.Parse(path, namingOptions);
 
-            var extraResult = ExtraResolver.GetExtraInfo(path, namingOptions);
+            var extraResult = ExtraRuleResolver.GetExtraInfo(path, namingOptions);
 
             var name = Path.GetFileNameWithoutExtension(path);
 
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 270264dba..694501d38 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -13,7 +13,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Emby.Naming.Common;
 using Emby.Naming.TV;
-using Emby.Naming.Video;
+using Emby.Server.Implementations.Library.Resolvers;
 using Emby.Server.Implementations.Library.Validators;
 using Emby.Server.Implementations.Playlists;
 using Emby.Server.Implementations.ScheduledTasks;
@@ -78,6 +78,7 @@ namespace Emby.Server.Implementations.Library
         private readonly IItemRepository _itemRepository;
         private readonly IImageProcessor _imageProcessor;
         private readonly NamingOptions _namingOptions;
+        private readonly ExtraResolver _extraResolver;
 
         /// <summary>
         /// The _root folder sync lock.
@@ -146,6 +147,8 @@ namespace Emby.Server.Implementations.Library
             _memoryCache = memoryCache;
             _namingOptions = namingOptions;
 
+            _extraResolver = new ExtraResolver(namingOptions);
+
             _configurationManager.ConfigurationUpdated += ConfigurationUpdated;
 
             RecordConfigurationValues(configurationManager.Configuration);
@@ -2692,8 +2695,6 @@ namespace Emby.Server.Implementations.Library
             }
 
             var count = fileSystemChildren.Count;
-            var files = new List<VideoFileInfo>();
-            var nonVideoFiles = new List<FileSystemMetadata>();
             for (var i = 0; i < count; i++)
             {
                 var current = fileSystemChildren[i];
@@ -2702,85 +2703,47 @@ namespace Emby.Server.Implementations.Library
                     var filesInSubFolder = _fileSystem.GetFiles(current.FullName, _namingOptions.VideoFileExtensions, false, false);
                     foreach (var file in filesInSubFolder)
                     {
-                        var videoInfo = VideoResolver.Resolve(file.FullName, file.IsDirectory, _namingOptions);
-                        if (videoInfo == null)
+                        if (!_extraResolver.TryGetExtraTypeForOwner(file.FullName, ownerVideoInfo, out var extraType))
                         {
-                            nonVideoFiles.Add(file);
                             continue;
                         }
 
-                        files.Add(videoInfo);
+                        var extra = GetExtra(file, extraType.Value);
+                        if (extra != null)
+                        {
+                            yield return extra;
+                        }
                     }
                 }
-                else if (!current.IsDirectory)
+                else if (!current.IsDirectory && _extraResolver.TryGetExtraTypeForOwner(current.FullName, ownerVideoInfo, out var extraType))
                 {
-                    var videoInfo = VideoResolver.Resolve(current.FullName, current.IsDirectory, _namingOptions);
-                    if (videoInfo == null)
+                    var extra = GetExtra(current, extraType.Value);
+                    if (extra != null)
                     {
-                        nonVideoFiles.Add(current);
-                        continue;
+                        yield return extra;
                     }
-
-                    files.Add(videoInfo);
                 }
             }
 
-            if (files.Count == 0)
-            {
-                yield break;
-            }
-
-            var videos = VideoListResolver.Resolve(files, _namingOptions);
-            // owner video info cannot be null as that implies it has no path
-            var extras = ExtraResolver.GetExtras(videos, ownerVideoInfo, _namingOptions.VideoFlagDelimiters);
-            for (var i = 0; i < extras.Count; i++)
+            BaseItem GetExtra(FileSystemMetadata file, ExtraType extraType)
             {
-                var currentExtra = extras[i];
-                var resolved = ResolvePath(_fileSystem.GetFileInfo(currentExtra.Path), null, directoryService);
-                if (resolved is not Video video)
-                {
-                    continue;
-                }
-
-                // Try to retrieve it from the db. If we don't find it, use the resolved version
-                if (GetItemById(resolved.Id) is Video dbItem)
+                var extra = ResolvePath(_fileSystem.GetFileInfo(file.FullName), directoryService, _extraResolver.GetResolversForExtraType(extraType));
+                if (extra is not Video && extra is not Audio)
                 {
-                    video = dbItem;
-                }
-
-                video.ExtraType = currentExtra.ExtraType;
-                video.ParentId = Guid.Empty;
-                video.OwnerId = owner.Id;
-                yield return video;
-            }
-
-            // TODO: theme songs must be handled "manually" (but should we?) since they aren't video files
-            for (var i = 0; i < nonVideoFiles.Count; i++)
-            {
-                var current = nonVideoFiles[i];
-                var extraInfo = ExtraResolver.GetExtraInfo(current.FullName, _namingOptions);
-                if (extraInfo.ExtraType != ExtraType.ThemeSong)
-                {
-                    continue;
-                }
-
-                var resolved = ResolvePath(current, null, directoryService);
-                if (resolved is not Audio themeSong)
-                {
-                    continue;
+                    return null;
                 }
 
                 // Try to retrieve it from the db. If we don't find it, use the resolved version
-                if (GetItemById(themeSong.Id) is Audio dbItem)
+                var itemById = GetItemById(extra.Id);
+                if (itemById != null)
                 {
-                    themeSong = dbItem;
+                    extra = itemById;
                 }
 
-                themeSong.ExtraType = ExtraType.ThemeSong;
-                themeSong.OwnerId = owner.Id;
-                themeSong.ParentId = Guid.Empty;
-
-                yield return themeSong;
+                extra.ExtraType = extraType;
+                extra.ParentId = Guid.Empty;
+                extra.OwnerId = owner.Id;
+                return extra;
             }
         }
 
diff --git a/Emby.Server.Implementations/Library/Resolvers/ExtraResolver.cs b/Emby.Server.Implementations/Library/Resolvers/ExtraResolver.cs
new file mode 100644
index 000000000..3d06ceb5e
--- /dev/null
+++ b/Emby.Server.Implementations/Library/Resolvers/ExtraResolver.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using Emby.Naming.Common;
+using Emby.Naming.Video;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Resolvers;
+using MediaBrowser.Model.Entities;
+using static Emby.Naming.Video.ExtraRuleResolver;
+
+namespace Emby.Server.Implementations.Library.Resolvers
+{
+    /// <summary>
+    /// Resolves a Path into a Video or Video subclass.
+    /// </summary>
+    internal class ExtraResolver
+    {
+        private readonly NamingOptions _namingOptions;
+        private readonly IItemResolver[] _trailerResolvers;
+        private readonly IItemResolver[] _videoResolvers;
+
+        /// <summary>
+        /// Initializes an new instance of the <see cref="ExtraResolver"/> class.
+        /// </summary>
+        /// <param name="namingOptions">An instance of <see cref="NamingOptions"/>.</param>
+        public ExtraResolver(NamingOptions namingOptions)
+        {
+            _namingOptions = namingOptions;
+            _trailerResolvers = new IItemResolver[] { new GenericVideoResolver<Trailer>(namingOptions) };
+            _videoResolvers = new IItemResolver[] { new GenericVideoResolver<Video>(namingOptions) };
+        }
+
+        /// <summary>
+        /// Gets the resolvers for the extra type.
+        /// </summary>
+        /// <param name="extraType">The extra type.</param>
+        /// <returns>The resolvers for the extra type.</returns>
+        public IItemResolver[]? GetResolversForExtraType(ExtraType extraType) => extraType switch
+        {
+            ExtraType.Trailer => _trailerResolvers,
+            // For audio we'll have to rely on the AudioResolver, which is a "built-in"
+            ExtraType.ThemeSong => null,
+            _ => _videoResolvers
+        };
+
+        public bool TryGetExtraTypeForOwner(string path, VideoFileInfo ownerVideoFileInfo, [NotNullWhen(true)] out ExtraType? extraType)
+        {
+            var extraResult = GetExtraInfo(path, _namingOptions);
+            if (extraResult.ExtraType == null)
+            {
+                extraType = null;
+                return false;
+            }
+
+            var cleanDateTimeResult = CleanDateTimeParser.Clean(Path.GetFileNameWithoutExtension(path), _namingOptions.CleanDateTimeRegexes);
+            var name = cleanDateTimeResult.Name;
+            var year = cleanDateTimeResult.Year;
+
+            var parentDir = ownerVideoFileInfo.IsDirectory ? ownerVideoFileInfo.Path : Path.GetDirectoryName(ownerVideoFileInfo.Path.AsSpan());
+
+            var trimmedFileNameWithoutExtension = TrimFilenameDelimiters(ownerVideoFileInfo.FileNameWithoutExtension, _namingOptions.VideoFlagDelimiters);
+            var trimmedVideoInfoName = TrimFilenameDelimiters(ownerVideoFileInfo.Name, _namingOptions.VideoFlagDelimiters);
+            var trimmedExtraFileName = TrimFilenameDelimiters(name, _namingOptions.VideoFlagDelimiters);
+
+            // first check filenames
+            bool isValid = StartsWith(trimmedExtraFileName, trimmedFileNameWithoutExtension)
+                           || (StartsWith(trimmedExtraFileName, trimmedVideoInfoName) && year == ownerVideoFileInfo.Year);
+
+            if (!isValid)
+            {
+                // When the extra rule type is DirectoryName we must go one level higher to get the "real" dir name
+                var currentParentDir = extraResult.Rule?.RuleType == ExtraRuleType.DirectoryName
+                    ? Path.GetDirectoryName(Path.GetDirectoryName(path.AsSpan()))
+                    : Path.GetDirectoryName(path.AsSpan());
+
+                isValid = !currentParentDir.IsEmpty && !parentDir.IsEmpty && currentParentDir.Equals(parentDir, StringComparison.OrdinalIgnoreCase);
+            }
+
+            extraType = extraResult.ExtraType;
+            return isValid;
+        }
+
+        private static ReadOnlySpan<char> TrimFilenameDelimiters(ReadOnlySpan<char> name, ReadOnlySpan<char> videoFlagDelimiters)
+        {
+            return name.IsEmpty ? name : name.TrimEnd().TrimEnd(videoFlagDelimiters).TrimEnd();
+        }
+
+        private static bool StartsWith(ReadOnlySpan<char> fileName, ReadOnlySpan<char> baseName)
+        {
+            return !baseName.IsEmpty && fileName.StartsWith(baseName, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/Library/Resolvers/GenericVideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/GenericVideoResolver.cs
new file mode 100644
index 000000000..27d781148
--- /dev/null
+++ b/Emby.Server.Implementations/Library/Resolvers/GenericVideoResolver.cs
@@ -0,0 +1,18 @@
+#nullable disable
+
+#pragma warning disable CS1591
+
+using Emby.Naming.Common;
+using MediaBrowser.Controller.Entities;
+
+namespace Emby.Server.Implementations.Library.Resolvers
+{
+    public class GenericVideoResolver<T> : BaseVideoResolver<T>
+        where T : Video, new()
+    {
+        public GenericVideoResolver(NamingOptions namingOptions)
+            : base(namingOptions)
+        {
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/Library/Resolvers/VideoExtraResolver.cs b/Emby.Server.Implementations/Library/Resolvers/VideoExtraResolver.cs
deleted file mode 100644
index 9aadce88c..000000000
--- a/Emby.Server.Implementations/Library/Resolvers/VideoExtraResolver.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-#nullable disable
-
-using Emby.Naming.Common;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Resolvers;
-using MediaBrowser.Model.Entities;
-
-namespace Emby.Server.Implementations.Library.Resolvers
-{
-    /// <summary>
-    /// Resolves a Path into a Video or Video subclass.
-    /// </summary>
-    public class VideoExtraResolver : BaseVideoResolver<Video>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VideoExtraResolver"/> class.
-        /// </summary>
-        /// <param name="namingOptions">The naming options.</param>
-        public VideoExtraResolver(NamingOptions namingOptions)
-            : base(namingOptions)
-        {
-        }
-
-        /// <summary>
-        /// Gets the priority.
-        /// </summary>
-        /// <value>The priority.</value>
-        public override ResolverPriority Priority => ResolverPriority.Last;
-
-        /// <summary>
-        /// Resolves the specified args.
-        /// </summary>
-        /// <param name="args">The args.</param>
-        /// <returns>The video extra or null if not handled by this resolver.</returns>
-        public override Video Resolve(ItemResolveArgs args)
-        {
-            // Only handle owned items
-            if (args.Parent != null)
-            {
-                return null;
-            }
-
-            var ownedItem = base.Resolve(args);
-
-            // Re-resolve items that have their own type
-            if (ownedItem.ExtraType == ExtraType.Trailer)
-            {
-                ownedItem = ResolveVideo<Trailer>(args, false);
-            }
-
-            return ownedItem;
-        }
-    }
-}
diff --git a/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs b/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs
index 24f9bf98d..731580e0c 100644
--- a/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/ExtraTests.cs
@@ -82,7 +82,7 @@ namespace Jellyfin.Naming.Tests.Video
 
         private void Test(string input, ExtraType? expectedType)
         {
-            var extraType = ExtraResolver.GetExtraInfo(input, _videoOptions).ExtraType;
+            var extraType = ExtraRuleResolver.GetExtraInfo(input, _videoOptions).ExtraType;
 
             Assert.Equal(expectedType, extraType);
         }
@@ -92,7 +92,7 @@ namespace Jellyfin.Naming.Tests.Video
         {
             var rule = new ExtraRule(ExtraType.Unknown, ExtraRuleType.Regex, @"([eE]x(tra)?\.\w+)", MediaType.Video);
             var options = new NamingOptions { VideoExtraRules = new[] { rule } };
-            var res = ExtraResolver.GetExtraInfo("extra.mp4", options);
+            var res = ExtraRuleResolver.GetExtraInfo("extra.mp4", options);
 
             Assert.Equal(rule, res.Rule);
         }
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
index 3ce29f28c..5be111ad9 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
@@ -1,16 +1,18 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using AutoFixture;
 using AutoFixture.AutoMoq;
 using Emby.Naming.Common;
-using Emby.Server.Implementations.Library.Resolvers;
 using Emby.Server.Implementations.Library.Resolvers.Audio;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Controller.Sorting;
@@ -32,11 +34,13 @@ 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);
         _fileSystemMock = fixture.Freeze<Mock<IFileSystem>>();
         _fileSystemMock.Setup(f => f.GetFileInfo(It.IsAny<string>())).Returns<string>(path => new FileSystemMetadata { FullName = path });
         _libraryManager = fixture.Build<Emby.Server.Implementations.Library.LibraryManager>().Do(s => s.AddParts(
                 fixture.Create<IEnumerable<IResolverIgnoreRule>>(),
-                new List<IItemResolver> { new VideoExtraResolver(fixture.Create<NamingOptions>()), new AudioResolver(fixture.Create<NamingOptions>()) },
+                new List<IItemResolver> { new AudioResolver(fixture.Create<NamingOptions>()) },
                 fixture.Create<IEnumerable<IIntroProvider>>(),
                 fixture.Create<IEnumerable<IBaseItemComparer>>(),
                 fixture.Create<IEnumerable<ILibraryPostScanTask>>()))
@@ -153,7 +157,9 @@ public class FindExtrasTests
         Assert.Equal(ExtraType.BehindTheScenes, extras[2].ExtraType);
         Assert.Equal(ExtraType.Sample, extras[3].ExtraType);
         Assert.Equal(ExtraType.ThemeSong, extras[4].ExtraType);
+        Assert.Equal(typeof(Audio), extras[4].GetType());
         Assert.Equal(ExtraType.ThemeSong, extras[5].ExtraType);
+        Assert.Equal(typeof(Audio), extras[5].GetType());
     }
 
     [Fact]
-- 
cgit v1.2.3


From 58b9e5af79be32fdc5c7ca1c5542206fdea85257 Mon Sep 17 00:00:00 2001
From: Claus Vium <cvium@users.noreply.github.com>
Date: Sat, 1 Jan 2022 14:52:54 +0100
Subject: Update
 Emby.Server.Implementations/Library/Resolvers/GenericVideoResolver.cs

Co-authored-by: Joe Rogers <1337joe@users.noreply.github.com>
---
 .../Library/Resolvers/GenericVideoResolver.cs                  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Emby.Server.Implementations/Library/Resolvers/GenericVideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/GenericVideoResolver.cs
index 27d781148..9b6838660 100644
--- a/Emby.Server.Implementations/Library/Resolvers/GenericVideoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/GenericVideoResolver.cs
@@ -1,15 +1,21 @@
 #nullable disable
 
-#pragma warning disable CS1591
-
 using Emby.Naming.Common;
 using MediaBrowser.Controller.Entities;
 
 namespace Emby.Server.Implementations.Library.Resolvers
 {
+    /// <summary>
+    /// Resolves a Path into a Video or Video subclass.
+    /// </summary>
+    /// <typeparam name="T">The type of item to resolve.</typeparam>
     public class GenericVideoResolver<T> : BaseVideoResolver<T>
         where T : Video, new()
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GenericVideoResolver"/> class.
+        /// </summary>
+        /// <param name="namingOptions">The naming options.</param>
         public GenericVideoResolver(NamingOptions namingOptions)
             : base(namingOptions)
         {
-- 
cgit v1.2.3


From 28c2ac9cc0c2c7d9ed6e38b8de83755899e210f5 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Sat, 1 Jan 2022 20:07:03 +0100
Subject: Remove file extension filter and fix build

---
 .../Library/LibraryManager.cs                      |  2 +-
 .../Library/Resolvers/GenericVideoResolver.cs      |  4 +-
 .../Library/LibraryManager/FindExtrasTests.cs      | 49 ++++++++++++++++++++--
 3 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 694501d38..855fcc813 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2700,7 +2700,7 @@ namespace Emby.Server.Implementations.Library
                 var current = fileSystemChildren[i];
                 if (current.IsDirectory && _namingOptions.AllExtrasTypesFolderNames.ContainsKey(current.Name))
                 {
-                    var filesInSubFolder = _fileSystem.GetFiles(current.FullName, _namingOptions.VideoFileExtensions, false, false);
+                    var filesInSubFolder = _fileSystem.GetFiles(current.FullName, null, false, false);
                     foreach (var file in filesInSubFolder)
                     {
                         if (!_extraResolver.TryGetExtraTypeForOwner(file.FullName, ownerVideoInfo, out var extraType))
diff --git a/Emby.Server.Implementations/Library/Resolvers/GenericVideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/GenericVideoResolver.cs
index 9b6838660..b8554bd51 100644
--- a/Emby.Server.Implementations/Library/Resolvers/GenericVideoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/GenericVideoResolver.cs
@@ -6,14 +6,14 @@ using MediaBrowser.Controller.Entities;
 namespace Emby.Server.Implementations.Library.Resolvers
 {
     /// <summary>
-    /// Resolves a Path into a Video or Video subclass.
+    /// Resolves a Path into an instance of the <see cref="Video"/> class.
     /// </summary>
     /// <typeparam name="T">The type of item to resolve.</typeparam>
     public class GenericVideoResolver<T> : BaseVideoResolver<T>
         where T : Video, new()
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="GenericVideoResolver"/> class.
+        /// Initializes a new instance of the <see cref="GenericVideoResolver{T}"/> class.
         /// </summary>
         /// <param name="namingOptions">The naming options.</param>
         public GenericVideoResolver(NamingOptions namingOptions)
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
index 5be111ad9..de4421320 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
@@ -108,7 +108,7 @@ public class FindExtrasTests
                     Name = "some trailer.mkv",
                     IsDirectory = false
                 }
-            });
+            }).Verifiable();
 
         _fileSystemMock.Setup(f => f.GetFiles(
                 "/movies/Up/behind the scenes",
@@ -123,7 +123,7 @@ public class FindExtrasTests
                     Name = "the making of Up.mkv",
                     IsDirectory = false
                 }
-            });
+            }).Verifiable();
 
         _fileSystemMock.Setup(f => f.GetFiles(
                 "/movies/Up/theme-music",
@@ -138,17 +138,18 @@ public class FindExtrasTests
                     Name = "theme2.mp3",
                     IsDirectory = false
                 }
-            });
+            }).Verifiable();
 
         var files = paths.Select(p => new FileSystemMetadata
         {
             FullName = p,
             Name = Path.GetFileName(p),
-            IsDirectory = string.IsNullOrEmpty(Path.GetExtension(p))
+            IsDirectory = !Path.HasExtension(p)
         }).ToList();
 
         var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object)).OrderBy(e => e.ExtraType).ToList();
 
+        _fileSystemMock.Verify();
         Assert.Equal(6, extras.Count);
         Assert.Equal(ExtraType.Trailer, extras[0].ExtraType);
         Assert.Equal(typeof(Trailer), extras[0].GetType());
@@ -215,6 +216,46 @@ public class FindExtrasTests
         Assert.Equal("/movies/Up/trailer.mkv", extras[0].Path);
     }
 
+    [Fact]
+    public void FindExtras_WrongExtensions_FindsNoExtras()
+    {
+        var owner = new Movie { Name = "Up", Path = "/movies/Up/Up.mkv" };
+        var paths = new List<string>
+        {
+            "/movies/Up/Up.mkv",
+            "/movies/Up/trailer.noext",
+            "/movies/Up/theme.png",
+            "/movies/Up/trailers"
+        };
+
+        var files = paths.Select(p => new FileSystemMetadata
+        {
+            FullName = p,
+            Name = Path.GetFileName(p),
+            IsDirectory = !Path.HasExtension(p)
+        }).ToList();
+
+        _fileSystemMock.Setup(f => f.GetFiles(
+                "/movies/Up/trailers",
+                It.IsAny<string[]>(),
+                false,
+                false))
+            .Returns(new List<FileSystemMetadata>
+            {
+                new()
+                {
+                    FullName = "/movies/Up/trailers/trailer.jpg",
+                    Name = "trailer.jpg",
+                    IsDirectory = false
+                }
+            }).Verifiable();
+
+        var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object)).OrderBy(e => e.ExtraType).ToList();
+
+        _fileSystemMock.Verify();
+        Assert.Empty(extras);
+    }
+
     [Fact]
     public void FindExtras_SeriesWithTrailers_FindsCorrectExtras()
     {
-- 
cgit v1.2.3