Fix review comments

2 files changed, 18 insertions, 27 deletions

diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index c0e45ab6c7..c64833ddaa 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -451,26 +451,23 @@ namespace Emby.Server.Implementations.Library
                 }
             }
 
-            MediaSourceInfo resumeSource = null;
-            UserItemData resumeData = null;
             foreach (var source in sources)
             {
-                if (source.Id is null
-                    || !dataBySourceId.TryGetValue(source.Id, out var data)
-                    || data.PlaybackPositionTicks <= 0)
+                if (source.Id is not null
+                    && dataBySourceId.TryGetValue(source.Id, out var data)
+                    && data.PlaybackPositionTicks > 0)
                 {
-                    continue;
-                }
-
-                source.PlaybackPositionTicks = data.PlaybackPositionTicks;
-
-                if (resumeData is null || (data.LastPlayedDate ?? DateTime.MinValue) > (resumeData.LastPlayedDate ?? DateTime.MinValue))
-                {
-                    resumeSource = source;
-                    resumeData = data;
+                    source.PlaybackPositionTicks = data.PlaybackPositionTicks;
                 }
             }
 
+            // Reorder only for a resumable (in-progress) version;
+            // a completed version has no position to resume, so it must not be pulled to the front here.
+            var resumeSource = VersionPlaybackSelector.SelectMostRecentlyPlayed(
+                sources,
+                source => source.Id is not null ? dataBySourceId.GetValueOrDefault(source.Id) : null,
+                data => data.PlaybackPositionTicks > 0);
+
             if (resumeSource is not null && !video.PrimaryVersionId.HasValue && !ReferenceEquals(sources[0], resumeSource))
             {
                 var reordered = new List<MediaSourceInfo>(sources.Count) { resumeSource };
diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs
index 61372f8b56..40cd2bb69c 100644
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -329,21 +329,15 @@ namespace Emby.Server.Implementations.Library
 
             foreach (var (primaryId, versions) in versionGroups)
             {
-                UserItemData? resumeData = null;
-                foreach (var version in versions)
-                {
-                    // Consider both in-progress and completed versions so a finished alternate still marks the primary as played.
-                    if (userDataByVersion.TryGetValue(version.Id, out var data)
-                        && (data.PlaybackPositionTicks > 0 || data.Played)
-                        && (resumeData is null || (data.LastPlayedDate ?? DateTime.MinValue) > (resumeData.LastPlayedDate ?? DateTime.MinValue)))
-                    {
-                        resumeData = data;
-                    }
-                }
+                // Consider both in-progress and completed versions so a finished alternate still marks the primary as played.
+                var resumeVersion = VersionPlaybackSelector.SelectMostRecentlyPlayed(
+                    versions,
+                    version => userDataByVersion.GetValueOrDefault(version.Id),
+                    data => data.PlaybackPositionTicks > 0 || data.Played);
 
-                if (resumeData is not null)
+                if (resumeVersion is not null)
                 {
-                    result[primaryId] = new VersionResumeData(resumeData);
+                    result[primaryId] = new VersionResumeData(resumeVersion.Id, userDataByVersion[resumeVersion.Id]);
                 }
             }