Add display module and table output

Introduce client/src/display.rs providing table printing, styled headers/values, and a short fingerprint summary helper. Replace ad-hoc prints in main.rs for listing ID files and known hosts with sorted table output using display::print_table, and integrate fingerprints_summary for compact fingerprint display. Also add terminal detection (IsTerminal) to color_choice so colors are disabled when TERM=dumb or stdout is not a TTY.

Author: WilliamRagstad

client/src/display.rs

@@ -0,0 +1,115 @@
+use clap::ColorChoice;
+
+const RESET: &str = "\x1b[0m";
+const BOLD: &str = "\x1b[1m";
+const DIM: &str = "\x1b[2m";
+const UNDERLINE: &str = "\x1b[4m";
+const GREEN: &str = "\x1b[32m";
+const YELLOW: &str = "\x1b[33m";
+const CYAN: &str = "\x1b[36m";
+
+#[derive(Debug, Clone)]
+struct TableCell {
+    text: String,
+    visible_len: usize,
+}
+
+impl TableCell {
+    fn new(text: String, visible_len: usize) -> Self {
+        Self { text, visible_len }
+    }
+}
+
+pub fn print_table(headers: &[&str], rows: &[Vec<String>], color_choice: ColorChoice) {
+    let mut widths: Vec<usize> = headers.iter().map(|h| h.len()).collect();
+    for row in rows {
+        for (i, cell) in row.iter().enumerate() {
+            if i >= widths.len() {
+                widths.push(cell.len());
+            } else {
+                widths[i] = widths[i].max(cell.len());
+            }
+        }
+    }
+
+    let header_cells: Vec<TableCell> = headers
+        .iter()
+        .map(|h| TableCell::new(styled_header(h, color_choice), h.len()))
+        .collect();
+    println!("{}", format_table_row(&header_cells, &widths));
+
+    for row in rows {
+        let cells: Vec<TableCell> = row
+            .iter()
+            .enumerate()
+            .map(|(i, v)| TableCell::new(styled_value(i, v, color_choice), v.len()))
+            .collect();
+        println!("{}", format_table_row(&cells, &widths));
+    }
+}
+
+pub fn fingerprints_summary(fingerprints: &[Vec<u8>]) -> String {
+    if fingerprints.is_empty() {
+        return "-".to_string();
+    }
+
+    let first = hex_fingerprint_short(&fingerprints[0], 16);
+    if fingerprints.len() == 1 {
+        first
+    } else {
+        format!("{} (+{})", first, fingerprints.len() - 1)
+    }
+}
+
+fn format_table_row(cells: &[TableCell], widths: &[usize]) -> String {
+    let mut out = String::new();
+    for (i, cell) in cells.iter().enumerate() {
+        if i > 0 {
+            out.push_str("  ");
+        }
+        let width = widths.get(i).copied().unwrap_or(0);
+        out.push_str(&cell.text);
+        let padding = width.saturating_sub(cell.visible_len);
+        for _ in 0..padding {
+            out.push(' ');
+        }
+    }
+    out
+}
+
+fn styled_header(text: &str, color_choice: ColorChoice) -> String {
+    if matches!(color_choice, ColorChoice::Never) {
+        return text.to_string();
+    }
+    format!("{BOLD}{UNDERLINE}{YELLOW}{text}{RESET}")
+}
+
+fn styled_value(col: usize, text: &str, color_choice: ColorChoice) -> String {
+    if matches!(color_choice, ColorChoice::Never) {
+        return text.to_string();
+    }
+
+    if text == "-" {
+        return format!("{DIM}{text}{RESET}");
+    }
+
+    let color = match col {
+        0 => CYAN,
+        1 => GREEN,
+        _ => YELLOW,
+    };
+    format!("{color}{text}{RESET}")
+}
+
+fn hex_fingerprint_short(bytes: &[u8], max_bytes: usize) -> String {
+    let take = bytes.len().min(max_bytes);
+    let mut parts = Vec::with_capacity(take);
+    for b in &bytes[..take] {
+        parts.push(format!("{:02X}", b));
+    }
+    let mut s = parts.join(":");
+    if bytes.len() > take {
+        s.push_str(":...");
+    }
+    s
+}

client/src/main.rs

@@ -17,11 +17,13 @@ use libgsh::{
         },
     },
 };
+use std::io::IsTerminal;
 use std::process::exit;
 
 mod auth;
 mod client;
 mod config;
+mod display;
 mod network;
 
 #[derive(Parser, Debug)]
@@ -113,10 +115,18 @@ async fn main() {
                     println!("ID file created at {} for {}", path.display(), name);
                 }
                 IdCommand::List => {
-                    println!("ID files:");
-                    for (id_name, id_file) in id_files.files() {
-                        println!("- {}: {}", id_name, id_file.display());
-                    }
+                    let mut rows: Vec<(String, String)> = id_files
+                        .files()
+                        .into_iter()
+                        .map(|(name, path)| (name, path.display().to_string()))
+                        .collect();
+                    rows.sort_by(|a, b| a.0.cmp(&b.0));
+
+                    let table_rows: Vec<Vec<String>> = rows
+                        .into_iter()
+                        .map(|(name, path)| vec![name, path])
+                        .collect();
+                    display::print_table(&["NAME", "PATH"], &table_rows, color_choice);
                 }
                 IdCommand::Verify { name } => {
                     const MESSAGE: &[u8] = b"test";
@@ -141,10 +151,22 @@ async fn main() {
             },
             Command::Host { command } => match command {
                 HostCommand::List => {
-                    println!("Known hosts:");
-                    for host in known_hosts.hosts {
-                        println!("Host: {}, Fingerprints: {:?}", host.host, host.fingerprints);
-                    }
+                    let mut rows: Vec<(String, String, String)> = known_hosts
+                        .hosts
+                        .iter()
+                        .map(|h| {
+                            let fp = display::fingerprints_summary(&h.fingerprints);
+                            let id = h.id_file_ref.clone().unwrap_or_else(|| "-".to_string());
+                            (h.host.clone(), id, fp)
+                        })
+                        .collect();
+                    rows.sort_by(|a, b| a.0.cmp(&b.0));
+
+                    let table_rows: Vec<Vec<String>> = rows
+                        .into_iter()
+                        .map(|(host, id, fp)| vec![host, id, fp])
+                        .collect();
+                    display::print_table(&["HOST", "ID", "FINGERPRINT"], &table_rows, color_choice);
                 }
             },
         }
@@ -222,6 +244,9 @@ fn color_choice() -> ColorChoice {
     if matches!(std::env::var("TERM").as_deref(), Ok("dumb")) {
         return ColorChoice::Never;
     }
+    if !std::io::stdout().is_terminal() {
+        return ColorChoice::Never;
+    }
     ColorChoice::Always
 }