alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-06 14:22:55 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Coalesce alternate-version progress onto primary in resume filter

Browse Source
This commit is contained in:
Shadowghost
2026-06-09 23:23:03 +02:00
parent fe1d8d8840
commit 0874a26131
10 changed files with 525 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Emby.Server.Implementations/Library/UserDataManager.cs
View File

@@ -247,6 +247,72 @@ namespace Emby.Server.Implementations.Library
return result;
}
/// <inheritdoc />
public VersionResumeData? GetResumeUserData(User user, BaseItem item)
{
return GetResumeUserDataBatch([item], user).GetValueOrDefault(item.Id);
}
/// <inheritdoc />
public IReadOnlyDictionary<Guid, VersionResumeData> GetResumeUserDataBatch(IReadOnlyList<BaseItem> items, User user)
{
ArgumentNullException.ThrowIfNull(user);
var result = new Dictionary<Guid, VersionResumeData>();
List<(Guid PrimaryId, IReadOnlyList<Video> Versions)>? versionGroups = null;
List<BaseItem>? allVersions = null;
foreach (var item in items)
{
// Only primary items aggregate over their versions; a directly queried version keeps its own data.
if (item is not Video video
|| video.PrimaryVersionId.HasValue
|| (video.LinkedAlternateVersions.Length == 0 && !video.HasLocalAlternateVersions))
{
continue;
}
var versions = video.GetAllVersions();
if (versions.Count < 2)
{
continue;
}
(versionGroups ??= []).Add((item.Id, versions));
(allVersions ??= []).AddRange(versions);
}
if (versionGroups is null)
{
return result;
}
var userDataByVersion = GetUserDataBatch(allVersions!.DistinctBy(i => i.Id).ToList(), user);
foreach (var (primaryId, versions) in versionGroups)
{
Video? resumeVersion = null;
UserItemData? resumeData = null;
foreach (var version in versions)
{
if (userDataByVersion.TryGetValue(version.Id, out var data)
&& data.PlaybackPositionTicks > 0
&& (resumeData is null || (data.LastPlayedDate ?? DateTime.MinValue) > (resumeData.LastPlayedDate ?? DateTime.MinValue)))
{
resumeVersion = version;
resumeData = data;
}
}
if (resumeData is not null)
{
result[primaryId] = new VersionResumeData(resumeData, resumeVersion!.RunTimeTicks);
}
}
return result;
}
/// <summary>
/// Gets the internal key.
/// </summary>
@@ -281,6 +347,10 @@ namespace Emby.Server.Implementations.Library
var dto = GetUserItemDataDto(userData, item.Id);
item.FillUserDataDtoValues(dto, userData, itemDto, user, options);
// For an item with alternate versions, surface the most recently played version's resume point.
GetResumeUserData(user, item)?.ApplyTo(dto);
return dto;
}