1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-04-19 19:34:24 +02:00

feat: add networkmanager module

This commit is contained in:
Reinout Meliesie 2024-02-10 17:12:07 +01:00
parent d981265dac
commit 05e0083030
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
4 changed files with 146 additions and 0 deletions

View file

@ -386,6 +386,7 @@ fn add_modules(
ModuleConfig::Launcher(mut module) => add_module!(module, id),
#[cfg(feature = "music")]
ModuleConfig::Music(mut module) => add_module!(module, id),
ModuleConfig::Networkmanager(mut module) => add_module!(module, id),
ModuleConfig::Script(mut module) => add_module!(module, id),
#[cfg(feature = "sys_info")]
ModuleConfig::SysInfo(mut module) => add_module!(module, id),

View file

@ -14,6 +14,7 @@ use crate::modules::label::LabelModule;
use crate::modules::launcher::LauncherModule;
#[cfg(feature = "music")]
use crate::modules::music::MusicModule;
use crate::modules::networkmanager::NetworkmanagerModule;
use crate::modules::script::ScriptModule;
#[cfg(feature = "sys_info")]
use crate::modules::sysinfo::SysInfoModule;
@ -45,6 +46,7 @@ pub enum ModuleConfig {
Launcher(Box<LauncherModule>),
#[cfg(feature = "music")]
Music(Box<MusicModule>),
Networkmanager(Box<NetworkmanagerModule>),
Script(Box<ScriptModule>),
#[cfg(feature = "sys_info")]
SysInfo(Box<SysInfoModule>),

View file

@ -35,6 +35,7 @@ pub mod label;
pub mod launcher;
#[cfg(feature = "music")]
pub mod music;
pub mod networkmanager;
pub mod script;
#[cfg(feature = "sys_info")]
pub mod sysinfo;

View file

@ -0,0 +1,142 @@
use color_eyre::Result;
use futures_lite::StreamExt;
use gtk::prelude::*;
use gtk::{Image, Orientation};
use serde::Deserialize;
use tokio::sync::mpsc::Receiver;
use zbus::fdo::PropertiesProxy;
use zbus::names::InterfaceName;
use zbus::zvariant::ObjectPath;
use crate::config::CommonConfig;
use crate::image::ImageProvider;
use crate::modules::{Module, ModuleInfo, ModuleParts, ModuleUpdateEvent, WidgetContext};
use crate::{glib_recv, send_async, spawn};
// TODO: Add icon size option
#[derive(Debug, Deserialize, Clone)]
pub struct NetworkmanagerModule {
#[serde(flatten)]
pub common: Option<CommonConfig>,
}
#[derive(Clone, Debug)]
pub enum NetworkmanagerState {
Wireless,
WirelessDisconnected,
Wired,
Offline,
}
impl Module<gtk::Box> for NetworkmanagerModule {
type SendMessage = NetworkmanagerState;
type ReceiveMessage = ();
fn name() -> &'static str {
"networkmanager"
}
fn spawn_controller(
&self,
_: &ModuleInfo,
context: &WidgetContext<NetworkmanagerState, ()>,
_: Receiver<()>,
) -> Result<()> {
let tx = context.tx.clone();
spawn(async move {
// TODO: Maybe move this into a `client` à la `upower`?
let nm_proxy = {
let dbus = zbus::Connection::system().await?;
PropertiesProxy::builder(&dbus)
.destination("org.freedesktop.NetworkManager")?
.path("/org/freedesktop/NetworkManager")?
.build()
.await?
};
let device_interface_name =
InterfaceName::from_static_str("org.freedesktop.NetworkManager")?;
let state = get_network_state(&nm_proxy, &device_interface_name).await?;
send_async!(tx, ModuleUpdateEvent::Update(state));
let mut prop_changed_stream = nm_proxy.receive_properties_changed().await?;
while let Some(signal) = prop_changed_stream.next().await {
let args = signal.args()?;
if args.interface_name != device_interface_name {
continue;
}
let state = get_network_state(&nm_proxy, &device_interface_name).await?;
send_async!(tx, ModuleUpdateEvent::Update(state));
}
Result::<()>::Ok(())
});
Ok(())
}
fn into_widget(
self,
context: WidgetContext<NetworkmanagerState, ()>,
info: &ModuleInfo,
) -> Result<ModuleParts<gtk::Box>> {
let container = gtk::Box::new(Orientation::Horizontal, 0);
let icon = Image::new();
container.add(&icon);
let icon_theme = info.icon_theme.clone();
let initial_icon_name = "icon:content-loading-symbolic";
ImageProvider::parse(initial_icon_name, &icon_theme, false, 18)
.map(|provider| provider.load_into_image(icon.clone()));
let rx = context.subscribe();
glib_recv!(rx, state => {
let icon_name = match state {
NetworkmanagerState::Wireless => "network-wireless-symbolic",
NetworkmanagerState::WirelessDisconnected => "network-wireless-acquiring-symbolic",
NetworkmanagerState::Wired => "network-wired-symbolic",
NetworkmanagerState::Offline => "network-wireless-disabled-symbolic",
};
ImageProvider::parse(icon_name, &icon_theme, false, 18)
.map(|provider| provider.load_into_image(icon.clone()));
});
Ok(ModuleParts::new(container, None))
}
}
async fn get_network_state(
nm_proxy: &PropertiesProxy<'_>,
device_interface_name: &InterfaceName<'_>,
) -> Result<NetworkmanagerState> {
let properties = nm_proxy.get_all(device_interface_name.clone()).await?;
let primary_connection_path = properties["PrimaryConnection"]
.downcast_ref::<ObjectPath>()
.unwrap();
if primary_connection_path != "/" {
let primary_connection_type = properties["PrimaryConnectionType"]
.downcast_ref::<str>()
.unwrap()
.to_string();
match primary_connection_type.as_str() {
"802-11-wireless" => Ok(NetworkmanagerState::Wireless),
"802-3-ethernet" => Ok(NetworkmanagerState::Wired),
_ => panic!("Unknown primary connection type"),
}
} else {
let wireless_enabled = *properties["WirelessEnabled"]
.downcast_ref::<bool>()
.unwrap();
if wireless_enabled {
Ok(NetworkmanagerState::WirelessDisconnected)
} else {
Ok(NetworkmanagerState::Offline)
}
}
}