Merge remote-tracking branch 'upstream/master' into fix-byname-queries

# Conflicts:
#	src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/JellyfinDbModelSnapshot.cs

MediaBrowser.Controller/Entities/Folder.cs

@@ -43,11 +43,7 @@ namespace MediaBrowser.Controller.Entities
     public class Folder : BaseItem
     {
         private IEnumerable<BaseItem> _children;
-
-        public Folder()
-        {
-            LinkedChildren = Array.Empty<LinkedChild>();
-        }
+        private LinkedChild[] _linkedChildren = [];
 
         public static IUserViewManager UserViewManager { get; set; }
 
@@ -63,7 +59,27 @@ namespace MediaBrowser.Controller.Entities
         /// Gets or sets the linked children.
         /// </summary>
         [JsonIgnore]
-        public LinkedChild[] LinkedChildren { get; set; }
+        public LinkedChild[] LinkedChildren
+        {
+            get => _linkedChildren;
+            set
+            {
+                _linkedChildren = value;
+
+                // Assigning the collection means the caller knows the complete set of links.
+                LinkedChildrenLoaded = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether <see cref="LinkedChildren"/> holds the stored set of links.
+        /// </summary>
+        /// <remarks>
+        /// An unloaded instance carries an empty array that means "unknown", not "no children" —
+        /// persisting it would delete every link the item has.
+        /// </remarks>
+        [JsonIgnore]
+        public bool LinkedChildrenLoaded { get; private set; }
 
         [JsonIgnore]
         public DateTime? DateLastMediaAdded { get; set; }

MediaBrowser.Controller/Entities/UserViewBuilder.cs

@@ -461,11 +461,12 @@ namespace MediaBrowser.Controller.Entities
                     var counts = libraryManager.GetPlayedAndTotalCountBatch(folderIds, user);
                     var isPlayedValue = query.IsPlayed.Value;
 
-                    return itemList.Where(i =>
+                    return itemList.Where(item =>
                     {
-                        if (i.IsFolder && counts.TryGetValue(i.Id, out var c))
+                        if (item is Folder)
                         {
-                            return (c.Total > 0 && c.Played == c.Total) == isPlayedValue;
+                            var itemCount = counts.GetValueOrDefault(item.Id);
+                            return (itemCount.Played >= itemCount.Total) == isPlayedValue;
                         }
 
                         return true;

MediaBrowser.Controller/Persistence/IItemQueryHelpers.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Linq.Expressions;
 using Jellyfin.Database.Implementations;
 using Jellyfin.Database.Implementations.Entities;
 using MediaBrowser.Controller.Entities;
@@ -79,17 +80,26 @@ public interface IItemQueryHelpers
         Guid ancestorId);
 
     /// <summary>
-    /// Builds an <see cref="IQueryable{Guid}"/> of folder IDs whose descendants are all played
-    /// for the given user. Composable into outer queries to avoid an extra DB roundtrip.
+    /// Builds a query for the playable leaf items a user can access.
     /// </summary>
     /// <param name="context">The database context the resulting query is bound to.</param>
-    /// <param name="folderIds">A query yielding candidate folder IDs.</param>
-    /// <param name="user">The user for access filtering and played status.</param>
-    /// <returns>An <see cref="IQueryable{Guid}"/> of fully-played folder IDs.</returns>
-    IQueryable<Guid> GetFullyPlayedFolderIdsQuery(
+    /// <param name="user">The user to filter accessible items for.</param>
+    /// <param name="includeOwnedItems">Whether to include alternate versions and owned items.</param>
+    /// <returns>The access-filtered leaf item queryable.</returns>
+    IQueryable<BaseItemEntity> GetAccessFilteredLeafItemsQuery(
         JellyfinDbContext context,
-        IQueryable<Guid> folderIds,
-        User user);
+        User user,
+        bool includeOwnedItems = false);
+
+    /// <summary>
+    /// Builds a filter matching items that have at least one of <paramref name="descendants"/> below them.
+    /// </summary>
+    /// <param name="context">The database context the resulting filter is bound to.</param>
+    /// <param name="descendants">A query yielding the descendants to look for.</param>
+    /// <returns>A filter expression matching items with a matching descendant.</returns>
+    Expression<Func<BaseItemEntity, bool>> BuildHasDescendantFilter(
+        JellyfinDbContext context,
+        IQueryable<BaseItemEntity> descendants);
 
     /// <summary>
     /// Deserializes a <see cref="BaseItemEntity"/> into a <see cref="BaseItem"/>.