remove Option from StreamStateChanged messages

Stremio · Nov 7, 2023 · 582d01f · 582d01f
1 parent 6c09576
commit 582d01f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/src/models/ctx/update_streams.rs b/src/models/ctx/update_streams.rs
@@ -69,7 +69,7 @@ pub fn update_streams<E: Env + 'static>(
             match steam_item {
                 Some(item) => {
                     let new_stream_item = StreamsItem {
-                        state: state.clone(),
+                        state: Some(state.to_owned()),
                         ..item
                     };
                     streams.items.insert(key, new_stream_item);

diff --git a/src/models/player.rs b/src/models/player.rs
@@ -316,7 +316,8 @@ impl<E: Env + 'static> UpdateWithCtx<E> for Player {
                 video_params_effects.join(subtitles_effects)
             }
             Msg::Action(Action::Player(ActionPlayer::StreamStateChanged { state })) => {
-                let stream_state_effects = eq_update(&mut self.stream_state, state.to_owned());
+                let stream_state_effects =
+                    eq_update(&mut self.stream_state, Some(state.to_owned()));
                 let state_changed_effects =
                     Effects::msg(Msg::Internal(Internal::StreamStateChanged {
                         state: state.to_owned(),
@@ -631,12 +632,15 @@ fn stream_state_update(
             let next_state = streams
                 .last_stream_item(video_id, meta_item)
                 .and_then(|item| item.adjusted_state(stream));
-            let state_changed_effect = Effects::msg(Msg::Internal(Internal::StreamStateChanged {
-                state: next_state.to_owned(),
-                stream_request: Some(stream_request.to_owned()),
-                meta_request: Some(meta_request.to_owned()),
-            }))
-            .unchanged();
+            let state_changed_effect = match &next_state {
+                Some(state) => Effects::msg(Msg::Internal(Internal::StreamStateChanged {
+                    state: state.clone(),
+                    stream_request: Some(stream_request.to_owned()),
+                    meta_request: Some(meta_request.to_owned()),
+                }))
+                .unchanged(),
+                None => Effects::none().unchanged(),
+            };
             eq_update(state, next_state).join(state_changed_effect)
         }
         _ => Effects::none().unchanged(),

diff --git a/src/runtime/msg/action.rs b/src/runtime/msg/action.rs
@@ -132,7 +132,7 @@ pub enum ActionPlayer {
         video_params: Option<VideoParams>,
     },
     StreamStateChanged {
-        state: Option<StreamItemState>,
+        state: StreamItemState,
     },
     TimeChanged {
         time: u64,

diff --git a/src/runtime/msg/internal.rs b/src/runtime/msg/internal.rs
@@ -61,7 +61,7 @@ pub enum Internal {
     },
     /// Dispatched when stream item's state has changed
     StreamStateChanged {
-        state: Option<StreamItemState>,
+        state: StreamItemState,
         stream_request: Option<ResourceRequest>,
         meta_request: Option<ResourceRequest>,
     },