mirror of
https://github.com/Zedfrigg/ironbar.git
synced 2025-09-16 03:36:58 +02:00
feat: actually implement icon per connection type
This commit is contained in:
parent
cd0991e865
commit
4182038643
6 changed files with 529 additions and 300 deletions
163
src/clients/networkmanager/state.rs
Normal file
163
src/clients/networkmanager/state.rs
Normal file
|
@ -0,0 +1,163 @@
|
|||
use color_eyre::Result;
|
||||
|
||||
use crate::clients::networkmanager::dbus::{
|
||||
ActiveConnectionDbusProxyBlocking, DeviceDbusProxyBlocking, DeviceState, DeviceType,
|
||||
};
|
||||
use crate::clients::networkmanager::PathMap;
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct State {
|
||||
pub wired: WiredState,
|
||||
pub wifi: WifiState,
|
||||
pub cellular: CellularState,
|
||||
pub vpn: VpnState,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub enum WiredState {
|
||||
Connected,
|
||||
Disconnected,
|
||||
NotPresent,
|
||||
Unknown,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub enum WifiState {
|
||||
Connected(WifiConnectedState),
|
||||
Disconnected,
|
||||
Disabled,
|
||||
NotPresent,
|
||||
Unknown,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct WifiConnectedState {
|
||||
pub ssid: String,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub enum CellularState {
|
||||
Connected,
|
||||
Disconnected,
|
||||
Disabled,
|
||||
NotPresent,
|
||||
Unknown,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub enum VpnState {
|
||||
Connected(VpnConnectedState),
|
||||
Disconnected,
|
||||
Unknown,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct VpnConnectedState {
|
||||
pub name: String,
|
||||
}
|
||||
|
||||
pub(super) fn determine_wired_state(
|
||||
devices: &PathMap<DeviceDbusProxyBlocking>,
|
||||
) -> Result<WiredState> {
|
||||
let mut present = false;
|
||||
let mut connected = false;
|
||||
|
||||
for device in devices.values() {
|
||||
if device.device_type()? == DeviceType::Ethernet {
|
||||
present = true;
|
||||
if device.state()?.is_enabled() {
|
||||
connected = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if connected {
|
||||
Ok(WiredState::Connected)
|
||||
} else if present {
|
||||
Ok(WiredState::Disconnected)
|
||||
} else {
|
||||
Ok(WiredState::NotPresent)
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn determine_wifi_state(
|
||||
devices: &PathMap<DeviceDbusProxyBlocking>,
|
||||
) -> Result<WifiState> {
|
||||
let mut present = false;
|
||||
let mut enabled = false;
|
||||
let mut connected = false;
|
||||
|
||||
for device in devices.values() {
|
||||
if device.device_type()? == DeviceType::Wifi {
|
||||
present = true;
|
||||
if device.state()?.is_enabled() {
|
||||
enabled = true;
|
||||
if device.state()? == DeviceState::Activated {
|
||||
connected = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if connected {
|
||||
Ok(WifiState::Connected(WifiConnectedState {
|
||||
// TODO: Implement obtaining SSID
|
||||
ssid: "unknown".into(),
|
||||
}))
|
||||
} else if enabled {
|
||||
Ok(WifiState::Disconnected)
|
||||
} else if present {
|
||||
Ok(WifiState::Disabled)
|
||||
} else {
|
||||
Ok(WifiState::NotPresent)
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn determine_cellular_state(
|
||||
devices: &PathMap<DeviceDbusProxyBlocking>,
|
||||
) -> Result<CellularState> {
|
||||
let mut present = false;
|
||||
let mut enabled = false;
|
||||
let mut connected = false;
|
||||
|
||||
for device in devices.values() {
|
||||
if device.device_type()? == DeviceType::Modem {
|
||||
present = true;
|
||||
if device.state()?.is_enabled() {
|
||||
enabled = true;
|
||||
if device.state()? == DeviceState::Activated {
|
||||
connected = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if connected {
|
||||
Ok(CellularState::Connected)
|
||||
} else if enabled {
|
||||
Ok(CellularState::Disconnected)
|
||||
} else if present {
|
||||
Ok(CellularState::Disabled)
|
||||
} else {
|
||||
Ok(CellularState::NotPresent)
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn determine_vpn_state(
|
||||
active_connections: &PathMap<ActiveConnectionDbusProxyBlocking>,
|
||||
) -> Result<VpnState> {
|
||||
for connection in active_connections.values() {
|
||||
match connection.type_()?.as_str() {
|
||||
"vpn" | "wireguard" => {
|
||||
return Ok(VpnState::Connected(VpnConnectedState {
|
||||
name: "unknown".into(),
|
||||
}));
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
Ok(VpnState::Disconnected)
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue