Skip to content

fix(status-area): don't panic when SNI signal streams fail to initialize #1425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BrianHotopp wants to merge 1 commit into
base: master
Choose a base branch
from
+35 −12
Open

fix(status-area): don't panic when SNI signal streams fail to initialize #1425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 35 additions & 12 deletions cosmic-applet-status-area/src/subscriptions/status_notifier_item.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,33 @@ impl StatusNotifierItem {
async move {
let initial = futures::stream::once(get_layout(menu_proxy.clone()));

let layout_updated = menu_proxy.receive_layout_updated().await.unwrap();
let props_updated =
menu_proxy.receive_items_properties_updated().await.unwrap();

// Merge both streams - any update triggers a layout refetch
let updates = futures::stream_select!(
layout_updated.map(|_| ()),
props_updated.map(|_| ())
)
.then(move |()| get_layout(menu_proxy.clone()));
let updates = match (
menu_proxy.receive_layout_updated().await,
menu_proxy.receive_items_properties_updated().await,
) {
(Ok(layout_updated), Ok(props_updated)) => {
// Merge both streams - any update triggers a layout refetch
futures::stream_select!(
layout_updated.map(|_| ()),
props_updated.map(|_| ())
)
.then(move |()| get_layout(menu_proxy.clone()))
.left_stream()
}
(layout_updated, props_updated) => {
if let Err(err) = layout_updated {
tracing::warn!(
"receive_layout_updated failed; no live layout updates: {err}"
);
}
if let Err(err) = props_updated {
tracing::warn!(
"receive_items_properties_updated failed; no live layout updates: {err}"
);
}
futures::stream::empty().right_stream()
}
};

initial.chain(updates)
}
Expand Down Expand Up @@ -145,9 +162,15 @@ impl StatusNotifierItem {
|Wrapper { item_proxy, .. }| {
let item_proxy = item_proxy.clone();
async move {
let new_icon_stream = item_proxy.receive_new_icon().await.unwrap();
let live = match item_proxy.receive_new_icon().await {
Ok(new_icon_stream) => new_icon_stream.map(|_| ()).left_stream(),
Err(err) => {
tracing::warn!("receive_new_icon failed; no live icon updates: {err}");
futures::stream::empty().right_stream()
}
};
futures::stream::once(async {})
.chain(new_icon_stream.map(|_| ()))
.chain(live)
.then(move |()| icon_events(item_proxy.clone()))
}
.flatten_stream()
Expand Down
Loading