X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/b4bc28bae91f901f88fdad4621b14da9eb18be06..1ca87bfadfa61703dde1cfc224cec881a68a4f56:/src/lib.rs?ds=inline diff --git a/src/lib.rs b/src/lib.rs index 99c454d..3f3dde5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,10 +4,19 @@ use std::fmt::Write; use std::io::BufRead; use std::iter::Iterator; +fn tally_marks(n: usize) -> String { + let fives = { 0..n / 5 }.map(|_| '𝍸'); + let ones = { 0..n % 5 }.map(|_| '𝍷'); + fives.chain(ones).collect() +} + #[derive(PartialEq, Eq, Debug)] struct Config { column_threshold: usize, static_columns: Vec>, + hidden_columns: HashSet, + substitute_labels: HashMap, + mark: HashMap, } impl Config { fn apply_command(&mut self, line_num: usize, cmd: &str) -> Result<(), std::io::Error> { @@ -18,10 +27,24 @@ impl Config { format!("line {line_num}: col_threshold must be numeric: {e}"), ) })?; + } else if let Some(col) = cmd.strip_prefix("hide ") { + self.hidden_columns.insert(col.to_owned()); } else if let Some(col) = cmd.strip_prefix("col ") { self.static_columns.push(Some(col.to_owned())); } else if cmd == "colsep" { self.static_columns.push(None); + } else if let Some(directive) = cmd.strip_prefix("label ") { + match directive.split_once(':') { + None => { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidInput, + format!("line {line_num}: Annotation missing ':'"), + )) + } + Some((col, label)) => self + .substitute_labels + .insert(col.to_owned(), label.to_owned()), + }; } else { return Err(std::io::Error::new( std::io::ErrorKind::InvalidInput, @@ -36,6 +59,9 @@ impl Default for Config { Self { column_threshold: 2, static_columns: vec![], + hidden_columns: HashSet::new(), + substitute_labels: HashMap::new(), + mark: HashMap::new(), } } } @@ -58,7 +84,7 @@ const HEADER: &str = r#" tr.key > th > div > div { width: 5em; transform-origin: bottom left; transform: translateX(1em) rotate(-65deg) } td { border: thin solid gray; } td.leftover { text-align: left; border: none; padding-left: .4em; } - td.yes { border: thin solid gray; background-color: #ddd; } + td.yes { border: thin solid gray; background-color: #eee; } /* 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; } @@ -253,68 +279,94 @@ fn column_order(config: &Config, rows: &[Rowlike]) -> Vec { column_counts(rows) .into_iter() .filter_map(|(n, col)| { - (n >= config.column_threshold && !static_columns.contains(col.as_str())).then_some(col) + (n >= config.column_threshold + && !static_columns.contains(col.as_str()) + && !config.hidden_columns.contains(&col)) + .then_some(col) }) .collect() } -fn render_one_instance(instance: &Option) -> HTML { - match instance { - None => HTML::from("✓"), - Some(instance) => HTML::escape(instance.as_ref()), - } -} - fn render_instances(instances: &[Option]) -> HTML { - let all_empty = instances.iter().all(Option::is_none); - if all_empty && instances.len() == 1 { - HTML::from("") - } else if all_empty { - HTML(format!("{}", instances.len())) - } else { - HTML( - instances - .iter() - .map(render_one_instance) - .map(|html| html.0) // Waiting for slice_concat_trait to stabilize - .collect::>() - .join(" "), - ) + let mut tally = 0; + let mut out = vec![]; + for ins in instances { + match ins { + None => tally += 1, + Some(content) => { + if tally > 0 { + out.push(HTML(tally_marks(tally))); + tally = 0; + } + out.push(HTML::escape(content)); + } + } + } + if tally > 0 { + out.push(HTML(tally_marks(tally))); } + HTML( + out.into_iter() + .map(|html| html.0) // Waiting for slice_concat_trait to stabilize + .collect::>() + .join(" "), + ) } -fn render_cell(col: &str, row: &mut Row) -> HTML { +fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML { let row_label = HTML::escape(row.label.as_ref()); - let col_label = HTML::escape(col); + let col_label = HTML::escape( + config + .substitute_labels + .get(col) + .map_or(col, std::string::String::as_str), + ); let instances: Option<&Vec>> = row.entries.get(col); - let class = HTML::from(if instances.is_none() { "" } else { "yes" }); + let is_empty = match instances { + None => true, + Some(is) => is.iter().all(|ins| match ins { + None => false, + Some(content) => content == "×", + }), + }; + let class = HTML::from(if is_empty { "" } else { r#" class="yes""# }); let contents = match instances { None => HTML::from(""), Some(is) => render_instances(is), }; row.entries.remove(col); HTML(format!( - r#"{contents}"# + r#"{contents}"# )) } -fn render_leftover(notcol: &str, instances: &[Option]) -> HTML { +fn render_leftover(config: &Config, notcol: &str, instances: &[Option]) -> HTML { let label = HTML::escape(notcol); - let rest = render_instances(instances); - if rest == HTML::from("") { + if instances.len() == 1 && instances[0].is_none() { HTML(format!("{label}")) } else { + let rest = render_instances(instances); HTML(format!("{label}: {rest}")) } } fn render_all_leftovers(config: &Config, row: &Row) -> HTML { - let mut order: Vec<_> = row.entries.keys().collect(); + let mut order: Vec<_> = row + .entries + .keys() + .filter(|&col| !config.hidden_columns.contains(col)) + .collect(); order.sort_unstable(); HTML( order .into_iter() - .map(|notcol| render_leftover(notcol, row.entries.get(notcol).expect("Key vanished?!"))) + .map(|notcol| { + render_leftover( + config, + notcol, + row.entries.get(notcol).expect("Key vanished?!"), + ) + }) .map(|html| html.0) // Waiting for slice_concat_trait to stabilize .collect::>() .join(", "), @@ -330,13 +382,15 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM .static_columns .iter() .map(|ocol| match ocol { - Some(col) => render_cell(col, row), + Some(col) if config.hidden_columns.contains(col) => HTML::from(""), + Some(col) => render_cell(config, col, row), None => HTML::from(r#""#), }) .collect::(); let dynamic_cells = columns .iter() - .map(|col| render_cell(col, row)) + .filter(|&col| !config.hidden_columns.contains(col)) + .map(|col| render_cell(config, col, row)) .collect::(); let leftovers = render_all_leftovers(config, row); HTML(format!( @@ -346,27 +400,40 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM } } -fn render_column_headers(config: &Config, columns: &[String]) -> HTML { +fn column_header_labels<'a>( + config: &'a Config, + columns: &'a [String], +) -> impl Iterator> { let static_columns = config.static_columns.iter().map(|oc| oc.as_ref()); let dynamic_columns = columns.iter().map(Some); + static_columns + .chain(dynamic_columns) + .filter(|ocol| ocol.map_or(true, |col| !config.hidden_columns.contains(col))) + .map(|ocol| { + ocol.map(|col| match config.substitute_labels.get(col) { + None => col, + Some(substitute) => substitute, + }) + }) +} + +fn render_column_headers(config: &Config, columns: &[String]) -> HTML { HTML( String::from(r#""#) - + &static_columns - .chain(dynamic_columns) - .fold(String::new(), |mut acc, ocol| { - match ocol { - Some(col) => { - let col_header = HTML::escape(col); - write!( - &mut acc, - r#"
{col_header}
"# - ) - } - None => write!(&mut acc, r#""#), + + &column_header_labels(config, columns).fold(String::new(), |mut acc, ocol| { + match ocol { + Some(col) => { + let col_header = HTML::escape(col); + write!( + &mut acc, + r#"
{col_header}
"# + ) } - .unwrap(); - acc - }) + None => write!(&mut acc, r#""#), + } + .unwrap(); + acc + }) + "\n", ) } @@ -422,6 +489,21 @@ mod tests { ); } + #[test] + fn test_tally_marks() { + assert_eq!(tally_marks(1), "𝍷"); + assert_eq!(tally_marks(2), "𝍷𝍷"); + assert_eq!(tally_marks(3), "𝍷𝍷𝍷"); + assert_eq!(tally_marks(4), "𝍷𝍷𝍷𝍷"); + assert_eq!(tally_marks(5), "𝍸"); + assert_eq!(tally_marks(6), "𝍸𝍷"); + assert_eq!(tally_marks(7), "𝍸𝍷𝍷"); + assert_eq!(tally_marks(8), "𝍸𝍷𝍷𝍷"); + assert_eq!(tally_marks(9), "𝍸𝍷𝍷𝍷𝍷"); + assert_eq!(tally_marks(10), "𝍸𝍸"); + assert_eq!(tally_marks(11), "𝍸𝍸𝍷"); + } + fn read_rows(input: impl std::io::Read) -> Result, std::io::Error> { read_input(input).map(|(rows, _)| rows) } @@ -543,6 +625,12 @@ mod tests { read_config(&b"!col foo"[..]).unwrap().static_columns, vec![Some("foo".to_owned())] ); + assert_eq!( + read_config(&b"!label foo:bar"[..]) + .unwrap() + .substitute_labels["foo"], + "bar" + ); let bad_command = read_config(&b"!no such command"[..]); assert!(bad_command.is_err()); @@ -551,6 +639,10 @@ mod tests { let bad_num = read_config(&b"!col_threshold foo"[..]); assert!(bad_num.is_err()); assert!(format!("{bad_num:?}").contains("line 1: col_threshold must be numeric")); + + let bad_sub = read_config(&b"!label foo"[..]); + assert!(bad_sub.is_err()); + assert!(format!("{bad_sub:?}").contains("line 1: Annotation missing ':'")); } #[test] @@ -575,10 +667,43 @@ mod tests { ); } + #[test] + fn test_column_header_labels() { + let mut cfg = Config::default(); + + assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([Some(&"foo".to_owned())])); + + cfg.static_columns.push(Some("bar".to_owned())); + assert!(column_header_labels(&cfg, &["foo".to_owned()]) + .eq([Some(&"bar".to_owned()), Some(&"foo".to_owned())])); + + cfg.static_columns.push(None); + assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([ + Some(&"bar".to_owned()), + None, + Some(&"foo".to_owned()) + ])); + + cfg.substitute_labels + .insert("foo".to_owned(), "foo (bits)".to_owned()); + assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([ + Some(&"bar".to_owned()), + None, + Some(&"foo (bits)".to_owned()) + ])); + + cfg.hidden_columns.insert("foo".to_owned()); + assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([Some(&"bar".to_owned()), None])); + + cfg.hidden_columns.insert("bar".to_owned()); + assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([None])); + } + #[test] fn test_render_cell() { assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -586,11 +711,12 @@ mod tests { } ), HTML::from( - r#""# + r#""# ) ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -598,11 +724,12 @@ mod tests { } ), HTML::from( - r#""# + r#""# ) ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -610,11 +737,12 @@ mod tests { } ), HTML::from( - r#""# + r#"𝍷"# ) ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -622,11 +750,12 @@ mod tests { } ), HTML::from( - r#"2"# + r#"𝍷𝍷"# ) ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -642,6 +771,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -649,11 +779,25 @@ mod tests { } ), HTML::from( - r#"5 ✓"# + r#"5 𝍷"# + ) + ); + assert_eq!( + render_cell( + &Config::default(), + "foo", + &mut Row { + label: "nope".to_owned(), + entries: HashMap::from([("foo".to_owned(), vec![Some("×".to_owned())])]), + } + ), + HTML::from( + r#"×"# ) ); assert_eq!( render_cell( + &Config::default(), "heart", &mut Row { label: "nope".to_owned(), @@ -666,6 +810,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "bob's".to_owned(), @@ -673,7 +818,7 @@ mod tests { } ), HTML::from( - r#""# + r#"𝍷"# ) ); let mut r = Row { @@ -684,11 +829,11 @@ mod tests { ]), }; assert_eq!(r.entries.len(), 2); - render_cell("foo", &mut r); + render_cell(&Config::default(), "foo", &mut r); assert_eq!(r.entries.len(), 1); - render_cell("bar", &mut r); + render_cell(&Config::default(), "bar", &mut r); assert_eq!(r.entries.len(), 1); - render_cell("baz", &mut r); + render_cell(&Config::default(), "baz", &mut r); assert_eq!(r.entries.len(), 0); } @@ -728,7 +873,23 @@ mod tests { ]), } ), - HTML::from("bar: 2, foo") + HTML::from("bar: 𝍷𝍷, foo") + ); + assert_eq!( + render_all_leftovers( + &Config { + column_threshold: 2, + static_columns: vec![], + hidden_columns: HashSet::from(["private".to_owned()]), + substitute_labels: HashMap::new(), + mark: HashMap::new(), + }, + &Row { + label: "nope".to_owned(), + entries: HashMap::from([("private".to_owned(), vec![None]),]), + } + ), + HTML::from("") ); } @@ -744,7 +905,7 @@ mod tests { }) ), HTML::from( - r#"nopebar + r#"nopebar "# ) ); @@ -753,6 +914,9 @@ mod tests { &Config { column_threshold: 0, static_columns: vec![Some("foo".to_owned()), Some("bar".to_owned())], + hidden_columns: HashSet::new(), + substitute_labels: HashMap::new(), + mark: HashMap::new(), }, &["baz".to_owned()], &mut Rowlike::Row(Row { @@ -774,6 +938,9 @@ mod tests { &Config { column_threshold: 0, static_columns: vec![Some("foo".to_owned()), None, Some("bar".to_owned())], + hidden_columns: HashSet::new(), + substitute_labels: HashMap::new(), + mark: HashMap::new(), }, &[], &mut Rowlike::Row(Row { @@ -786,6 +953,66 @@ mod tests { ), HTML::from( r#"nopefr +"# + ) + ); + assert_eq!( + render_row( + &Config { + column_threshold: 0, + static_columns: vec![], + hidden_columns: HashSet::from(["foo".to_owned()]), + substitute_labels: HashMap::new(), + mark: HashMap::new(), + }, + &[], + &mut Rowlike::Row(Row { + label: "nope".to_owned(), + entries: HashMap::from([("foo".to_owned(), vec![Some("f".to_owned())]),]), + }) + ), + HTML::from( + r#"nope +"# + ) + ); + assert_eq!( + render_row( + &Config { + column_threshold: 0, + static_columns: vec![Some("foo".to_owned())], + hidden_columns: HashSet::from(["foo".to_owned()]), + substitute_labels: HashMap::new(), + mark: HashMap::new(), + }, + &[], + &mut Rowlike::Row(Row { + label: "nope".to_owned(), + entries: HashMap::from([("foo".to_owned(), vec![Some("f".to_owned())]),]), + }) + ), + HTML::from( + r#"nope +"# + ) + ); + assert_eq!( + render_row( + &Config { + column_threshold: 0, + static_columns: vec![], + hidden_columns: HashSet::new(), + substitute_labels: HashMap::from([("foo".to_owned(), "bar".to_owned())]), + mark: HashMap::new(), + }, + &["foo".to_owned()], + &mut Rowlike::Row(Row { + label: "nope".to_owned(), + entries: HashMap::from([("foo".to_owned(), vec![None])]), + }) + ), + HTML::from( + r#"nope𝍷 "# ) );