X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/76638ea1debd36a19c5702d22cc50b1e79f44570..92476edc57b23a42c640f55f3a00b69bbee809b5:/src/lib.rs diff --git a/src/lib.rs b/src/lib.rs index 5de1c12..2e9bfcc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,5 @@ use std::collections::{HashMap, HashSet}; +use std::fmt::Write; use std::io::BufRead; use std::iter::Iterator; @@ -17,7 +18,7 @@ const HEADER: &str = " tr.key > th > div > div { width: 5em; transform-origin: bottom left; transform: translateX(1em) rotate(-65deg) } td { border: thin solid gray; } td.numeric { text-align: right; } - td.yes { border: thin solid gray; background-color: gray; } + td.yes { border: thin solid gray; background-color: #ddd; } td.spacer { border: none; } /* h/t https://stackoverflow.com/questions/5687035/css-bolding-some-text-without-changing-its-containers-size/46452396#46452396 */ .highlight { text-shadow: -0.06ex 0 black, 0.06ex 0 black; } @@ -158,6 +159,7 @@ fn render_instance(entry: &Entry) -> String { fn render_cell(col: &str, row: &RowInput) -> String { // TODO: Escape HTML special characters + let row_label = &row.label; let entries: Vec<&Entry> = row.entries.iter().filter(|e| e.col == col).collect(); let class = if entries.is_empty() { "" } else { "yes" }; let all_empty = entries.iter().all(|e| e.instance.is_none()); @@ -171,15 +173,15 @@ fn render_cell(col: &str, row: &RowInput) -> String { .map(|i| render_instance(i)) .collect::() }; - format!("{}", contents.trim()) + format!("{}", contents.trim()) } fn render_row(columns: &[String], row: &RowInput) -> String { // This is O(n^2) & doesn't need to be // TODO: Escape HTML special characters + let row_label = &row.label; format!( - "{}{}\n", - row.label, + "{row_label}{}\n", &columns .iter() .map(|col| render_cell(col, row)) @@ -189,12 +191,12 @@ fn render_row(columns: &[String], row: &RowInput) -> String { fn render_column_headers(columns: &[String]) -> String { // TODO: Escape HTML special characters - String::from("") - + &columns - .iter() - .map(|c| format!("{c}")) - .collect::() - + "\n" + String::from("") + + &columns.iter().fold(String::new(), |mut acc, c| { + write!(&mut acc, "
{c}
").unwrap(); + acc + }) + + "\n" } /// # Errors @@ -384,7 +386,7 @@ mod tests { entries: vec![] } ), - String::from("") + String::from("") ); assert_eq!( render_cell( @@ -394,7 +396,7 @@ mod tests { entries: vec![Entry::from("bar")] } ), - String::from("") + String::from("") ); assert_eq!( render_cell( @@ -404,7 +406,7 @@ mod tests { entries: vec![Entry::from("foo")] } ), - String::from("") + String::from("") ); assert_eq!( render_cell( @@ -414,7 +416,7 @@ mod tests { entries: vec![Entry::from("foo"), Entry::from("foo")] } ), - String::from("2") + String::from("2") ); assert_eq!( render_cell( @@ -424,7 +426,7 @@ mod tests { entries: vec![Entry::from("foo: 5"), Entry::from("foo: 10")] } ), - String::from("5 10") + String::from("5 10") ); assert_eq!( render_cell( @@ -434,7 +436,7 @@ mod tests { entries: vec![Entry::from("foo: 5"), Entry::from("foo")] } ), - String::from("5 ✓") + String::from("5 ✓") ); } }