leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(notifications): only connect to notifications daemon once

Browse source
This commit is contained in:
Ashley Wulber 2024-01-18 22:13:05 -05:00 • committed by Ashley Wulber
parent 94a3c35e22
commit 6875bb38c0
2 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cosmic-applet-notifications/src/main.rs
View file

@ -5,7 +5,7 @@ use cosmic::applet::token::subscription::{
}; };
use cosmic::applet::{menu_button, menu_control_padding, padded_control}; use cosmic::applet::{menu_button, menu_control_padding, padded_control};
use cosmic::cctk::sctk::reexports::calloop; use cosmic::cctk::sctk::reexports::calloop;
use cosmic::cosmic_config::{config_subscription, Config, CosmicConfigEntry}; use cosmic::cosmic_config::{Config, CosmicConfigEntry};
use cosmic::iced::wayland::popup::{destroy_popup, get_popup}; use cosmic::iced::wayland::popup::{destroy_popup, get_popup};
use cosmic::iced::Limits; use cosmic::iced::Limits;
use cosmic::iced::{ use cosmic::iced::{

17
cosmic-applet-notifications/src/subscriptions/notifications.rs
View file

@ -17,8 +17,7 @@ use zbus::{
#[derive(Debug)] #[derive(Debug)]
pub enum State { pub enum State {
Ready, WaitingForNotificationEvent(u8),
WaitingForNotificationEvent(NotificationsAppletProxy<'static>, u8),
Finished, Finished,
} }
@ -29,20 +28,11 @@ pub fn notifications(proxy: NotificationsAppletProxy<'static>) -> Subscription<N
std::any::TypeId::of::<SomeWorker>(), std::any::TypeId::of::<SomeWorker>(),
50, 50,
|mut output| async move { |mut output| async move {
let mut state = State::Ready; let mut state = State::WaitingForNotificationEvent(0);
loop { loop {
match &mut state { match &mut state {
State::Ready => { State::WaitingForNotificationEvent(mut fail_count) => {
state = match get_proxy().await {
Ok(p) => State::WaitingForNotificationEvent(p, 0),
Err(err) => {
error!("Failed to connect to notifications daemon {}", err);
State::Finished
}
};
}
State::WaitingForNotificationEvent(proxy, mut fail_count) => {
trace!("Waiting for notification events..."); trace!("Waiting for notification events...");
let mut signal = match proxy.receive_notify().await { let mut signal = match proxy.receive_notify().await {
Ok(s) => s, Ok(s) => s,
@ -110,6 +100,7 @@ trait NotificationsApplet {
pub async fn get_proxy() -> anyhow::Result<NotificationsAppletProxy<'static>> { pub async fn get_proxy() -> anyhow::Result<NotificationsAppletProxy<'static>> {
let raw_fd = std::env::var("COSMIC_NOTIFICATIONS")?; let raw_fd = std::env::var("COSMIC_NOTIFICATIONS")?;
let raw_fd = raw_fd.parse::<RawFd>()?; let raw_fd = raw_fd.parse::<RawFd>()?;
tracing::info!("Connecting to notifications daemon on fd {}", raw_fd);
let stream = unsafe { std::os::unix::net::UnixStream::from_raw_fd(raw_fd) }; let stream = unsafe { std::os::unix::net::UnixStream::from_raw_fd(raw_fd) };
stream.set_nonblocking(true)?; stream.set_nonblocking(true)?;