Merge #620

620: Use tabled to show status messages r=foresterre a=foresterre Practical alignment, without left-pad fmt module related headaches. Co-authored-by: Martijn Gribnau <[email protected]>
foresterre · Feb 10, 2023 · f4e16ba · f4e16ba
2 parents 927b14b + 5710d01
commit f4e16ba
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/src/formatting.rs b/src/formatting.rs
@@ -8,11 +8,15 @@ pub struct TermWidth;
 
 impl TermWidth {
     pub fn width() -> usize {
-        *TERM_WIDTH.get_or_init(|| {
+        let minimum = 40;
+
+        let width = *TERM_WIDTH.get_or_init(|| {
             terminal_size::terminal_size()
                 .map(|(w, _)| w.0)
                 .unwrap_or(80) as usize
-        })
+        });
+
+        width.checked_sub(2).unwrap_or(minimum)
     }
 }
 

diff --git a/src/reporter/handler/human_progress_handler.rs b/src/reporter/handler/human_progress_handler.rs
@@ -7,7 +7,7 @@ use std::sync::atomic::{AtomicU32, Ordering};
 use std::time::Duration;
 use storyteller::EventHandler;
 use tabled::builder::Builder;
-use tabled::object::{Rows, Segment};
+use tabled::object::{Columns, Rows, Segment};
 use tabled::{Alignment, Disable, Margin, Modify, Style, Table, Width};
 
 pub struct HumanProgressHandler {
@@ -168,30 +168,47 @@ struct Status;
 impl Status {
     fn meta(message: impl Display) -> String {
         let lead = format!("[{}]", "Meta".bright_blue());
-        format!("  {:>16}  {}", lead, message)
+        status(lead, message)
     }
 
     fn ok(message: impl Display) -> String {
         let lead = format!("[{}]", "OK".bright_green());
-        format!("  {:>16}  {}", lead, message)
+
+        status(lead, message)
     }
 
     fn fail(message: impl Display) -> String {
         let lead = format!("[{}]", "FAIL".bright_red());
-        format!("  {:>16}  {}", lead, message)
+
+        status(lead, message)
     }
 
     fn info(message: impl Display) -> String {
         let lead = format!("[{}]", "INFO".bright_yellow());
-        format!("  {:>16}  {}", lead, message)
+        status(lead, message)
     }
 
     fn with_lead(lead: impl Display, message: impl Display) -> String {
         let lead = format!("[{}]", lead);
-        format!("  {:>16}  {}", lead, message)
+        status(lead, message)
     }
 }
 
+fn status(lead: impl Display, message: impl Display) -> String {
+    let mut builder = Builder::default();
+    builder.add_record([format!("{lead}"), format!("{message}")]);
+
+    let mut table = builder.build();
+
+    table
+        .with(Alignment::left())
+        .with(Modify::new(Columns::first()).with(Width::increase(6)))
+        .with(Width::wrap(TermWidth::width()))
+        .with(Style::blank())
+        .with(Margin::new(1, 0, 0, 0))
+        .to_string()
+}
+
 fn message_box(message: &str) -> String {
     let mut builder = Builder::default();
     builder.add_record([format!("{}", message.dimmed())]);