Skip to content
This repository was archived by the owner on Oct 8, 2025. It is now read-only.
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion src/settings_daemon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ pub fn subscription(connection: zbus::Connection) -> iced_futures::Subscription<
.receive_max_display_brightness_changed()
.await;
let brightness_stream = settings_daemon.receive_display_brightness_changed().await;
let owner_stream = settings_daemon.0.receive_owner_changed().await.unwrap();

let initial = futures::stream::iter([Event::Sender(tx)]);

let settings_daemon_clone = settings_daemon.clone();
initial.chain(futures::stream_select!(
Box::pin(UnboundedReceiverStream::new(rx).filter_map(move |request| {
let settings_daemon = settings_daemon.clone();
Expand All @@ -46,7 +48,35 @@ pub fn subscription(connection: zbus::Connection) -> iced_futures::Subscription<
})),
Box::pin(brightness_stream.filter_map(|evt| async move {
Some(Event::DisplayBrightness(evt.get().await.ok()?))
}))
})),
Box::pin(owner_stream.flat_map(move |owner| {
let settings_daemon = settings_daemon_clone.clone();
async move {
// TODO send None if owner is lost? Needs to be well-ordered. Or tracked
// seperately from brightness.
if owner.is_some() {
return futures::stream::iter(
[
settings_daemon
.display_brightness()
.await
.ok()
.map(Event::DisplayBrightness),
settings_daemon
.max_display_brightness()
.await
.ok()
.map(Event::MaxDisplayBrightness),
]
.into_iter()
.flatten(),
)
.left_stream();
}
futures::stream::empty().right_stream()
}
.flatten_stream()
})),
))
}
.flatten_stream(),
Expand Down