feat(mpris): Retry with pid specific name on NameTaken error

Author: paulfariello

playback/src/player.rs

@@ -2163,7 +2163,51 @@ impl PlayerInternal {
 
             PlayerCommand::SetSession(session) => self.session = session,
 
-            PlayerCommand::AddEventSender(sender) => self.event_senders.push(sender),
+            PlayerCommand::AddEventSender(sender) => {
+                // Send current player state to new event listener
+                match self.state {
+                    PlayerState::Loading {
+                        ref track_id,
+                        play_request_id,
+                        ..
+                    } => {
+                        let _ = sender.send(PlayerEvent::Loading {
+                            play_request_id,
+                            track_id: track_id.clone(),
+                            position_ms: 0, // TODO
+                        });
+                    }
+                    PlayerState::Paused {
+                        ref track_id,
+                        play_request_id,
+                        stream_position_ms,
+                        ..
+                    } => {
+                        let _ = sender.send(PlayerEvent::Paused {
+                            play_request_id,
+                            track_id: track_id.clone(),
+                            position_ms: stream_position_ms,
+                        });
+                    }
+                    PlayerState::Playing { ref audio_item, .. } => {
+                        let audio_item = Box::new(audio_item.clone());
+                        let _ = sender.send(PlayerEvent::TrackChanged { audio_item });
+                    }
+                    PlayerState::EndOfTrack {
+                        play_request_id,
+                        ref track_id,
+                        ..
+                    } => {
+                        let _ = sender.send(PlayerEvent::EndOfTrack {
+                            play_request_id,
+                            track_id: track_id.clone(),
+                        });
+                    }
+                    _ => (),
+                }
+
+                self.event_senders.push(sender);
+            }
 
             PlayerCommand::SetSinkEventCallback(callback) => self.sink_event_callback = callback,
 

src/mpris_event_handler.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, sync::Arc};
+use std::{collections::HashMap, process, sync::Arc};
 
 use librespot_connect::Spirc;
 use log::{debug, warn};
@@ -838,30 +838,43 @@ pub struct MprisEventHandler {
 }
 
 impl MprisEventHandler {
-    pub async fn spawn(player: Arc<Player>, name: &str) -> Result<MprisEventHandler, MprisError> {
-        let (cmd_tx, cmd_rx) = mpsc::unbounded_channel();
-
+    fn connection_builder<'a>(identity: &str, name: &str) -> zbus::Result<connection::Builder<'a>> {
         let mpris_service = MprisService {
-            identity: name.to_string(),
+            identity: identity.to_string(),
         };
         let mpris_player_service = MprisPlayerService {
             spirc: None,
-            // FIXME: obtain current values from Player
+            // Values are updated upon reception of first player state, right after MprisTask event
+            // handler registration
             repeat: LoopStatus::None,
             shuffle: false,
             playback_status: PlaybackStatus::Stopped,
             volume: 1.0,
             metadata: HashMap::new(),
         };
 
-        let connection = connection::Builder::session()?
-            // FIXME: retry with "org.mpris.MediaPlayer2.librespot.instance<pid>"
-            // on error
-            .name("org.mpris.MediaPlayer2.librespot")?
+        connection::Builder::session()?
+            .name(name.to_string())?
             .serve_at("/org/mpris/MediaPlayer2", mpris_service)?
-            .serve_at("/org/mpris/MediaPlayer2", mpris_player_service)?
+            .serve_at("/org/mpris/MediaPlayer2", mpris_player_service)
+    }
+
+    pub async fn spawn(player: Arc<Player>, name: &str) -> Result<MprisEventHandler, MprisError> {
+        let (cmd_tx, cmd_rx) = mpsc::unbounded_channel();
+
+        let connection = Self::connection_builder(name, "org.mpris.MediaPlayer2.librespot")?
             .build()
-            .await?;
+            .await;
+        let connection = match connection {
+            Err(zbus::Error::NameTaken) => {
+                let pid_name =
+                    format!("org.mpris.MediaPlayer2.librespot.instance{}", process::id());
+                log::warn!("MPRIS: zbus name taken, trying with pid specific name: {pid_name}");
+
+                Self::connection_builder(name, &pid_name)?.build().await
+            }
+            _ => connection,
+        }?;
 
         let mpris_task = MprisTask {
             player,