alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 01:54:42 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix: skip library folders that are inaccessible or empty (#9291)

Browse Source
This commit is contained in:
Claus Vium
2024-03-18 16:09:00 +01:00
committed by GitHub
parent 7c141b9709
commit 239727e896
4 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
MediaBrowser.Controller/Entities/Folder.cs
View File

@@ -331,8 +331,25 @@ namespace MediaBrowser.Controller.Entities
}
}
private static bool IsLibraryFolderAccessible(IDirectoryService directoryService, BaseItem item)
{
// For top parents i.e. Library folders, skip the validation if it's empty or inaccessible
if (item.IsTopParent && !directoryService.IsAccessible(item.ContainingFolderPath))
{
Logger.LogWarning("Library folder {LibraryFolderPath} is inaccessible or empty, skipping", item.ContainingFolderPath);
return false;
}
return true;
}
private async Task ValidateChildrenInternal2(IProgress<double> progress, bool recursive, bool refreshChildMetadata, MetadataRefreshOptions refreshOptions, IDirectoryService directoryService, CancellationToken cancellationToken)
{
if (!IsLibraryFolderAccessible(directoryService, this))
{
return;
}
cancellationToken.ThrowIfCancellationRequested();
var validChildren = new List<BaseItem>();
@@ -369,6 +386,11 @@ namespace MediaBrowser.Controller.Entities
foreach (var child in nonCachedChildren)
{
if (!IsLibraryFolderAccessible(directoryService, child))
{
continue;
}
if (currentChildren.TryGetValue(child.Id, out BaseItem currentChild))
{
validChildren.Add(currentChild);
@@ -392,8 +414,8 @@ namespace MediaBrowser.Controller.Entities
validChildren.Add(child);
}
// If any items were added or removed....
if (newItems.Count > 0 || currentChildren.Count != validChildren.Count)
// If it's an AggregateFolder, don't remove
if (!IsRoot && currentChildren.Count != validChildren.Count)
{
// That's all the new and changed ones - now see if there are any that are missing
var itemsRemoved = currentChildren.Values.Except(validChildren).ToList();
@@ -408,7 +430,10 @@ namespace MediaBrowser.Controller.Entities
LibraryManager.DeleteItem(item, new DeleteOptions { DeleteFileLocation = false }, this, false);
}
}
}
if (newItems.Count > 0)
{
LibraryManager.CreateItems(newItems, this, cancellationToken);
}
}