From: Scott Worley Date: Thu, 3 Oct 2024 10:14:53 +0000 (-0700) Subject: Allow forcing column layout with `!col ` in input X-Git-Tag: v0.4.0~9 X-Git-Url: http://git.scottworley.com/tablify/commitdiff_plain/a411a19d502a2ee8ce16c0cd7f447dac3293cee4?ds=sidebyside Allow forcing column layout with `!col ` in input --- diff --git a/Changelog b/Changelog index cf5af53..fbee5bd 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ ## [Unreleased] - Read column threshold from `!col_threshold ` in input +- Allow forcing column layout with `!col ` in input ## [0.3.0] - 2024-10-02 - Center text in each cell diff --git a/src/lib.rs b/src/lib.rs index acf5383..af582d4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,5 @@ use std::borrow::ToOwned; -use std::collections::HashMap; +use std::collections::{HashMap, HashSet}; use std::fmt::Write; use std::io::BufRead; use std::iter::Iterator; @@ -7,6 +7,7 @@ use std::iter::Iterator; #[derive(PartialEq, Eq, Debug)] struct Config { column_threshold: usize, + static_columns: Vec, } impl Config { fn apply_command(&mut self, cmd: &str) -> Result<(), std::io::Error> { @@ -14,6 +15,8 @@ impl Config { self.column_threshold = threshold .parse() .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidInput, e))?; + } else if let Some(col) = cmd.strip_prefix("col ") { + self.static_columns.push(col.to_owned()); } Ok(()) } @@ -196,6 +199,7 @@ impl<'cfg, Input: Iterator>> Iterator fn read_input(input: impl std::io::Read) -> Result<(Vec, Config), std::io::Error> { let mut config = Config { column_threshold: 2, + static_columns: vec![], }; let reader = Reader::new(&mut config, std::io::BufReader::new(input).lines()); reader @@ -224,9 +228,16 @@ fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> { counts } fn column_order(config: &Config, rows: &[Rowlike]) -> Vec { + let static_columns: HashSet<&str> = config + .static_columns + .iter() + .map(std::string::String::as_str) + .collect(); column_counts(rows) .into_iter() - .filter_map(|(n, col)| (n >= config.column_threshold).then_some(col)) + .filter_map(|(n, col)| { + (n >= config.column_threshold && !static_columns.contains(col.as_str())).then_some(col) + }) .collect() } @@ -298,13 +309,18 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM Rowlike::Spacer => HTML::from("\n"), Rowlike::Row(row) => { let row_label = HTML::escape(row.label.as_ref()); - let cells = columns + let static_cells = config + .static_columns + .iter() + .map(|col| render_cell(col, row)) + .collect::(); + let dynamic_cells = columns .iter() .map(|col| render_cell(col, row)) .collect::(); let leftovers = render_all_leftovers(row); HTML(format!( - "{row_label}{cells}{leftovers}\n" + "{row_label}{static_cells}{dynamic_cells}{leftovers}\n" )) } } @@ -313,15 +329,18 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM fn render_column_headers(config: &Config, columns: &[String]) -> HTML { HTML( String::from(r#""#) - + &columns.iter().fold(String::new(), |mut acc, col| { - let col_header = HTML::escape(col.as_ref()); - write!( - &mut acc, - r#"
{col_header}
"# - ) - .unwrap(); - acc - }) + + &config.static_columns.iter().chain(columns.iter()).fold( + String::new(), + |mut acc, col| { + let col_header = HTML::escape(col.as_ref()); + write!( + &mut acc, + r#"
{col_header}
"# + ) + .unwrap(); + acc + }, + ) + "\n", ) } @@ -494,6 +513,10 @@ mod tests { .column_threshold, 10 ); + assert_eq!( + read_config(&b"!col foo"[..]).unwrap().static_columns, + vec!["foo".to_owned()] + ); let bad_num = read_config(&b"!col_threshold foo"[..]); assert!(bad_num.is_err()); @@ -676,6 +699,7 @@ mod tests { render_row( &Config { column_threshold: 0, + static_columns: vec![], }, &["foo".to_owned()], &mut Rowlike::Row(Row { @@ -685,6 +709,27 @@ mod tests { ), HTML::from( r#"nopebar +"# + ) + ); + assert_eq!( + render_row( + &Config { + column_threshold: 0, + static_columns: vec!["foo".to_owned(), "bar".to_owned()], + }, + &["baz".to_owned()], + &mut Rowlike::Row(Row { + label: "nope".to_owned(), + entries: HashMap::from([ + ("bar".to_owned(), vec![Some("r".to_owned())]), + ("baz".to_owned(), vec![Some("z".to_owned())]), + ("foo".to_owned(), vec![Some("f".to_owned())]), + ]), + }) + ), + HTML::from( + r#"nopefrz "# ) );