alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-03 23:36:38 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix IsPlayed filter and setting BoxSet played/unplayed

Browse Source
This commit is contained in:
Shadowghost
2026-02-21 19:58:00 +01:00
parent 561e78efb4
commit 0f1a6fe4c2
3 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
View File

@@ -3323,6 +3323,33 @@ public sealed class BaseItemRepository
baseQuery = baseQuery.Where(s => !playedSeriesIdList.Contains(s.Id));
}
}
else if (filter.IncludeItemTypes.Length == 1 && filter.IncludeItemTypes[0] == BaseItemKind.BoxSet)
{
var boxSetIds = baseQuery.Select(e => e.Id).ToList();
var userId = filter.User!.Id;
var playedBoxSetIds = new List<Guid>(boxSetIds.Count);
foreach (var boxSetId in boxSetIds)
{
var descendantIds = DescendantQueryHelper.GetAllDescendantIds(context, boxSetId);
var leafItems = context.BaseItems
.Where(e => descendantIds.Contains(e.Id) && !e.IsFolder && !e.IsVirtualItem);
if (leafItems.Any()
&& leafItems.All(f => f.UserData!.Any(ud => ud.UserId == userId && ud.Played)))
{
playedBoxSetIds.Add(boxSetId);
}
}
if (filter.IsPlayed.Value)
{
baseQuery = baseQuery.Where(s => playedBoxSetIds.Contains(s.Id));
}
else
{
baseQuery = baseQuery.Where(s => !playedBoxSetIds.Contains(s.Id));
}
}
else
{
var playedItemIds = context.UserData

28
MediaBrowser.Controller/Entities/Movies/BoxSet.cs
View File

@@ -194,6 +194,34 @@ namespace MediaBrowser.Controller.Entities.Movies
return true;
}
public override void MarkPlayed(User user, DateTime? datePlayed, bool resetPosition)
{
if (IsLegacyBoxSet)
{
base.MarkPlayed(user, datePlayed, resetPosition);
return;
}
foreach (var item in GetLinkedChildren(user))
{
item.MarkPlayed(user, datePlayed, resetPosition);
}
}
public override void MarkUnplayed(User user)
{
if (IsLegacyBoxSet)
{
base.MarkUnplayed(user);
return;
}
foreach (var item in GetLinkedChildren(user))
{
item.MarkUnplayed(user);
}
}
public override bool IsVisibleStandalone(User user)
{
if (IsLegacyBoxSet)

9
MediaBrowser.Controller/Entities/UserViewBuilder.cs
View File

@@ -539,6 +539,15 @@ namespace MediaBrowser.Controller.Entities
}
}
if (query.IsPlayed.HasValue)
{
userData ??= userDataManager.GetUserData(user, item);
if (item.IsPlayed(user, userData) != query.IsPlayed.Value)
{
return false;
}
}
if (query.IsLocked.HasValue)
{
var val = query.IsLocked.Value;