X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/b59ad4335c434a858a991137445fd34aaa4c6b21..cd56923ccd7e883fda4b700bd4ca6b2d2df8f307:/src/lib.rs diff --git a/src/lib.rs b/src/lib.rs index d85de02..23667a1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,10 +4,15 @@ 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() +fn tally_marks(n: usize, mark: Option<&str>) -> String { + match mark { + None => { + let fives = { 0..n / 5 }.map(|_| '𝍸'); + let ones = { 0..n % 5 }.map(|_| '𝍷'); + fives.chain(ones).collect() + } + Some(m) => { 0..n }.map(|_| m).collect(), + } } #[derive(PartialEq, Eq, Debug)] @@ -16,6 +21,7 @@ struct Config { 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> { @@ -44,6 +50,16 @@ impl Config { .substitute_labels .insert(col.to_owned(), label.to_owned()), }; + } else if let Some(directive) = cmd.strip_prefix("mark ") { + match directive.split_once(':') { + None => { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidInput, + format!("line {line_num}: Mark missing ':'"), + )) + } + Some((col, label)) => self.mark.insert(col.to_owned(), label.to_owned()), + }; } else { return Err(std::io::Error::new( std::io::ErrorKind::InvalidInput, @@ -60,6 +76,7 @@ impl Default for Config { static_columns: vec![], hidden_columns: HashSet::new(), substitute_labels: HashMap::new(), + mark: HashMap::new(), } } } @@ -82,7 +99,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; } @@ -190,9 +207,7 @@ impl<'cfg, Input: Iterator>> Reader<'cfg, } } } -impl<'cfg, Input: Iterator>> Iterator - for Reader<'cfg, Input> -{ +impl>> Iterator for Reader<'_, Input> { type Item = Result; fn next(&mut self) -> Option { loop { @@ -209,7 +224,7 @@ impl<'cfg, Input: Iterator>> Iterator return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose() } InputLine::Blank => return Some(Ok(Rowlike::Spacer)), - InputLine::Entry(col, instance) => match &mut self.row { + InputLine::Entry(col, instance) => match self.row { None => { return Some(Err(std::io::Error::other(format!( "line {}: Entry with no header", @@ -251,8 +266,8 @@ fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> { let empty = HashMap::new(); let mut counts: Vec<_> = rows .iter() - .flat_map(|rl| match rl { - Rowlike::Row(r) => r.entries.keys(), + .flat_map(|rl| match *rl { + Rowlike::Row(ref r) => r.entries.keys(), Rowlike::Spacer => empty.keys(), }) .fold(HashMap::new(), |mut cs, col| { @@ -264,7 +279,7 @@ fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> { .into_iter() .map(|(col, n)| (n, col)) .collect(); - counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol))); + counts.sort_unstable_by(|a, b| b.0.cmp(&a.0).then(a.1.cmp(&b.1))); counts } fn column_order(config: &Config, rows: &[Rowlike]) -> Vec { @@ -285,15 +300,15 @@ fn column_order(config: &Config, rows: &[Rowlike]) -> Vec { .collect() } -fn render_instances(instances: &[Option]) -> HTML { +fn render_instances(instances: &[Option], mark: Option<&str>) -> HTML { let mut tally = 0; let mut out = vec![]; for ins in instances { - match ins { + match *ins { None => tally += 1, - Some(content) => { + Some(ref content) => { if tally > 0 { - out.push(HTML(tally_marks(tally))); + out.push(HTML(tally_marks(tally, mark))); tally = 0; } out.push(HTML::escape(content)); @@ -301,7 +316,7 @@ fn render_instances(instances: &[Option]) -> HTML { } } if tally > 0 { - out.push(HTML(tally_marks(tally))); + out.push(HTML(tally_marks(tally, mark))); } HTML( out.into_iter() @@ -311,21 +326,26 @@ fn render_instances(instances: &[Option]) -> HTML { ) } -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 is_empty = match instances { None => true, - Some(is) => is.iter().all(|ins| match ins { + Some(is) => is.iter().all(|ins| match *ins { None => false, - Some(content) => content == "×", + Some(ref 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), + Some(is) => render_instances(is, config.mark.get(col).map(String::as_str)), }; row.entries.remove(col); HTML(format!( @@ -333,12 +353,12 @@ fn render_cell(col: &str, row: &mut Row) -> HTML { )) } -fn render_leftover(notcol: &str, instances: &[Option]) -> HTML { +fn render_leftover(config: &Config, notcol: &str, instances: &[Option]) -> HTML { let label = HTML::escape(notcol); if instances.len() == 1 && instances[0].is_none() { HTML(format!("{label}")) } else { - let rest = render_instances(instances); + let rest = render_instances(instances, config.mark.get(notcol).map(String::as_str)); HTML(format!("{label}: {rest}")) } } @@ -353,7 +373,13 @@ fn render_all_leftovers(config: &Config, row: &Row) -> HTML { 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(", "), @@ -361,23 +387,23 @@ fn render_all_leftovers(config: &Config, row: &Row) -> HTML { } fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTML { - match rowlike { + match *rowlike { Rowlike::Spacer => HTML::from("\n"), - Rowlike::Row(row) => { + Rowlike::Row(ref mut row) => { let row_label = HTML::escape(row.label.as_ref()); let static_cells = config .static_columns .iter() - .map(|ocol| match ocol { - Some(col) if config.hidden_columns.contains(col) => HTML::from(""), - Some(col) => render_cell(col, row), + .map(|ocol| match *ocol { + Some(ref col) if config.hidden_columns.contains(col) => HTML::from(""), + Some(ref col) => render_cell(config, col, row), None => HTML::from(r#""#), }) .collect::(); let dynamic_cells = columns .iter() .filter(|&col| !config.hidden_columns.contains(col)) - .map(|col| render_cell(col, row)) + .map(|col| render_cell(config, col, row)) .collect::(); let leftovers = render_all_leftovers(config, row); HTML(format!( @@ -395,7 +421,7 @@ fn column_header_labels<'a>( let dynamic_columns = columns.iter().map(Some); static_columns .chain(dynamic_columns) - .filter(|ocol| ocol.map_or(true, |col| !config.hidden_columns.contains(col))) + .filter(|ocol| ocol.is_none_or(|col| !config.hidden_columns.contains(col))) .map(|ocol| { ocol.map(|col| match config.substitute_labels.get(col) { None => col, @@ -431,7 +457,7 @@ fn render_column_headers(config: &Config, columns: &[String]) -> HTML { /// * there's an i/o error while reading `input` /// * the log has invalid syntax: /// * an indented line with no preceding non-indented line -pub fn tablify(input: impl std::io::Read) -> Result { +pub fn tablify(input: R) -> Result { let (rows, config) = read_input(input)?; let columns = column_order(&config, &rows); Ok(HTML(format!( @@ -478,17 +504,22 @@ 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), "𝍸𝍸𝍷"); + assert_eq!(tally_marks(1, None), "𝍷"); + assert_eq!(tally_marks(2, None), "𝍷𝍷"); + assert_eq!(tally_marks(3, None), "𝍷𝍷𝍷"); + assert_eq!(tally_marks(4, None), "𝍷𝍷𝍷𝍷"); + assert_eq!(tally_marks(5, None), "𝍸"); + assert_eq!(tally_marks(6, None), "𝍸𝍷"); + assert_eq!(tally_marks(7, None), "𝍸𝍷𝍷"); + assert_eq!(tally_marks(8, None), "𝍸𝍷𝍷𝍷"); + assert_eq!(tally_marks(9, None), "𝍸𝍷𝍷𝍷𝍷"); + assert_eq!(tally_marks(10, None), "𝍸𝍸"); + assert_eq!(tally_marks(11, None), "𝍸𝍸𝍷"); + assert_eq!(tally_marks(1, Some("x")), "x"); + assert_eq!(tally_marks(4, Some("x")), "xxxx"); + assert_eq!(tally_marks(5, Some("x")), "xxxxx"); + assert_eq!(tally_marks(6, Some("x")), "xxxxxx"); + assert_eq!(tally_marks(2, Some("🍔")), "🍔🍔"); } fn read_rows(input: impl std::io::Read) -> Result, std::io::Error> { @@ -618,6 +649,7 @@ mod tests { .substitute_labels["foo"], "bar" ); + assert_eq!(read_config(&b"!mark foo:*"[..]).unwrap().mark["foo"], "*"); let bad_command = read_config(&b"!no such command"[..]); assert!(bad_command.is_err()); @@ -630,6 +662,10 @@ mod tests { let bad_sub = read_config(&b"!label foo"[..]); assert!(bad_sub.is_err()); assert!(format!("{bad_sub:?}").contains("line 1: Annotation missing ':'")); + + let bad_mark = read_config(&b"!mark foo"[..]); + assert!(bad_mark.is_err()); + assert!(format!("{bad_mark:?}").contains("line 1: Mark missing ':'")); } #[test] @@ -690,6 +726,7 @@ mod tests { fn test_render_cell() { assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -702,6 +739,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -714,6 +752,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -726,6 +765,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -738,6 +778,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -753,6 +794,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -765,6 +807,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -777,6 +820,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "heart", &mut Row { label: "nope".to_owned(), @@ -789,6 +833,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "bob's".to_owned(), @@ -799,6 +844,26 @@ mod tests { r#"𝍷"# ) ); + assert_eq!( + render_cell( + &Config { + column_threshold: 2, + static_columns: vec![], + hidden_columns: HashSet::new(), + substitute_labels: HashMap::new(), + mark: HashMap::from([("foo".to_owned(), "🦄".to_owned())]), + }, + "foo", + &mut Row { + label: "nope".to_owned(), + entries: HashMap::from([("foo".to_owned(), vec![None])]), + } + ), + HTML::from( + r#"🦄"# + ) + ); + let mut r = Row { label: "nope".to_owned(), entries: HashMap::from([ @@ -807,11 +872,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); } @@ -860,6 +925,7 @@ mod tests { static_columns: vec![], hidden_columns: HashSet::from(["private".to_owned()]), substitute_labels: HashMap::new(), + mark: HashMap::new(), }, &Row { label: "nope".to_owned(), @@ -868,6 +934,22 @@ mod tests { ), HTML::from("") ); + assert_eq!( + render_all_leftovers( + &Config { + column_threshold: 2, + static_columns: vec![], + hidden_columns: HashSet::new(), + substitute_labels: HashMap::new(), + mark: HashMap::from([("foo".to_owned(), "🌈".to_owned())]), + }, + &Row { + label: "nope".to_owned(), + entries: HashMap::from([("foo".to_owned(), vec![None, None])]), + } + ), + HTML::from("foo: 🌈🌈") + ); } #[test] @@ -893,6 +975,7 @@ mod tests { 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 { @@ -916,6 +999,7 @@ mod tests { 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 { @@ -938,6 +1022,7 @@ mod tests { static_columns: vec![], hidden_columns: HashSet::from(["foo".to_owned()]), substitute_labels: HashMap::new(), + mark: HashMap::new(), }, &[], &mut Rowlike::Row(Row { @@ -957,6 +1042,7 @@ mod tests { 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 { @@ -966,6 +1052,26 @@ mod tests { ), 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𝍷 "# ) );