Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-03 13:44:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: mark UserRoot as non-root when performing removal

Browse Source 
Fixes #11269

Signed-off-by: gnattu <gnattuoc@me.com>
This commit is contained in:
gnattu 2024-04-13 14:48:40 +08:00
parent c566ccb63b
commit 204146a3a5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1033,7 +1033,7 @@ namespace Emby.Server.Implementations.Library
} }
} }
private async Task ValidateTopLibraryFolders(CancellationToken cancellationToken) private async Task ValidateTopLibraryFolders(CancellationToken cancellationToken, bool removeRoot = false)
{ {
await RootFolder.RefreshMetadata(cancellationToken).ConfigureAwait(false); await RootFolder.RefreshMetadata(cancellationToken).ConfigureAwait(false);
@ -1046,11 +1046,15 @@ namespace Emby.Server.Implementations.Library
await GetUserRootFolder().RefreshMetadata(cancellationToken).ConfigureAwait(false); await GetUserRootFolder().RefreshMetadata(cancellationToken).ConfigureAwait(false);
// HACK: override IsRootHere for libraries to be removed
if (removeRoot) GetUserRootFolder().IsRoot = false;
await GetUserRootFolder().ValidateChildren( await GetUserRootFolder().ValidateChildren(
new Progress<double>(), new Progress<double>(),
new MetadataRefreshOptions(new DirectoryService(_fileSystem)), new MetadataRefreshOptions(new DirectoryService(_fileSystem)),
recursive: false, recursive: false,
cancellationToken).ConfigureAwait(false); cancellationToken).ConfigureAwait(false);
// HACK: restore IsRoot here after validation
if (removeRoot) GetUserRootFolder().IsRoot = true;
// Quickly scan CollectionFolders for changes // Quickly scan CollectionFolders for changes
foreach (var folder in GetUserRootFolder().Children.OfType<Folder>()) foreach (var folder in GetUserRootFolder().Children.OfType<Folder>())
@ -3118,7 +3122,7 @@ namespace Emby.Server.Implementations.Library
if (refreshLibrary) if (refreshLibrary)
{ {
await ValidateTopLibraryFolders(CancellationToken.None).ConfigureAwait(false); await ValidateTopLibraryFolders(CancellationToken.None, true).ConfigureAwait(false);
StartScanInBackground(); StartScanInBackground();
} }