feature: add option to format tooltip as a table (#13)

Author: kerty0

README.md

@@ -48,6 +48,8 @@ This small program will give you fast updates with less network usage. After you
 
 `--network-interval-seconds` - interval to run checkupdates with network usage.
 
+`--tooltip-align-columns` - format tooltip as a table using given monospaced font.
+
 ### How to hide the module when there are no updates available
 
 ##### waybar config

src/main.rs

@@ -15,6 +15,7 @@ fn display_help() {
     println!("  --interval-seconds <seconds>  Set the interval between updates (default: 5)");
     println!("  --network-interval-seconds <seconds>  Set the interval between network updates (default: 300)");
     println!("  --no-zero-output              Don't print '0' when there are no updates available");
+    println!("  --tooltip-align-columns <font>Format tooltip as a table using given font (default: monospace)");
     println!();
 }
 
@@ -27,21 +28,28 @@ fn main() -> Result<(), Error> {
     let mut interval_seconds: u32 = 5;
     let mut network_interval_seconds: u32 = 300;
     let mut clean_output = false;
+    let mut tooltip_align = false;
+    let mut tooltip_font = "monospace";
     if args.len() > 1 {
         for (i, arg) in args.iter().enumerate() {
             if arg == "--help" {
                 display_help();
                 return Ok(());
             } else if arg == "--interval-seconds" && i + 1 < args.len() {
-                interval_seconds = args[i + 1]
-                    .parse()
-                    .unwrap_or_else(|_| panic!("--interval-seconds must be greater than 0!"));
+                interval_seconds = args[i + 1].parse().unwrap_or_else(|_| {
+                    panic!("--interval-seconds must be greater than 0!")
+                });
             } else if arg == "--network-interval-seconds" && i + 1 < args.len() {
                 network_interval_seconds = args[i + 1].parse().unwrap_or_else(|_| {
                     panic!("--network-interval-seconds must be greater than 0!")
                 });
             } else if arg == "--no-zero-output" {
                 clean_output = true;
+            } else if arg == "--tooltip-align-columns" {
+                tooltip_align = true;
+                if i + 1 < args.len() && args[i + 1][..1] != *"-" {
+                    tooltip_font = args[i + 1].as_str();
+                }
             }
         }
     }
@@ -55,15 +63,40 @@ fn main() -> Result<(), Error> {
             sync_database();
             iter = 0;
         }
-        let (updates, stdout) = get_updates();
+        let (updates, mut stdout) = get_updates();
         if updates > 0 {
+            if tooltip_align {
+                let mut padding = [0; 4];
+                stdout
+                    .split_whitespace()
+                    .enumerate()
+                    .for_each(|(index, word)| {
+                        padding[index % 4] = padding[index % 4].max(word.len())
+                    });
+
+                stdout = format!(
+                    "<span font-family='{}'>{}</span>",
+                    tooltip_font,
+                    stdout
+                        .split_whitespace()
+                        .enumerate()
+                        .map(|(index, word)| {
+                            word.to_string() + " ".repeat(padding[index % 4] - word.len()).as_str()
+                        })
+                        .collect::<Vec<String>>()
+                        .chunks(4)
+                        .map(|line| line.join(" "))
+                        .collect::<Vec<String>>()
+                        .join("\n")
+                );
+            }
             let tooltip = stdout.trim_end().replace("\"", "\\\"").replace("\n", "\\n");
             println!("{{\"text\":\"{}\",\"tooltip\":\"{}\",\"class\":\"has-updates\",\"alt\":\"has-updates\"}}", updates, tooltip);
         } else {
             println!("{{\"text\":{},\"tooltip\":\"System updated\",\"class\": \"updated\",\"alt\":\"updated\"}}", if clean_output {"\"\""} else {"\"0\""});
         }
         iter += 1;
-        std::thread::sleep(sleep_duration);
+        thread::sleep(sleep_duration);
     }
 }
 
@@ -84,14 +117,14 @@ fn get_updates() -> (u16, String) {
         .args(["--nosync", "--nocolor"])
         .output()
         .expect("failed to execute process");
-    return match output.status.code() {
+    match output.status.code() {
         Some(_code) => {
             let stdout = String::from_utf8_lossy(&output.stdout).to_string();
-            if stdout == "" {
+            if stdout.is_empty() {
                 return (0, "0".to_string());
             }
-            return ((stdout.split(" -> ").count() as u16) - 1, stdout);
+            ((stdout.split(" -> ").count() as u16) - 1, stdout)
         }
         None => (0, "0".to_string()),
-    };
+    }
 }