From 497dc4fd5dbd0280a54f1b417c8af02ebf6563a2 Mon Sep 17 00:00:00 2001
From: Anatosun <33899455+anatosun@users.noreply.github.com>
Date: Sun, 28 Dec 2025 09:48:47 +0100
Subject: [PATCH] Plex Connect: Fix Plex Connect timeline reporting (#2876)

Fix Plex Connect timeline reporting

Use queue.corrected_elapsed_time instead of player.corrected_elapsed_time
to accurately track current track position. This fixes issues where:
- Timeline reported incorrect elapsed time when playing multiple tracks
- Huge time values were sent after track transitions
- Step forward/back commands used wrong elapsed time reference

The queue tracks per-track elapsed time while player tracks total session time.
---
 .../providers/plex_connect/player_remote.py   | 49 +++++++------------
 1 file changed, 17 insertions(+), 32 deletions(-)

diff --git a/music_assistant/providers/plex_connect/player_remote.py b/music_assistant/providers/plex_connect/player_remote.py
index a775a0d0..9d8269f4 100644
--- a/music_assistant/providers/plex_connect/player_remote.py
+++ b/music_assistant/providers/plex_connect/player_remote.py
@@ -1014,18 +1014,15 @@ class PlexRemoteControlServer:
         self._updating_from_plex = True
         try:
             if self._ma_player_id:
-                # Step forward 30 seconds
-                player = self.provider.mass.players.get(self._ma_player_id)
                 queue = self.provider.mass.player_queues.get(self._ma_player_id)
-                if player and player.corrected_elapsed_time is not None:
-                    max_duration = player.corrected_elapsed_time + 30
-                    if queue and queue.current_item and queue.current_item.media_item:
-                        max_duration = min(
-                            player.corrected_elapsed_time + 30,
-                            queue.current_item.media_item.duration
-                            or (player.corrected_elapsed_time + 30),
-                        )
-                    await self.provider.mass.players.cmd_seek(self._ma_player_id, int(max_duration))
+                if queue:
+                    # Step forward 30 seconds
+                    new_position = queue.corrected_elapsed_time + 30
+                    if queue.current_item and queue.current_item.media_item:
+                        # Don't seek past the track duration
+                        max_duration = queue.current_item.media_item.duration or new_position
+                        new_position = min(new_position, max_duration)
+                    await self.provider.mass.players.cmd_seek(self._ma_player_id, int(new_position))
                     # Wait briefly for player state to update
                     await asyncio.sleep(0.1)
             await self._broadcast_timeline()
@@ -1038,10 +1035,10 @@ class PlexRemoteControlServer:
         self._updating_from_plex = True
         try:
             if self._ma_player_id:
-                # Step back 10 seconds
-                player = self.provider.mass.players.get(self._ma_player_id)
-                if player and player.corrected_elapsed_time is not None:
-                    new_position = max(0, player.corrected_elapsed_time - 10)
+                queue = self.provider.mass.player_queues.get(self._ma_player_id)
+                if queue:
+                    # Step back 10 seconds
+                    new_position = max(0, queue.corrected_elapsed_time - 10)
                     await self.provider.mass.players.cmd_seek(self._ma_player_id, int(new_position))
                     # Wait briefly for player state to update
                     await asyncio.sleep(0.1)
@@ -1389,11 +1386,7 @@ class PlexRemoteControlServer:
             duration = round(track.duration * 1000) if track.duration else 0
 
             # Current playback time in milliseconds
-            time = (
-                round(player.corrected_elapsed_time * 1000)
-                if player and player.corrected_elapsed_time is not None
-                else 0
-            )
+            time = round(queue.corrected_elapsed_time * 1000)
 
             # Build timeline attributes
             attrs = self._build_timeline_attributes(
@@ -1409,12 +1402,8 @@ class PlexRemoteControlServer:
                     f'shuffle="{shuffle}" repeat="{repeat}" controllable="{controllable}"/>'
                 )
         else:
-            # No current track - use actual state
-            time = (
-                round(player.corrected_elapsed_time * 1000)
-                if player and player.corrected_elapsed_time is not None
-                else 0
-            )
+            # No current track - send stopped state with time=0
+            time = 0
             music_timeline = (
                 f'<Timeline state="{state}" time="{time}" type="music" volume="{volume}" '
                 f'shuffle="{shuffle}" repeat="{repeat}" controllable="{controllable}"/>'
@@ -1672,12 +1661,8 @@ class PlexRemoteControlServer:
             else:
                 plex_state = "stopped"
 
-            # Get position in milliseconds
-            position_ms = (
-                round(player.corrected_elapsed_time * 1000)
-                if player.corrected_elapsed_time is not None
-                else 0
-            )
+            # Get position and duration in milliseconds
+            position_ms = round(queue.corrected_elapsed_time * 1000)
             duration_ms = round(track.duration * 1000) if track.duration else 0
 
             # Get play queue info if available
-- 
2.34.1