From 0f59b25fc93edeff79458d9628c5f0de871bd074 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Sun, 18 Oct 2026 23:05:12 +0200 Subject: [PATCH] fix: retain M13 media availability when a player is unresponsive Verify: private_bus_extended regression failed before native availability reporting; dbus-run-session -- cargo test -p fader_master --lib private_bus -- --ignored: 2 passed after fix; cargo fmt --all passed. Session-bus availability is independent of successful player discovery. --- fader_master/src/media_runtime.rs | 4 ++++ fader_master/src/media_runtime/native.rs | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/fader_master/src/media_runtime.rs b/fader_master/src/media_runtime.rs index f4bc189..41f2524 100644 --- a/fader_master/src/media_runtime.rs +++ b/fader_master/src/media_runtime.rs @@ -11,6 +11,9 @@ use std::{ }; trait Adapter { + fn available(&self) -> bool { + false + } fn discover(&mut self) -> Result, String>; fn execute(&mut self, player: &Player, action: &Action) -> Result<(), String>; } @@ -94,6 +97,7 @@ impl MediaRuntime { Err(mpsc::RecvTimeoutError::Disconnected) => break, }; if let Ok(mut state) = latest.lock() { + state.available |= adapter.available(); match result { Ok(players) => { if is_command { diff --git a/fader_master/src/media_runtime/native.rs b/fader_master/src/media_runtime/native.rs index 2ea8a7f..30cb2ec 100644 --- a/fader_master/src/media_runtime/native.rs +++ b/fader_master/src/media_runtime/native.rs @@ -128,6 +128,10 @@ impl DbusAdapter { } impl Adapter for DbusAdapter { + fn available(&self) -> bool { + self.connection.is_some() + } + fn discover(&mut self) -> Result, String> { let connection = self.connection()?; let bus = connection.with_proxy("org.freedesktop.DBus", "/org/freedesktop/DBus", TIMEOUT); @@ -478,6 +482,7 @@ mod tests { fixture.state.lock().unwrap().silent = true; let started = Instant::now(); assert!(execute_selected(&mut adapter, &selector, &Action::Play).is_err()); + assert!(adapter.available()); // A broken player does not mean D-Bus support is absent. assert!(started.elapsed() < Duration::from_secs(3)); fixture.state.lock().unwrap().silent = false; assert!(execute_selected(&mut adapter, &selector, &Action::Play).is_ok());