feat(player): Allow for stopped event without track_id

Author: paulfariello

playback/src/player.rs

@@ -148,8 +148,8 @@ pub enum PlayerEvent {
     },
     // Fired when the player is stopped (e.g. by issuing a "stop" command to the player).
     Stopped {
-        play_request_id: u64,
-        track_id: SpotifyUri,
+        play_request_id: Option<u64>,
+        track_id: Option<SpotifyUri>,
     },
     // The player is delayed by loading a track.
     Loading {
@@ -273,7 +273,8 @@ impl PlayerEvent {
                 play_request_id, ..
             }
             | Stopped {
-                play_request_id, ..
+                play_request_id: Some(play_request_id),
+                ..
             }
             | PositionCorrection {
                 play_request_id, ..
@@ -1664,8 +1665,8 @@ impl PlayerInternal {
 
                 self.ensure_sink_stopped(false);
                 self.send_event(PlayerEvent::Stopped {
-                    track_id,
-                    play_request_id,
+                    track_id: Some(track_id),
+                    play_request_id: Some(play_request_id),
                 });
                 self.state = PlayerState::Stopped;
             }
@@ -2326,7 +2327,12 @@ impl PlayerInternal {
                             track_id: track_id.clone(),
                         });
                     }
-                    _ => (),
+                    PlayerState::Invalid | PlayerState::Stopped => {
+                        let _ = sender.send(PlayerEvent::Stopped {
+                            play_request_id: None,
+                            track_id: None,
+                        });
+                    }
                 }
 
                 self.event_senders.push(sender);

src/mpris_event_handler.rs

@@ -1316,9 +1316,9 @@ impl MprisTask {
                 let mut iface = iface_ref.get_mut().await;
                 let meta = &mut iface.metadata;
 
-                if meta.mpris.track_id.as_ref() != Some(&track_id) {
+                if meta.mpris.track_id.as_ref() != track_id.as_ref() {
                     *meta = Metadata::default();
-                    meta.mpris.track_id = Some(track_id);
+                    meta.mpris.track_id = track_id;
                     warn!("Missed TrackChanged event, metadata missing");
                     iface.metadata_changed(iface_ref.signal_context()).await?;
                 }

src/player_event_handler.rs

@@ -144,13 +144,18 @@ impl EventHandler {
                                     }
                                 }
                             }
-                            PlayerEvent::Stopped { track_id, .. } => match track_id.to_id() {
-                                Err(e) => warn!("PlayerEvent::Stopped: Invalid track id: {e}"),
-                                Ok(id) => {
-                                    env_vars.insert("PLAYER_EVENT", "stopped".to_string());
-                                    env_vars.insert("TRACK_ID", id);
+                            PlayerEvent::Stopped { track_id, .. } => {
+                                env_vars.insert("PLAYER_EVENT", "stopped".to_string());
+                                match track_id.map(|track_id| track_id.to_id()) {
+                                    Some(Err(e)) => {
+                                        warn!("PlayerEvent::Stopped: Invalid track id: {e}")
+                                    }
+                                    Some(Ok(id)) => {
+                                        env_vars.insert("TRACK_ID", id);
+                                    }
+                                    None => {}
                                 }
-                            },
+                            }
                             PlayerEvent::Playing {
                                 track_id,
                                 position_ms,