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

1 files changed, 9 insertions, 0 deletions

diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/DescendantQueryHelper.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/DescendantQueryHelper.cs
index 88a2c684ff..bfd0fac34a 100644
--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/DescendantQueryHelper.cs
+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/DescendantQueryHelper.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using Jellyfin.Database.Implementations.Entities;
 using Jellyfin.Database.Implementations.MatchCriteria;
 
@@ -13,6 +14,14 @@ namespace Jellyfin.Database.Implementations;
 public static class DescendantQueryHelper
 {
     /// <summary>
+    /// Gets the predicate identifying items that count toward played/total aggregation:
+    /// real leaf media, i.e. neither folders nor virtual items (missing or unaired episodes).
+    /// Shared by the per-item and batched count paths so they cannot diverge.
+    /// </summary>
+    public static Expression<Func<BaseItemEntity, bool>> IsCountableLeaf { get; } =
+        b => !b.IsFolder && !b.IsVirtualItem;
+
+    /// <summary>
     /// Gets a queryable of all descendant IDs for a parent item.
     /// Traverses AncestorIds and LinkedChildren to find all descendants.
     /// </summary>