Merge pull request #7058 from cvium/the_most_important_feature

3 files changed, 6 insertions, 68 deletions

diff --git a/Emby.Naming/Video/ExtraResolver.cs b/Emby.Naming/Video/ExtraRuleResolver.cs
index fbdca859f..0970e509a 100644
--- a/Emby.Naming/Video/ExtraResolver.cs
+++ b/Emby.Naming/Video/ExtraRuleResolver.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text.RegularExpressions;
 using Emby.Naming.Audio;
 using Emby.Naming.Common;
@@ -11,7 +9,7 @@ namespace Emby.Naming.Video
     /// <summary>
     /// Resolve if file is extra for video.
     /// </summary>
-    public static class ExtraResolver
+    public static class ExtraRuleResolver
     {
         private static readonly char[] _digits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
 
@@ -86,66 +84,5 @@ namespace Emby.Naming.Video
 
             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/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);