X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/58c0a717743d262025e664eb6ce79ad9cd4c7968..722ea29747d6e820490db0bf988cda86c3341565:/src/lib.rs?ds=inline diff --git a/src/lib.rs b/src/lib.rs index f1da5f7..e11f08b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,7 +4,9 @@ use std::fmt::Write; use std::io::BufRead; use std::iter::Iterator; -pub struct Config {} +pub struct Config { + pub column_threshold: usize, +} const HEADER: &str = r#" @@ -21,6 +23,7 @@ const HEADER: &str = r#" tr.key > th > div { width: 1em; } 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; } /* 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; } @@ -106,6 +109,12 @@ struct Row { entries: HashMap>>, } +#[derive(Debug, PartialEq, Eq)] +enum Rowlike { + Row(Row), + Spacer, +} + struct Reader>> { input: std::iter::Enumerate, row: Option, @@ -119,15 +128,15 @@ impl>> Reader { } } impl>> Iterator for Reader { - type Item = Result; + type Item = Result; fn next(&mut self) -> Option { loop { match self.input.next() { - None => return Ok(std::mem::take(&mut self.row)).transpose(), + None => return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose(), Some((_, Err(e))) => return Some(Err(e)), Some((n, Ok(line))) => match InputLine::from(line.as_ref()) { InputLine::Blank if self.row.is_some() => { - return Ok(std::mem::take(&mut self.row)).transpose() + return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose() } InputLine::Blank => {} InputLine::Entry(col, instance) => match &mut self.row { @@ -151,7 +160,7 @@ impl>> Iterator for Reader entries: HashMap::new(), }); if prev.is_some() { - return Ok(prev).transpose(); + return Ok(prev.map(Rowlike::Row)).transpose(); } } }, @@ -160,14 +169,18 @@ impl>> Iterator for Reader } } -fn read_rows(input: impl std::io::Read) -> impl Iterator> { +fn read_rows(input: impl std::io::Read) -> impl Iterator> { Reader::new(std::io::BufReader::new(input).lines()) } -fn column_counts(rows: &[Row]) -> Vec<(usize, String)> { +fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> { + let empty = HashMap::new(); let mut counts: Vec<_> = rows .iter() - .flat_map(|r| r.entries.keys()) + .flat_map(|rl| match rl { + Rowlike::Row(r) => r.entries.keys(), + Rowlike::Spacer => empty.keys(), + }) .fold(HashMap::new(), |mut cs, col| { cs.entry(col.to_owned()) .and_modify(|n| *n += 1) @@ -180,10 +193,10 @@ fn column_counts(rows: &[Row]) -> Vec<(usize, String)> { counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol))); counts } -fn column_order(rows: &[Row]) -> Vec { +fn column_order(config: &Config, rows: &[Rowlike]) -> Vec { column_counts(rows) .into_iter() - .map(|(_, col)| col) + .filter_map(|(n, col)| (n >= config.column_threshold).then_some(col)) .collect() } @@ -194,29 +207,32 @@ fn render_one_instance(instance: &Option) -> HTML { } } -fn render_cell(col: &str, row: &mut Row) -> HTML { - let row_label = HTML::escape(row.label.as_ref()); - let col_label = HTML::escape(col); - let instances: Option<&Vec>> = row.entries.get(col); - let class = HTML::from(if instances.is_none() { "" } else { "yes" }); - let all_empty = instances - .iter() - .flat_map(|is| is.iter()) - .all(Option::is_none); - let contents = if instances.is_none() || (all_empty && instances.unwrap().len() == 1) { +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.unwrap().len())) + HTML(format!("{}", instances.len())) } else { HTML( instances - .unwrap() .iter() .map(render_one_instance) .map(|html| html.0) // Waiting for slice_concat_trait to stabilize .collect::>() .join(" "), ) + } +} + +fn render_cell(col: &str, row: &mut Row) -> HTML { + let row_label = HTML::escape(row.label.as_ref()); + let col_label = HTML::escape(col); + let instances: Option<&Vec>> = row.entries.get(col); + let class = HTML::from(if instances.is_none() { "" } else { "yes" }); + let contents = match instances { + None => HTML::from(""), + Some(is) => render_instances(is), }; row.entries.remove(col); HTML(format!( @@ -224,15 +240,44 @@ fn render_cell(col: &str, row: &mut Row) -> HTML { )) } -fn render_row(columns: &[String], row: &mut Row) -> HTML { - let row_label = HTML::escape(row.label.as_ref()); - let cells = columns - .iter() - .map(|col| render_cell(col, row)) - .collect::(); - HTML(format!( - "{row_label}{cells}\n" - )) +fn render_leftover(notcol: &str, instances: &[Option]) -> HTML { + let label = HTML::escape(notcol); + let rest = render_instances(instances); + if rest == HTML::from("") { + HTML(format!("{label}")) + } else { + HTML(format!("{label}: {rest}")) + } +} + +fn render_all_leftovers(row: &Row) -> HTML { + let mut order: Vec<_> = row.entries.keys().collect(); + order.sort_unstable(); + HTML( + order + .into_iter() + .map(|notcol| render_leftover(notcol, row.entries.get(notcol).expect("Key vanished?!"))) + .map(|html| html.0) // Waiting for slice_concat_trait to stabilize + .collect::>() + .join(", "), + ) +} + +fn render_row(columns: &[String], rowlike: &mut Rowlike) -> HTML { + match rowlike { + Rowlike::Spacer => HTML::from(" "), + Rowlike::Row(row) => { + let row_label = HTML::escape(row.label.as_ref()); + let cells = columns + .iter() + .map(|col| render_cell(col, row)) + .collect::(); + let leftovers = render_all_leftovers(row); + HTML(format!( + "{row_label}{cells}{leftovers}\n" + )) + } + } } fn render_column_headers(columns: &[String]) -> HTML { @@ -259,7 +304,7 @@ fn render_column_headers(columns: &[String]) -> HTML { /// * an indented line with no preceding non-indented line pub fn tablify(config: &Config, input: impl std::io::Read) -> Result { let rows = read_rows(input).collect::, _>>()?; - let columns = column_order(&rows); + let columns = column_order(config, &rows); Ok(HTML(format!( "{HEADER}{}{}{FOOTER}", render_column_headers(&columns), @@ -306,63 +351,78 @@ mod tests { fn test_read_rows() { assert_eq!( read_rows(&b"foo"[..]).flatten().collect::>(), - vec![Row { + vec![Rowlike::Row(Row { label: "foo".to_owned(), entries: HashMap::new(), - }] + })] ); assert_eq!( read_rows(&b"bar"[..]).flatten().collect::>(), - vec![Row { + vec![Rowlike::Row(Row { label: "bar".to_owned(), entries: HashMap::new(), - }] + })] ); assert_eq!( read_rows(&b"foo\nbar\n"[..]).flatten().collect::>(), vec![ - Row { + Rowlike::Row(Row { label: "foo".to_owned(), entries: HashMap::new(), - }, - Row { + }), + Rowlike::Row(Row { label: "bar".to_owned(), entries: HashMap::new(), - } + }) ] ); assert_eq!( read_rows(&b"foo\n bar\n"[..]).flatten().collect::>(), - vec![Row { + vec![Rowlike::Row(Row { label: "foo".to_owned(), entries: HashMap::from([("bar".to_owned(), vec![None])]), - }] + })] ); assert_eq!( read_rows(&b"foo\n bar\n baz\n"[..]) .flatten() .collect::>(), - vec![Row { + vec![Rowlike::Row(Row { label: "foo".to_owned(), entries: HashMap::from([ ("bar".to_owned(), vec![None]), ("baz".to_owned(), vec![None]) ]), - }] + })] ); assert_eq!( read_rows(&b"foo\n\nbar\n"[..]) .flatten() .collect::>(), vec![ - Row { + Rowlike::Row(Row { label: "foo".to_owned(), entries: HashMap::new(), - }, - Row { + }), + Rowlike::Row(Row { label: "bar".to_owned(), entries: HashMap::new(), - } + }) + ] + ); + assert_eq!( + read_rows(&b"foo\n\n\nbar\n"[..]) + .flatten() + .collect::>(), + vec![ + Rowlike::Row(Row { + label: "foo".to_owned(), + entries: HashMap::new(), + }), + Rowlike::Row(Row { + label: "bar".to_owned(), + entries: HashMap::new(), + }) ] ); assert_eq!( @@ -370,24 +430,24 @@ mod tests { .flatten() .collect::>(), vec![ - Row { + Rowlike::Row(Row { label: "foo".to_owned(), entries: HashMap::new(), - }, - Row { + }), + Rowlike::Row(Row { label: "bar".to_owned(), entries: HashMap::new(), - } + }) ] ); assert_eq!( read_rows(&b"foo \n bar \n"[..]) .flatten() .collect::>(), - vec![Row { + vec![Rowlike::Row(Row { label: "foo".to_owned(), entries: HashMap::from([("bar".to_owned(), vec![None])]), - }] + })] ); let bad = read_rows(&b" foo"[..]).next().unwrap(); @@ -552,18 +612,49 @@ mod tests { assert_eq!(r.entries.len(), 0); } + #[test] + fn test_render_leftovers() { + assert_eq!( + render_all_leftovers(&Row { + label: "nope".to_owned(), + entries: HashMap::from([("foo".to_owned(), vec![None])]), + }), + HTML::from("foo") + ); + assert_eq!( + render_all_leftovers(&Row { + label: "nope".to_owned(), + entries: HashMap::from([ + ("foo".to_owned(), vec![None]), + ("bar".to_owned(), vec![None]) + ]), + }), + HTML::from("bar, foo") + ); + assert_eq!( + render_all_leftovers(&Row { + label: "nope".to_owned(), + entries: HashMap::from([ + ("foo".to_owned(), vec![None]), + ("bar".to_owned(), vec![None, None]) + ]), + }), + HTML::from("bar: 2, foo") + ); + } + #[test] fn test_render_row() { assert_eq!( render_row( &["foo".to_owned()], - &mut Row { + &mut Rowlike::Row(Row { label: "nope".to_owned(), entries: HashMap::from([("bar".to_owned(), vec![None])]), - } + }) ), HTML::from( - r#"nope + r#"nopebar "# ) );