Impl output loop

diff --git a/src/args.rs b/src/args.rs
index 0d839c689cffebbeed1f81194cef7639379a907b..cfbe6913b2d40b019c387ec20cdcdd9da977d73e 100644 (file)
--- a/src/args.rs
+++ b/src/args.rs
@@ -7,8 +7,20 @@ pub fn get_args() -> HashMap<String, String> {
         if arg.starts_with("--netdev=") {
             let (_, back) = arg.split_at(9);
             map.insert("netdev".into(), back.into());
+        } else if arg.starts_with("--interval-sec=") {
+            let (_, back) = arg.split_at(15);
+            map.insert("interval-sec".into(), back.into());
+        } else if arg.starts_with("--help") || arg.starts_with("-h") {
+            map.insert("help".into(), "".into());
         }
     }
 
     map
 }
+
+pub fn print_usage() {
+    println!("Usage:");
+    println!("  --help\t\t\tPrints help");
+    println!("  --netdev=<device_name>\tCheck network traffic on specified device");
+    println!("  --interval-sec=<seconds>\tOutput at intervals of <seconds>");
+}

diff --git a/src/main.rs b/src/main.rs
index 28c6cf489987d5e314cf8d3432ee5fd019595586..442730b154c26a1ea6bd936d19958d6567b84b6c 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,15 +2,38 @@ mod args;
 mod proc;
 mod swaybar_object;
 
+use std::time::Duration;
+use swaybar_object::*;
+
 fn main() {
     let args_map = args::get_args();
+    if args_map.contains_key("help") {
+        args::print_usage();
+        return;
+    }
 
-    let mut net_obj = None;
+    let mut net_obj: Option<proc::NetInfo> = None;
+    let mut interval: Duration = Duration::from_secs(5);
     if args_map.contains_key("netdev") {
         net_obj = Some(proc::NetInfo::new(
             args_map.get("netdev").unwrap().to_owned(),
         ));
     }
+    if args_map.contains_key("interval-sec") {
+        let seconds: Result<i64, _> = args_map.get("interval-sec").unwrap().parse();
+        if let Ok(seconds_value) = seconds {
+            if seconds_value > 0 {
+                interval = Duration::from_secs(seconds_value as u64);
+            } else {
+                println!(
+                    "WARNING: Invalid --interval-sec=\"{}\", defaulting to 5!",
+                    seconds_value
+                );
+            }
+        } else {
+            println!("WARNING: Failed to parse --interval-sec=?, defaulting to 5!");
+        }
+    }
 
     println!(
         "{}",
@@ -18,27 +41,59 @@ fn main() {
             .expect("Should be able to serialize SwaybarHeader")
     );
     println!("[");
-    let mut array = swaybar_object::SwaybarArray::new();
-    array.push_object(swaybar_object::SwaybarObject::default());
-    {
-        let meminfo_string = proc::get_meminfo().expect("Should be able to get meminfo");
-        let meminfo_object = swaybar_object::SwaybarObject::from_string(meminfo_string);
-        array.push_object(meminfo_object);
-    }
-    {
-        let loadavg_string = proc::get_loadavg().expect("Should be able to get loadavg");
-        let loadavg_object = swaybar_object::SwaybarObject::from_string(loadavg_string);
-        array.push_object(loadavg_object);
-    }
 
-    if let Some(mut netinfo) = net_obj {
-        for _i in 0..10 {
-            netinfo.update().expect("netinfo.update() shouldn't fail");
-            let netinfo_string = netinfo.get_netstring();
-            array.push_object(swaybar_object::SwaybarObject::from_string(netinfo_string));
-            std::thread::sleep(std::time::Duration::from_secs(1));
+    loop {
+        let mut array = SwaybarArray::new();
+
+        // network traffic
+        if let Some(net) = &mut net_obj {
+            if let Err(e) = net.update() {
+                println!("ERROR: {:?}", e);
+                net_obj = None;
+            } else {
+                let netinfo_string = net.get_netstring();
+                let netinfo_parts: Vec<&str> = netinfo_string.split_whitespace().collect();
+
+                {
+                    let mut down_object = SwaybarObject::from_string(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(format!(
+                        "{} {}",
+                        netinfo_parts[2], netinfo_parts[3]
+                    ));
+                    up_object.color = Some("#88ff88ff".into());
+                    array.push_object(up_object);
+                }
+            }
+        }
+
+        // meminfo
+        {
+            let meminfo_string = proc::get_meminfo().unwrap_or("MEMINFO ERROR".into());
+            let meminfo_obj = SwaybarObject::from_string(meminfo_string);
+            array.push_object(meminfo_obj);
+        }
+
+        // loadavg
+        {
+            let loadavg_string = proc::get_loadavg().unwrap_or("LOADAVG ERROR".into());
+            let loadavg_obj = SwaybarObject::from_string(loadavg_string);
+            array.push_object(loadavg_obj);
+        }
+
+        // time
+        {
+            array.push_object(SwaybarObject::default());
         }
-    }
 
-    println!("{}", array);
+        println!("{}", array);
+        std::thread::sleep(interval);
+    }
 }

diff --git a/src/swaybar_object.rs b/src/swaybar_object.rs
index ff9733131acc9173e4d12e90487c57d42f9f5f62..cedeae1a24984cb281c20e25d5cfc4a9ac76384c 100644 (file)
--- a/src/swaybar_object.rs
+++ b/src/swaybar_object.rs
@@ -74,7 +74,7 @@ impl SwaybarObject {
             short_text: None,
             color: None,
             background: None,
-            border: None,
+            border: Some("#ffffffff".into()),
             border_top: None,
             border_bottom: None,
             border_left: None,
@@ -96,7 +96,7 @@ impl SwaybarObject {
             short_text: None,
             color: None,
             background: None,
-            border: None,
+            border: Some("#ffffffff".into()),
             border_top: None,
             border_bottom: None,
             border_left: None,
@@ -122,7 +122,7 @@ impl Default for SwaybarObject {
             short_text: None,
             color: None,
             background: None,
-            border: None,
+            border: Some("#ffffffff".into()),
             border_top: None,
             border_bottom: None,
             border_left: None,