X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/b4bc28bae91f901f88fdad4621b14da9eb18be06..bd0b5a3318b3906fb06a837a6bb622d2867bf01b:/src/lib.rs diff --git a/src/lib.rs b/src/lib.rs index 99c454d..2111e1e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,6 +8,7 @@ use std::iter::Iterator; struct Config { column_threshold: usize, static_columns: Vec>, + hidden_columns: HashSet, } impl Config { fn apply_command(&mut self, line_num: usize, cmd: &str) -> Result<(), std::io::Error> { @@ -18,6 +19,8 @@ impl Config { format!("line {line_num}: col_threshold must be numeric: {e}"), ) })?; + } else if let Some(col) = cmd.strip_prefix("hide ") { + self.hidden_columns.insert(col.to_owned()); } else if let Some(col) = cmd.strip_prefix("col ") { self.static_columns.push(Some(col.to_owned())); } else if cmd == "colsep" { @@ -36,6 +39,7 @@ impl Default for Config { Self { column_threshold: 2, static_columns: vec![], + hidden_columns: HashSet::new(), } } } @@ -253,7 +257,10 @@ fn column_order(config: &Config, rows: &[Rowlike]) -> Vec { column_counts(rows) .into_iter() .filter_map(|(n, col)| { - (n >= config.column_threshold && !static_columns.contains(col.as_str())).then_some(col) + (n >= config.column_threshold + && !static_columns.contains(col.as_str()) + && !config.hidden_columns.contains(&col)) + .then_some(col) }) .collect() } @@ -309,7 +316,11 @@ fn render_leftover(notcol: &str, instances: &[Option]) -> HTML { } fn render_all_leftovers(config: &Config, row: &Row) -> HTML { - let mut order: Vec<_> = row.entries.keys().collect(); + let mut order: Vec<_> = row + .entries + .keys() + .filter(|&col| !config.hidden_columns.contains(col)) + .collect(); order.sort_unstable(); HTML( order @@ -330,12 +341,14 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM .static_columns .iter() .map(|ocol| match ocol { + Some(col) if config.hidden_columns.contains(col) => HTML::from(""), Some(col) => render_cell(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)) .collect::(); let leftovers = render_all_leftovers(config, row); @@ -353,6 +366,10 @@ fn render_column_headers(config: &Config, columns: &[String]) -> HTML { String::from(r#""#) + &static_columns .chain(dynamic_columns) + .filter(|ocol| { + ocol.map(|col| !config.hidden_columns.contains(col)) + .unwrap_or(true) + }) .fold(String::new(), |mut acc, ocol| { match ocol { Some(col) => { @@ -730,6 +747,20 @@ mod tests { ), HTML::from("bar: 2, foo") ); + assert_eq!( + render_all_leftovers( + &Config { + column_threshold: 2, + static_columns: vec![], + hidden_columns: HashSet::from(["private".to_owned()]), + }, + &Row { + label: "nope".to_owned(), + entries: HashMap::from([("private".to_owned(), vec![None]),]), + } + ), + HTML::from("") + ); } #[test] @@ -753,6 +784,7 @@ mod tests { &Config { column_threshold: 0, static_columns: vec![Some("foo".to_owned()), Some("bar".to_owned())], + hidden_columns: HashSet::new(), }, &["baz".to_owned()], &mut Rowlike::Row(Row { @@ -774,6 +806,7 @@ mod tests { &Config { column_threshold: 0, static_columns: vec![Some("foo".to_owned()), None, Some("bar".to_owned())], + hidden_columns: HashSet::new(), }, &[], &mut Rowlike::Row(Row { @@ -786,6 +819,42 @@ mod tests { ), HTML::from( r#"nopefr +"# + ) + ); + assert_eq!( + render_row( + &Config { + column_threshold: 0, + static_columns: vec![], + hidden_columns: HashSet::from(["foo".to_owned()]), + }, + &[], + &mut Rowlike::Row(Row { + label: "nope".to_owned(), + entries: HashMap::from([("foo".to_owned(), vec![Some("f".to_owned())]),]), + }) + ), + HTML::from( + r#"nope +"# + ) + ); + assert_eq!( + render_row( + &Config { + column_threshold: 0, + static_columns: vec![Some("foo".to_owned())], + hidden_columns: HashSet::from(["foo".to_owned()]), + }, + &[], + &mut Rowlike::Row(Row { + label: "nope".to_owned(), + entries: HashMap::from([("foo".to_owned(), vec![Some("f".to_owned())]),]), + }) + ), + HTML::from( + r#"nope "# ) );