From e6032c131cc59e9cd170c2f3002ebccb5c919ecb Mon Sep 17 00:00:00 2001
From: Tim <tymmesyde@gmail.com>
Date: Mon, 23 Dec 2024 15:18:48 +0100
Subject: [PATCH] fix(player): reset library item time offset if selected video
 don't match state

---
 src/models/player.rs | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/models/player.rs b/src/models/player.rs
index 4c87a7851..e58a792c2 100644
--- a/src/models/player.rs
+++ b/src/models/player.rs
@@ -218,6 +218,10 @@ impl<E: Env + 'static> UpdateWithCtx<E> for Player {
                     &self.meta_item,
                     &ctx.library,
                 );
+
+                let library_item_state_effects =
+                    library_item_state_update(&mut self.library_item, &self.selected);
+
                 let watched_effects =
                     watched_update(&mut self.watched, &self.meta_item, &self.library_item);
 
@@ -280,6 +284,7 @@ impl<E: Env + 'static> UpdateWithCtx<E> for Player {
                     .join(update_streams_effects)
                     .join(series_info_effects)
                     .join(library_item_effects)
+                    .join(library_item_state_effects)
                     .join(watched_effects)
                     .join(skip_gaps_effects)
                     .join(intro_outro_update_effects)
@@ -678,10 +683,15 @@ impl<E: Env + 'static> UpdateWithCtx<E> for Player {
                     &ctx.library,
                 );
 
+                let library_item_state_effects =
+                    library_item_state_update(&mut self.library_item, &self.selected);
+
                 let watched_effects =
                     watched_update(&mut self.watched, &self.meta_item, &self.library_item);
 
-                library_item_effects.join(watched_effects)
+                library_item_effects
+                    .join(library_item_state_effects)
+                    .join(watched_effects)
             }
             Msg::Internal(Internal::StreamsChanged(_)) => {
                 stream_state_update(&mut self.stream_state, &self.selected, &ctx.streams)
@@ -761,6 +771,10 @@ impl<E: Env + 'static> UpdateWithCtx<E> for Player {
                     &self.meta_item,
                     &ctx.library,
                 );
+
+                let library_item_state_effects =
+                    library_item_state_update(&mut self.library_item, &self.selected);
+
                 let watched_effects =
                     watched_update(&mut self.watched, &self.meta_item, &self.library_item);
 
@@ -803,6 +817,7 @@ impl<E: Env + 'static> UpdateWithCtx<E> for Player {
                     .join(next_stream_effects)
                     .join(series_info_effects)
                     .join(library_item_effects)
+                    .join(library_item_state_effects)
                     .join(watched_effects)
                     .join(skip_gaps_effects)
             }
@@ -1122,6 +1137,28 @@ fn watched_update(
     eq_update(watched, next_watched)
 }
 
+fn library_item_state_update(
+    library_item: &mut Option<LibraryItem>,
+    selected: &Option<Selected>,
+) -> Effects {
+    match (library_item, selected) {
+        (Some(library_item), Some(selected)) => {
+            match (&selected.stream_request, &library_item.state.video_id) {
+                (Some(stream_request), Some(state_video_id))
+                    if stream_request.path.id != *state_video_id =>
+                {
+                    library_item.state.time_offset = 0;
+                    Effects::msg(Msg::Internal(Internal::UpdateLibraryItem(
+                        library_item.to_owned(),
+                    )))
+                }
+                _ => Effects::none().unchanged(),
+            }
+        }
+        _ => Effects::none().unchanged(),
+    }
+}
+
 fn subtitles_update<E: Env + 'static>(
     subtitles: &mut Vec<ResourceLoadable<Vec<Subtitles>>>,
     selected: &Option<Selected>,