alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 23:58:57 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #13536 from tkloy24/13250-Extras-Delete-Whole-Folder
Some checks are pending
CodeQL / Analyze (csharp) (push) Waiting to run
Details
OpenAPI / OpenAPI - HEAD (push) Waiting to run
Details
OpenAPI / OpenAPI - BASE (push) Waiting to run
Details
OpenAPI / OpenAPI - Difference (push) Blocked by required conditions
Details
OpenAPI / OpenAPI - Publish Unstable Spec (push) Blocked by required conditions
Details
OpenAPI / OpenAPI - Publish Stable Spec (push) Blocked by required conditions
Details
Tests / run-tests (macos-latest) (push) Waiting to run
Details
Tests / run-tests (ubuntu-latest) (push) Waiting to run
Details
Tests / run-tests (windows-latest) (push) Waiting to run
Details
Project Automation / Project board (push) Waiting to run
Details
Merge Conflict Labeler / Labeling (push) Waiting to run
Details

Browse Source 
Fix IsInMixedFolder not being set for Extras
This commit is contained in:
Bond-009
2025-04-26 12:07:45 +02:00
committed by GitHub
parent 8f1ebfc4cd 7717d2e261
commit f35b8dd33d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@@ -2739,14 +2739,18 @@ namespace Emby.Server.Implementations.Library
if (current.IsDirectory && _namingOptions.AllExtrasTypesFolderNames.ContainsKey(current.Name))
{
var filesInSubFolder = _fileSystem.GetFiles(current.FullName, null, false, false);
foreach (var file in filesInSubFolder)
var filesInSubFolderList = filesInSubFolder.ToList();
bool subFolderIsMixedFolder = filesInSubFolderList.Count > 1;
foreach (var file in filesInSubFolderList)
{
if (!_extraResolver.TryGetExtraTypeForOwner(file.FullName, ownerVideoInfo, out var extraType))
{
continue;
}
var extra = GetExtra(file, extraType.Value);
var extra = GetExtra(file, extraType.Value, subFolderIsMixedFolder);
if (extra is not null)
{
yield return extra;
@@ -2755,7 +2759,7 @@ namespace Emby.Server.Implementations.Library
}
else if (!current.IsDirectory && _extraResolver.TryGetExtraTypeForOwner(current.FullName, ownerVideoInfo, out var extraType))
{
var extra = GetExtra(current, extraType.Value);
var extra = GetExtra(current, extraType.Value, false);
if (extra is not null)
{
yield return extra;
@@ -2763,7 +2767,7 @@ namespace Emby.Server.Implementations.Library
}
}
BaseItem? GetExtra(FileSystemMetadata file, ExtraType extraType)
BaseItem? GetExtra(FileSystemMetadata file, ExtraType extraType, bool isInMixedFolder)
{
var extra = ResolvePath(_fileSystem.GetFileInfo(file.FullName), directoryService, _extraResolver.GetResolversForExtraType(extraType));
if (extra is not Video && extra is not Audio)
@@ -2786,6 +2790,7 @@ namespace Emby.Server.Implementations.Library
extra.ParentId = Guid.Empty;
extra.OwnerId = owner.Id;
extra.IsInMixedFolder = isInMixedFolder;
return extra;
}
}