stephenseo/swaybar_info
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Refactor main.rs handling of network stats

Browse source
This commit is contained in:
Stephen Seo 2022-07-10 17:47:51 +09:00
parent 251125366c
commit 35ff17ef0f
2 changed files with 46 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/args.rs
View file

@ -16,7 +16,7 @@ pub fn get_args() -> HashMap<String, String> {
} else if arg.starts_with("--interval-sec=") { } else if arg.starts_with("--interval-sec=") {
let (_, back) = arg.split_at(15); let (_, back) = arg.split_at(15);
map.insert("interval-sec".into(), back.into()); map.insert("interval-sec".into(), back.into());
} else if arg.starts_with("--help") || arg.starts_with("-h") { } else if arg == "--help" || arg == "-h" {
map.insert("help".into(), "".into()); map.insert("help".into(), "".into());
} else { } else {
let mut stderr_handle = io::stderr().lock(); let mut stderr_handle = io::stderr().lock();
@ -32,7 +32,9 @@ pub fn get_args() -> HashMap<String, String> {
pub fn print_usage() { pub fn print_usage() {
let mut stderr_handle = io::stderr().lock(); let mut stderr_handle = io::stderr().lock();
stderr_handle.write_all(b"Usage:\n").ok(); stderr_handle.write_all(b"Usage:\n").ok();
stderr_handle.write_all(b" --help\t\t\tPrints help\n").ok(); stderr_handle
.write_all(b" -h | --help\t\t\tPrints help\n")
.ok();
stderr_handle stderr_handle
.write_all(b" --netdev=<device_name>\tCheck network traffic on specified device\n") .write_all(b" --netdev=<device_name>\tCheck network traffic on specified device\n")
.ok(); .ok();

90
src/main.rs
View file

@ -73,62 +73,56 @@ fn main() {
} }
}; };
let handle_net = |is_empty: bool,
net: &mut proc::NetInfo,
array: &mut SwaybarArray|
-> Result<(), proc::Error> {
net.update()?;
let netinfo_string = net.get_netstring()?;
let netinfo_parts: Vec<&str> = netinfo_string.split_whitespace().collect();
if is_empty {
{
let mut down_object = SwaybarObject::from_string(
"net_down".to_owned(),
format!("{} {}", netinfo_parts[0], netinfo_parts[1]),
);
down_object.color = Some("#ff8888ff".into());
array.push_object(down_object);
}
{
let mut up_object = SwaybarObject::from_string(
"net_up".to_owned(),
format!("{} {}", netinfo_parts[2], netinfo_parts[3]),
);
up_object.color = Some("#88ff88ff".into());
array.push_object(up_object);
}
} else {
if let Some(down_object) = array.get_by_name_mut("net_down") {
down_object
.update_as_net_down(format!("{} {}", netinfo_parts[0], netinfo_parts[1]));
}
if let Some(up_object) = array.get_by_name_mut("net_up") {
up_object.update_as_net_up(format!("{} {}", netinfo_parts[2], netinfo_parts[3]));
}
}
Ok(())
};
loop { loop {
let is_empty = array.is_empty(); let is_empty = array.is_empty();
// network traffic // network traffic
if let Some(net) = &mut net_obj { if let Some(net) = net_obj.as_mut() {
if let Err(e) = net.update() { if let Err(e) = handle_net(is_empty, net, &mut array) {
let mut stderr_handle = io::stderr().lock(); let mut stderr_handle = io::stderr().lock();
stderr_handle.write_all(e.to_string().as_bytes()).ok(); stderr_handle.write_all(e.to_string().as_bytes()).ok();
net_obj = None; net_obj = None;
set_net_error(is_empty, &mut array); set_net_error(is_empty, &mut array);
} else {
let netinfo_result = net.get_netstring();
if let Err(e) = netinfo_result {
{
let mut stderr_handle = io::stderr().lock();
stderr_handle.write_all(e.to_string().as_bytes()).ok();
}
set_net_error(is_empty, &mut array);
} else {
let netinfo_string = netinfo_result.unwrap();
let netinfo_parts: Vec<&str> = netinfo_string.split_whitespace().collect();
if is_empty {
{
let mut down_object = SwaybarObject::from_string(
"net_down".to_owned(),
format!("{} {}", netinfo_parts[0], netinfo_parts[1]),
);
down_object.color = Some("#ff8888ff".into());
array.push_object(down_object);
}
{
let mut up_object = SwaybarObject::from_string(
"net_up".to_owned(),
format!("{} {}", netinfo_parts[2], netinfo_parts[3]),
);
up_object.color = Some("#88ff88ff".into());
array.push_object(up_object);
}
} else {
if let Some(down_object) = array.get_by_name_mut("net_down") {
down_object.update_as_net_down(format!(
"{} {}",
netinfo_parts[0], netinfo_parts[1]
));
}
if let Some(up_object) = array.get_by_name_mut("net_up") {
up_object.update_as_net_up(format!(
"{} {}",
netinfo_parts[2], netinfo_parts[3]
));
}
}
}
} }
} }