X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/e44de444711dd8dc9d79f4fd6ab86c2d0fd26862..1df4654a9fff0f0a1e146c681dc05af7c3e460fe:/src/lib.rs?ds=inline diff --git a/src/lib.rs b/src/lib.rs index b52806a..e20d23d 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,13 @@ 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()); + } else { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidInput, + format!("Unknown command: {cmd}"), + )); } Ok(()) } @@ -166,7 +174,7 @@ impl<'cfg, Input: Iterator>> Iterator InputLine::Entry(col, instance) => match &mut self.row { None => { return Some(Err(std::io::Error::other(format!( - "{}: Entry with no header", + "line {}: Entry with no header", n + 1 )))) } @@ -196,6 +204,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 +233,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() } @@ -293,35 +309,43 @@ fn render_all_leftovers(row: &Row) -> HTML { ) } -fn render_row(columns: &[String], rowlike: &mut Rowlike) -> HTML { +fn render_row(config: &Config, 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 + 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" )) } } } -fn render_column_headers(columns: &[String]) -> HTML { +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", ) } @@ -337,9 +361,9 @@ pub fn tablify(input: impl std::io::Read) -> Result { let columns = column_order(&config, &rows); Ok(HTML(format!( "{HEADER}{}{}{FOOTER}", - render_column_headers(&columns), + render_column_headers(&config, &columns), rows.into_iter() - .map(|mut r| render_row(&columns, &mut r)) + .map(|mut r| render_row(&config, &columns, &mut r)) .collect::() ))) } @@ -479,21 +503,29 @@ mod tests { let bad = read_rows(&b" foo"[..]); assert!(bad.is_err()); - assert!(format!("{bad:?}").contains("1: Entry with no header")); + assert!(format!("{bad:?}").contains("line 1: Entry with no header")); let bad2 = read_rows(&b"foo\n\n bar"[..]); assert!(bad2.is_err()); - assert!(format!("{bad2:?}").contains("3: Entry with no header")); + assert!(format!("{bad2:?}").contains("line 3: Entry with no header")); } #[test] fn test_read_config() { assert_eq!( - read_config(&b"!col_threshold 10"[..]).unwrap(), - Config { - column_threshold: 10 - } + read_config(&b"!col_threshold 10"[..]) + .unwrap() + .column_threshold, + 10 ); + assert_eq!( + read_config(&b"!col foo"[..]).unwrap().static_columns, + vec!["foo".to_owned()] + ); + + let bad_command = read_config(&b"!no such command"[..]); + assert!(bad_command.is_err()); + assert!(format!("{bad_command:?}").contains("Unknown command")); let bad_num = read_config(&b"!col_threshold foo"[..]); assert!(bad_num.is_err()); @@ -674,6 +706,10 @@ mod tests { fn test_render_row() { assert_eq!( render_row( + &Config { + column_threshold: 0, + static_columns: vec![], + }, &["foo".to_owned()], &mut Rowlike::Row(Row { label: "nope".to_owned(), @@ -682,6 +718,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 "# ) );