X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/36bc3a39ef440cc1af77d7d88844cacbe6b4387d..5a070b309feffc87f170365411c5e71626f72520:/src/lib.rs diff --git a/src/lib.rs b/src/lib.rs index cbe9ae9..5c994c9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,6 +18,7 @@ const HEADER: &str = r#" /* h/t https://wabain.github.io/2019/10/13/css-rotated-table-header.html */ th, td { white-space: nowrap; } th { text-align: left; font-weight: normal; } + th.spacer_row { height: .3em; } table { border-collapse: collapse } tr.key > th { height: 10em; vertical-align: bottom; line-height: 1 } tr.key > th > div { width: 1em; } @@ -109,6 +110,12 @@ struct Row { entries: HashMap>>, } +#[derive(Debug, PartialEq, Eq)] +enum Rowlike { + Row(Row), + Spacer, +} + struct Reader>> { input: std::iter::Enumerate, row: Option, @@ -122,17 +129,17 @@ 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::Blank => return Some(Ok(Rowlike::Spacer)), InputLine::Entry(col, instance) => match &mut self.row { None => { return Some(Err(std::io::Error::other(format!( @@ -154,7 +161,7 @@ impl>> Iterator for Reader entries: HashMap::new(), }); if prev.is_some() { - return Ok(prev).transpose(); + return Ok(prev.map(Rowlike::Row)).transpose(); } } }, @@ -163,14 +170,23 @@ impl>> Iterator for Reader } } -fn read_rows(input: impl std::io::Read) -> impl Iterator> { +fn read_input(input: impl std::io::Read) -> Result<(Vec, Config), std::io::Error> { + let default_config = Config { + column_threshold: 2, + }; Reader::new(std::io::BufReader::new(input).lines()) + .collect::, _>>() + .map(|rows| (rows, default_config)) } -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) @@ -183,7 +199,7 @@ 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(config: &Config, rows: &[Row]) -> Vec { +fn column_order(config: &Config, rows: &[Rowlike]) -> Vec { column_counts(rows) .into_iter() .filter_map(|(n, col)| (n >= config.column_threshold).then_some(col)) @@ -253,16 +269,21 @@ fn render_all_leftovers(row: &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::(); - let leftovers = render_all_leftovers(row); - HTML(format!( - "{row_label}{cells}{leftovers}\n" - )) +fn render_row(columns: &[String], rowlike: &mut Rowlike) -> HTML { + match rowlike { + Rowlike::Spacer => HTML::from("\n"), + 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 { @@ -287,9 +308,9 @@ fn render_column_headers(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(config: &Config, input: impl std::io::Read) -> Result { - let rows = read_rows(input).collect::, _>>()?; - let columns = column_order(config, &rows); +pub fn tablify(input: impl std::io::Read) -> Result { + let (rows, config) = read_input(input)?; + let columns = column_order(&config, &rows); Ok(HTML(format!( "{HEADER}{}{}{FOOTER}", render_column_headers(&columns), @@ -332,99 +353,108 @@ mod tests { ); } + fn read_rows(input: impl std::io::Read) -> Result, std::io::Error> { + read_input(input).map(|(rows, _)| rows) + } #[test] fn test_read_rows() { assert_eq!( - read_rows(&b"foo"[..]).flatten().collect::>(), - vec![Row { + read_rows(&b"foo"[..]).unwrap(), + vec![Rowlike::Row(Row { label: "foo".to_owned(), entries: HashMap::new(), - }] + })] ); assert_eq!( - read_rows(&b"bar"[..]).flatten().collect::>(), - vec![Row { + read_rows(&b"bar"[..]).unwrap(), + vec![Rowlike::Row(Row { label: "bar".to_owned(), entries: HashMap::new(), - }] + })] ); assert_eq!( - read_rows(&b"foo\nbar\n"[..]).flatten().collect::>(), + read_rows(&b"foo\nbar\n"[..]).unwrap(), 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 { + read_rows(&b"foo\n bar\n"[..]).unwrap(), + 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 { + read_rows(&b"foo\n bar\n baz\n"[..]).unwrap(), + 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::>(), + read_rows(&b"foo\n\nbar\n"[..]).unwrap(), 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 \nbar\n"[..]) - .flatten() - .collect::>(), + read_rows(&b"foo\n\n\nbar\n"[..]).unwrap(), vec![ - Row { + Rowlike::Row(Row { label: "foo".to_owned(), entries: HashMap::new(), - }, - Row { + }), + Rowlike::Spacer, + Rowlike::Row(Row { label: "bar".to_owned(), entries: HashMap::new(), - } + }) + ] + ); + assert_eq!( + read_rows(&b"foo\n \nbar\n"[..]).unwrap(), + vec![ + Rowlike::Row(Row { + label: "foo".to_owned(), + entries: HashMap::new(), + }), + Rowlike::Row(Row { + label: "bar".to_owned(), + entries: HashMap::new(), + }) ] ); assert_eq!( - read_rows(&b"foo \n bar \n"[..]) - .flatten() - .collect::>(), - vec![Row { + read_rows(&b"foo \n bar \n"[..]).unwrap(), + vec![Rowlike::Row(Row { label: "foo".to_owned(), entries: HashMap::from([("bar".to_owned(), vec![None])]), - }] + })] ); - let bad = read_rows(&b" foo"[..]).next().unwrap(); + let bad = read_rows(&b" foo"[..]); assert!(bad.is_err()); assert!(format!("{bad:?}").contains("1: Entry with no header")); - let bad2 = read_rows(&b"foo\n\n bar"[..]).nth(1).unwrap(); + let bad2 = read_rows(&b"foo\n\n bar"[..]); assert!(bad2.is_err()); assert!(format!("{bad2:?}").contains("3: Entry with no header")); } @@ -432,34 +462,20 @@ mod tests { #[test] fn test_column_counts() { assert_eq!( - column_counts( - &read_rows(&b"foo\n bar\n baz\n"[..]) - .collect::, _>>() - .unwrap() - ), + column_counts(&read_rows(&b"foo\n bar\n baz\n"[..]).unwrap()), vec![(1, String::from("bar")), (1, String::from("baz"))] ); assert_eq!( - column_counts( - &read_rows(&b"foo\n bar\n baz\nquux\n baz"[..]) - .collect::, _>>() - .unwrap() - ), + column_counts(&read_rows(&b"foo\n bar\n baz\nquux\n baz"[..]).unwrap()), vec![(2, String::from("baz")), (1, String::from("bar"))] ); assert_eq!( - column_counts( - &read_rows(&b"foo\n bar\n bar\n baz\n bar\nquux\n baz"[..]) - .collect::, _>>() - .unwrap() - ), + column_counts(&read_rows(&b"foo\n bar\n bar\n baz\n bar\nquux\n baz"[..]).unwrap()), vec![(2, String::from("baz")), (1, String::from("bar"))] ); assert_eq!( column_counts( - &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..]) - .collect::, _>>() - .unwrap() + &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..]).unwrap() ), vec![(2, String::from("baz")), (1, String::from("bar"))] ); @@ -618,10 +634,10 @@ mod tests { 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#"nopebar