From 0845b0c258166b0793ed4f4abd2fb14e3efa85f4 Mon Sep 17 00:00:00 2001
From: theguymadmax <theguymadmax@proton.me>
Date: Sun, 7 Sep 2025 07:02:52 -0400
Subject: [PATCH] Skip non-media folders in movie resolver (#14724)

* Skip non-media folders in movie resolver

* Ignorepatterns first
---
 .../Library/CoreResolutionIgnoreRule.cs                | 10 +++++-----
 Emby.Server.Implementations/Library/IgnorePatterns.cs  |  2 ++
 .../Library/Resolvers/Movies/MovieResolver.cs          |  5 +++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
index f9538fbad6..ca0744a17d 100644
--- a/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
+++ b/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;
diff --git a/Emby.Server.Implementations/Library/IgnorePatterns.cs b/Emby.Server.Implementations/Library/IgnorePatterns.cs
index 25ddade829..fe3a1ce611 100644
--- a/Emby.Server.Implementations/Library/IgnorePatterns.cs
+++ b/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",
diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index b2ceee97d8..333c8c34bf 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/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