bekucera/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-09-10 22:36:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Skip non-media folders in movie resolver

* Ignorepatterns first
This commit is contained in:
theguymadmax
2025-09-07 07:02:52 -04:00
committed by GitHub
parent e043f93a72
commit 0845b0c258
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
View File

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

2
Emby.Server.Implementations/Library/IgnorePatterns.cs
View File

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

5
Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
View File

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