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

refactor(network): update the icon name for disconnected state, and improve subscriptions

Browse source
This commit is contained in:
Ashley Wulber 2023-11-01 14:45:48 -04:00 • committed by Ashley Wulber
parent 2c9470bdd7
commit a9b82222c4
5 changed files with 56 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cosmic-applet-network/src/network_manager/active_conns.rs
View file

@ -18,7 +18,6 @@ pub fn active_conns_subscription<I: 'static + Hash + Copy + Send + Sync + Debug>
async move {
loop {
state = start_listening(state, &mut output).await;
_ = tokio::time::sleep(tokio::time::Duration::from_secs(2)).await;
}
}
})
@ -49,10 +48,15 @@ async fn start_listening(
let mut active_conns_changed = network_manager.receive_active_connections_changed().await;
active_conns_changed.next().await;
let new_state = NetworkManagerState::new(&conn).await.unwrap_or_default();
while let (Some(_change), _) = tokio::join!(
active_conns_changed.next(),
tokio::time::sleep(tokio::time::Duration::from_secs(1))
) {
let new_state = NetworkManagerState::new(&conn).await.unwrap_or_default();
_ = output
.send(NetworkManagerEvent::ActiveConns(new_state))
.await;
}
_ = output
.send(NetworkManagerEvent::ActiveConns(new_state))
.await;
State::Continue(conn)
}

23
cosmic-applet-network/src/network_manager/devices.rs
View file

@ -9,16 +9,16 @@ use zbus::Connection;
pub fn devices_subscription<I: 'static + Hash + Copy + Send + Sync + Debug>(
id: I,
has_popup: bool,
conn: Connection,
) -> iced::Subscription<NetworkManagerEvent> {
let initial = State::Continue(conn.clone());
subscription::channel(id, 50, move |mut output| {
subscription::channel((id, has_popup), 50, move |mut output| {
let mut state = initial.clone();
async move {
loop {
state = start_listening(state, &mut output).await;
_ = tokio::time::sleep(tokio::time::Duration::from_secs(2)).await;
state = start_listening(state, has_popup, &mut output).await;
}
}
})
@ -32,6 +32,7 @@ pub enum State {
async fn start_listening(
state: State,
has_popup: bool,
output: &mut futures::channel::mpsc::Sender<NetworkManagerEvent>,
) -> State {
let conn = match state {
@ -47,11 +48,17 @@ async fn start_listening(
};
let mut devices_changed = network_manager.receive_devices_changed().await;
devices_changed.next().await;
let new_state = NetworkManagerState::new(&conn).await.unwrap_or_default();
_ = output
.send(NetworkManagerEvent::WirelessAccessPoints(new_state))
.await;
let secs = if has_popup { 4 } else { 60 };
while let (Some(_change), _) = tokio::join!(
devices_changed.next(),
tokio::time::sleep(tokio::time::Duration::from_secs(secs))
) {
let new_state = NetworkManagerState::new(&conn).await.unwrap_or_default();
_ = output
.send(NetworkManagerEvent::WirelessAccessPoints(new_state))
.await;
}
State::Continue(conn)
}

11
cosmic-applet-network/src/network_manager/mod.rs
View file

@ -472,6 +472,16 @@ async fn start_listening(
})
.await;
}
Some(NetworkManagerRequest::Reload) => {
let state = NetworkManagerState::new(&conn).await.unwrap_or_default();
_ = output
.send(NetworkManagerEvent::RequestResponse {
req: NetworkManagerRequest::Reload,
success: true,
state,
})
.await;
}
_ => {
return State::Finished;
}
@ -490,6 +500,7 @@ pub enum NetworkManagerRequest {
SelectAccessPoint(String),
Disconnect(String),
Password(String, String),
Reload,
}
#[derive(Debug, Clone)]

13
cosmic-applet-network/src/network_manager/wireless_enabled.rs
View file

@ -18,7 +18,6 @@ pub fn wireless_enabled_subscription<I: 'static + Hash + Copy + Send + Sync + De
async move {
loop {
state = start_listening(state, &mut output).await;
_ = tokio::time::sleep(tokio::time::Duration::from_secs(2)).await;
}
}
})
@ -38,6 +37,7 @@ async fn start_listening(
State::Continue(conn) => conn,
State::Error => iced::futures::future::pending().await,
};
let network_manager = match NetworkManager::new(&conn).await {
Ok(n) => n,
Err(e) => {
@ -47,11 +47,12 @@ async fn start_listening(
};
let mut wireless_enabled_changed = network_manager.receive_wireless_enabled_changed().await;
wireless_enabled_changed.next().await;
let new_state = NetworkManagerState::new(&conn).await.unwrap_or_default();
_ = output
.send(NetworkManagerEvent::WiFiEnabled(new_state))
.await;
while let Some(_change) = wireless_enabled_changed.next().await {
let new_state = NetworkManagerState::new(&conn).await.unwrap_or_default();
_ = output
.send(NetworkManagerEvent::WiFiEnabled(new_state))
.await;
}
State::Continue(conn)
}