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

refactor: make client state enum order consistent

Browse source
This commit is contained in:
Reinout Meliesie 2024-04-24 14:08:08 +02:00
parent 6478dd62fb
commit 6a330136f4
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
2 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/clients/networkmanager.rs
View file

@ -25,13 +25,13 @@ pub struct Client {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum ClientState { pub enum ClientState {
Unknown,
WiredConnected, WiredConnected,
WifiConnected, WifiConnected,
CellularConnected, CellularConnected,
VpnConnected, VpnConnected,
WifiDisconnected, WifiDisconnected,
Offline, Offline,
Unknown,
} }
impl Client { impl Client {
@ -116,7 +116,7 @@ pub fn create_client() -> Result<Arc<Client>> {
let client = client.clone(); let client = client.clone();
spawn_blocking(move || { spawn_blocking(move || {
if let Err(error) = client.run() { if let Err(error) = client.run() {
error!("{}", error) error!("{}", error);
}; };
}); });
} }
@ -136,17 +136,10 @@ fn determine_state(
} }
} else { } else {
match primary_connection_type { match primary_connection_type {
"802-11-olpc-mesh" => ClientState::WifiConnected, "802-3-ethernet" | "adsl" | "pppoe" => ClientState::WiredConnected,
"802-11-wireless" => ClientState::WifiConnected, "802-11-olpc-mesh" | "802-11-wireless" | "wifi-p2p" => ClientState::WifiConnected,
"802-3-ethernet" => ClientState::WiredConnected, "cdma" | "gsm" | "wimax" => ClientState::CellularConnected,
"adsl" => ClientState::WiredConnected, "vpn" | "wireguard" => ClientState::VpnConnected,
"cdma" => ClientState::CellularConnected,
"gsm" => ClientState::CellularConnected,
"pppoe" => ClientState::WiredConnected,
"vpn" => ClientState::VpnConnected,
"wifi-p2p" => ClientState::WifiConnected,
"wimax" => ClientState::CellularConnected,
"wireguard" => ClientState::VpnConnected,
_ => ClientState::Unknown, _ => ClientState::Unknown,
} }
} }

12
src/modules/networkmanager.rs
View file

@ -2,7 +2,7 @@ use color_eyre::Result;
use futures_lite::StreamExt; use futures_lite::StreamExt;
use futures_signals::signal::SignalExt; use futures_signals::signal::SignalExt;
use gtk::prelude::ContainerExt; use gtk::prelude::ContainerExt;
use gtk::{Image, Orientation}; use gtk::{Box, Image, Orientation};
use serde::Deserialize; use serde::Deserialize;
use tokio::sync::mpsc::Receiver; use tokio::sync::mpsc::Receiver;
@ -26,7 +26,7 @@ const fn default_icon_size() -> i32 {
24 24
} }
impl Module<gtk::Box> for NetworkManagerModule { impl Module<Box> for NetworkManagerModule {
type SendMessage = ClientState; type SendMessage = ClientState;
type ReceiveMessage = (); type ReceiveMessage = ();
@ -53,28 +53,28 @@ impl Module<gtk::Box> for NetworkManagerModule {
self, self,
context: WidgetContext<ClientState, ()>, context: WidgetContext<ClientState, ()>,
info: &ModuleInfo, info: &ModuleInfo,
) -> Result<ModuleParts<gtk::Box>> { ) -> Result<ModuleParts<Box>> {
let container = gtk::Box::new(Orientation::Horizontal, 0); let container = Box::new(Orientation::Horizontal, 0);
let icon = Image::new(); let icon = Image::new();
icon.add_class("icon"); icon.add_class("icon");
container.add(&icon); container.add(&icon);
let icon_theme = info.icon_theme.clone(); let icon_theme = info.icon_theme.clone();
let initial_icon_name = "icon:content-loading-symbolic"; let initial_icon_name = "content-loading-symbolic";
ImageProvider::parse(initial_icon_name, &icon_theme, false, self.icon_size) ImageProvider::parse(initial_icon_name, &icon_theme, false, self.icon_size)
.map(|provider| provider.load_into_image(icon.clone())); .map(|provider| provider.load_into_image(icon.clone()));
let widget_receiver = context.subscribe(); let widget_receiver = context.subscribe();
glib_recv!(widget_receiver, state => { glib_recv!(widget_receiver, state => {
let icon_name = match state { let icon_name = match state {
ClientState::Unknown => "dialog-question-symbolic",
ClientState::WiredConnected => "network-wired-symbolic", ClientState::WiredConnected => "network-wired-symbolic",
ClientState::WifiConnected => "network-wireless-symbolic", ClientState::WifiConnected => "network-wireless-symbolic",
ClientState::CellularConnected => "network-cellular-symbolic", ClientState::CellularConnected => "network-cellular-symbolic",
ClientState::VpnConnected => "network-vpn-symbolic", ClientState::VpnConnected => "network-vpn-symbolic",
ClientState::WifiDisconnected => "network-wireless-acquiring-symbolic", ClientState::WifiDisconnected => "network-wireless-acquiring-symbolic",
ClientState::Offline => "network-wireless-disabled-symbolic", ClientState::Offline => "network-wireless-disabled-symbolic",
ClientState::Unknown => "dialog-question-symbolic",
}; };
ImageProvider::parse(icon_name, &icon_theme, false, self.icon_size) ImageProvider::parse(icon_name, &icon_theme, false, self.icon_size)
.map(|provider| provider.load_into_image(icon.clone())); .map(|provider| provider.load_into_image(icon.clone()));