The Free Software Media System - Server Backend & API
Optimize accessibility checks
Shadowghost0c46004cd921
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.csindex 3f04b1ffae..d366e0288a 100644--- a/MediaBrowser.Controller/Entities/BaseItem.cs+++ b/MediaBrowser.Controller/Entities/BaseItem.cs@@ -1350,8 +1350,27 @@ namespace MediaBrowser.Controller.Entitiesif (itemCollectionFolders.Count > 0){- var userCollectionFolders = LibraryManager.GetUserRootFolder().GetChildren(user, true).Select(i => i.Id).ToList();- if (!itemCollectionFolders.Any(userCollectionFolders.Contains))+ var blockedMediaFolders = user.GetPreferenceValues<Guid>(PreferenceKind.BlockedMediaFolders);+ IEnumerable<Guid> userCollectionFolderIds;+ if (blockedMediaFolders.Length > 0)+ {+ // User has blocked folders - get all library folders and exclude blocked ones+ userCollectionFolderIds = LibraryManager.GetUserRootFolder().Children+ .Select(i => i.Id)+ .Where(id => !blockedMediaFolders.Contains(id));+ }+ else if (user.HasPermission(PermissionKind.EnableAllFolders))+ {+ // User can access all folders - no need to filter+ return true;+ }+ else+ {+ // User has specific enabled folders+ userCollectionFolderIds = user.GetPreferenceValues<Guid>(PreferenceKind.EnabledFolders);+ }++ if (!itemCollectionFolders.Any(userCollectionFolderIds.Contains)){return false;}diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.csindex b88572a67f..e1f7d095c3 100644--- a/MediaBrowser.Controller/Entities/Folder.cs+++ b/MediaBrowser.Controller/Entities/Folder.cs@@ -1699,8 +1699,11 @@ namespace MediaBrowser.Controller.Entitiesif (SupportsPlayedStatus || (itemDto is not null && fields.ContainsField(ItemFields.RecursiveItemCount))){+ // Create a minimal query with just the user - skip ConfigureUserAccess to avoid+ // expensive GetUserViews calls. Since we're counting descendants of a specific+ // item (this folder) that the user already has access to, TopParentIds filtering+ // is redundant. The parental rating filter is applied via query.User.var query = new InternalItemsQuery(user);- LibraryManager.ConfigureUserAccess(query, user);int playedCount;int totalCount;