2
0
Эх сурвалжийг харах

Skip non-media folders in movie resolver (#14724)

* Skip non-media folders in movie resolver

* Ignorepatterns first
theguymadmax 1 долоо хоног өмнө
parent
commit
0845b0c258

+ 5 - 5
Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs

@@ -37,6 +37,11 @@ namespace Emby.Server.Implementations.Library
                 return false;
             }
 
+            if (IgnorePatterns.ShouldIgnore(fileInfo.FullName))
+            {
+                return true;
+            }
+
             // Don't ignore top level folders
             if (fileInfo.IsDirectory
                 && (parent is AggregateFolder || (parent?.IsTopParent ?? false)))
@@ -44,11 +49,6 @@ namespace Emby.Server.Implementations.Library
                 return false;
             }
 
-            if (IgnorePatterns.ShouldIgnore(fileInfo.FullName))
-            {
-                return true;
-            }
-
             if (parent is null)
             {
                 return false;

+ 2 - 0
Emby.Server.Implementations/Library/IgnorePatterns.cs

@@ -48,6 +48,8 @@ namespace Emby.Server.Implementations.Library
             "**/.wd_tv",
             "**/lost+found/**",
             "**/lost+found",
+            "**/subs/**",
+            "**/subs",
 
             // Trickplay files
             "**/*.trickplay",

+ 5 - 0
Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs

@@ -405,6 +405,11 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
 
                 if (child.IsDirectory)
                 {
+                    if (NamingOptions.AllExtrasTypesFolderNames.ContainsKey(filename))
+                    {
+                        continue;
+                    }
+
                     if (IsDvdDirectory(child.FullName, filename, directoryService))
                     {
                         var movie = new T