From: Scott Worley Date: Thu, 26 Sep 2024 03:44:53 +0000 (-0700) Subject: Rowlike: Allow spacer rows to be represented X-Git-Tag: v0.3.0~6 X-Git-Url: http://git.scottworley.com/tablify/commitdiff_plain/06a6a5cad195d0b7504c4e7b4caf085487f53578?ds=sidebyside Rowlike: Allow spacer rows to be represented --- diff --git a/src/lib.rs b/src/lib.rs index cbe9ae9..73e517b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -109,6 +109,12 @@ struct Row { entries: HashMap>>, } +#[derive(Debug, PartialEq, Eq)] +enum Rowlike { + Row(Row), + Spacer, +} + struct Reader>> { input: std::iter::Enumerate, row: Option, @@ -122,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 { @@ -154,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(); } } }, @@ -163,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) @@ -183,7 +193,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 +263,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(" "), + 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 { @@ -336,63 +351,63 @@ 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!( @@ -400,24 +415,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(); @@ -618,10 +633,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