X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/9a6260204a9a4bfa4254719c30710ea827212877..36bc3a39ef440cc1af77d7d88844cacbe6b4387d:/src/lib.rs?ds=sidebyside diff --git a/src/lib.rs b/src/lib.rs index bad71d0..cbe9ae9 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; } @@ -180,10 +183,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: &[Row]) -> Vec { column_counts(rows) .into_iter() - .map(|(_, col)| col) + .filter_map(|(n, col)| (n >= config.column_threshold).then_some(col)) .collect() } @@ -258,7 +261,7 @@ fn render_row(columns: &[String], row: &mut Row) -> HTML { .collect::(); let leftovers = render_all_leftovers(row); HTML(format!( - "{row_label}{cells}{leftovers}\n" + "{row_label}{cells}{leftovers}\n" )) } @@ -286,7 +289,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), @@ -621,7 +624,7 @@ mod tests { } ), HTML::from( - r#"nopebar + r#"nopebar "# ) );