asolkar/unibar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Network icons based on wifi/ethernet

Browse Source 
Some refactoring
This commit is contained in:
Mahesh Asolkar 2025-05-23 23:48:23 -07:00
parent 2be0d56655
commit b62c9cd484
Signed by: asolkar
GPG Key ID: 371CA8164433BDCC
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/bar_modules/bar_module_network.rs
View File

@ -38,18 +38,21 @@ impl bar_modules::BarModuleActions for UnibarModuleNetwork {
self.ip_addr_stdout = String::from_utf8(ip_addr_output.stdout).unwrap(); self.ip_addr_stdout = String::from_utf8(ip_addr_output.stdout).unwrap();
self.ip_addr_stdout.pop(); self.ip_addr_stdout.pop();
self.network_info = serde_json::from_str::<Value>(self.ip_addr_stdout.as_str()).unwrap(); let network_data: Value = serde_json::from_str::<Value>(self.ip_addr_stdout.as_str()).unwrap();
if self.opts.debug_json {
println!("-----> ip_addr - {:#?}", self.network_info);
}
}
// -------------------- if let Some(interfaces) = network_data.as_array() {
fn get_content(&self) -> String { if self.opts.debug_json {
if let Some(interfaces) = self.network_info.as_array() { println!("-----> network_data - {:#?}", network_data);
let up_intf :Vec<_> = interfaces.iter() }
// Get all interfaces that are up
let mut up_intf :Vec<_> = interfaces.iter()
.filter(|el| el["operstate"].as_str().unwrap().contains("UP")) .filter(|el| el["operstate"].as_str().unwrap().contains("UP"))
.cloned().collect(); .cloned().collect();
// Sort by 'ifname'. This is an unreliable way to proiritize ethernet over wifi.
// Ethenet network interface names normally start with 'e' and wifi interface names
// start with 'w'
up_intf.sort_by(|a, b| a["ifname"].as_str().unwrap().cmp(b["ifname"].as_str().unwrap()));
if up_intf.len() > 0 { if up_intf.len() > 0 {
let inet_addr :Vec<_> = up_intf[0]["addr_info"].as_array().unwrap().iter() let inet_addr :Vec<_> = up_intf[0]["addr_info"].as_array().unwrap().iter()
.filter(|ai| ai["scope"].as_str().unwrap().contains("global")) .filter(|ai| ai["scope"].as_str().unwrap().contains("global"))
@ -58,24 +61,36 @@ impl bar_modules::BarModuleActions for UnibarModuleNetwork {
if self.opts.debug_json { if self.opts.debug_json {
println!("-----> Inet Addr - {:#?}", inet_addr); println!("-----> Inet Addr - {:#?}", inet_addr);
} }
return inet_addr[0]["local"].as_str().unwrap().to_string(); self.network_info = inet_addr[0].clone();
self.network_info["ifname"] = up_intf[0]["ifname"].clone();
} }
} }
} }
return "None".to_string(); if self.opts.debug_json {
println!("-----> ip_addr - {:#?}", self.network_info);
}
}
// --------------------
fn get_content(&self) -> String {
if self.network_info != serde_json::Value::Null {
// If any interface was up, return the local IP address
return self.network_info["local"].as_str().unwrap().to_string();
}
return "Network down".to_string();
} }
// -------------------- // --------------------
fn get_icon(&self) -> String { fn get_icon(&self) -> String {
if let Some(interfaces) = self.network_info.as_array() { if self.network_info != serde_json::Value::Null {
let up_intf :Vec<_> = interfaces.iter() // Select icon based on which interface is up (ethernet or wifi)
.filter(|el| el["operstate"].as_str().unwrap().contains("UP")) if self.network_info["ifname"].as_str().unwrap().to_string().starts_with("w") {
.cloned().collect();
if up_intf.len() > 0 {
return "📶".to_string(); return "📶".to_string();
} else {
return "🌎".to_string();
} }
} }
return "🌎".to_string(); return "📡".to_string();
} }
} }