X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/166aa6e27cae04eeddd34e2c395a9371ddc7edee..5eb5ed212bac4b401588d3a8a02fd0a49c640b9a:/src/lib.rs?ds=sidebyside diff --git a/src/lib.rs b/src/lib.rs index 5077590..e199470 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,10 +4,15 @@ use std::fmt::Write; use std::io::BufRead; use std::iter::Iterator; -fn tally_marks(n: usize) -> String { - let fives = { 0..n / 5 }.map(|_| '𝍸'); - let ones = { 0..n % 5 }.map(|_| '𝍷'); - fives.chain(ones).collect() +fn tally_marks(n: usize, mark: Option<&str>) -> String { + match mark { + None => { + let fives = { 0..n / 5 }.map(|_| '𝍸'); + let ones = { 0..n % 5 }.map(|_| '𝍷'); + fives.chain(ones).collect() + } + Some(m) => { 0..n }.map(|_| m).collect(), + } } #[derive(PartialEq, Eq, Debug)] @@ -45,6 +50,16 @@ impl Config { .substitute_labels .insert(col.to_owned(), label.to_owned()), }; + } else if let Some(directive) = cmd.strip_prefix("mark ") { + match directive.split_once(':') { + None => { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidInput, + format!("line {line_num}: Mark missing ':'"), + )) + } + Some((col, label)) => self.mark.insert(col.to_owned(), label.to_owned()), + }; } else { return Err(std::io::Error::new( std::io::ErrorKind::InvalidInput, @@ -287,7 +302,7 @@ fn column_order(config: &Config, rows: &[Rowlike]) -> Vec { .collect() } -fn render_instances(instances: &[Option]) -> HTML { +fn render_instances(instances: &[Option], mark: Option<&str>) -> HTML { let mut tally = 0; let mut out = vec![]; for ins in instances { @@ -295,7 +310,7 @@ fn render_instances(instances: &[Option]) -> HTML { None => tally += 1, Some(content) => { if tally > 0 { - out.push(HTML(tally_marks(tally))); + out.push(HTML(tally_marks(tally, mark))); tally = 0; } out.push(HTML::escape(content)); @@ -303,7 +318,7 @@ fn render_instances(instances: &[Option]) -> HTML { } } if tally > 0 { - out.push(HTML(tally_marks(tally))); + out.push(HTML(tally_marks(tally, mark))); } HTML( out.into_iter() @@ -332,7 +347,7 @@ fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML { let class = HTML::from(if is_empty { "" } else { r#" class="yes""# }); let contents = match instances { None => HTML::from(""), - Some(is) => render_instances(is), + Some(is) => render_instances(is, config.mark.get(col).map(String::as_str)), }; row.entries.remove(col); HTML(format!( @@ -340,12 +355,12 @@ fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML { )) } -fn render_leftover(notcol: &str, instances: &[Option]) -> HTML { +fn render_leftover(config: &Config, notcol: &str, instances: &[Option]) -> HTML { let label = HTML::escape(notcol); if instances.len() == 1 && instances[0].is_none() { HTML(format!("{label}")) } else { - let rest = render_instances(instances); + let rest = render_instances(instances, config.mark.get(notcol).map(String::as_str)); HTML(format!("{label}: {rest}")) } } @@ -360,7 +375,13 @@ fn render_all_leftovers(config: &Config, row: &Row) -> HTML { HTML( order .into_iter() - .map(|notcol| render_leftover(notcol, row.entries.get(notcol).expect("Key vanished?!"))) + .map(|notcol| { + render_leftover( + config, + notcol, + row.entries.get(notcol).expect("Key vanished?!"), + ) + }) .map(|html| html.0) // Waiting for slice_concat_trait to stabilize .collect::>() .join(", "), @@ -485,17 +506,22 @@ mod tests { #[test] fn test_tally_marks() { - assert_eq!(tally_marks(1), "𝍷"); - assert_eq!(tally_marks(2), "𝍷𝍷"); - assert_eq!(tally_marks(3), "𝍷𝍷𝍷"); - assert_eq!(tally_marks(4), "𝍷𝍷𝍷𝍷"); - assert_eq!(tally_marks(5), "𝍸"); - assert_eq!(tally_marks(6), "𝍸𝍷"); - assert_eq!(tally_marks(7), "𝍸𝍷𝍷"); - assert_eq!(tally_marks(8), "𝍸𝍷𝍷𝍷"); - assert_eq!(tally_marks(9), "𝍸𝍷𝍷𝍷𝍷"); - assert_eq!(tally_marks(10), "𝍸𝍸"); - assert_eq!(tally_marks(11), "𝍸𝍸𝍷"); + assert_eq!(tally_marks(1, None), "𝍷"); + assert_eq!(tally_marks(2, None), "𝍷𝍷"); + assert_eq!(tally_marks(3, None), "𝍷𝍷𝍷"); + assert_eq!(tally_marks(4, None), "𝍷𝍷𝍷𝍷"); + assert_eq!(tally_marks(5, None), "𝍸"); + assert_eq!(tally_marks(6, None), "𝍸𝍷"); + assert_eq!(tally_marks(7, None), "𝍸𝍷𝍷"); + assert_eq!(tally_marks(8, None), "𝍸𝍷𝍷𝍷"); + assert_eq!(tally_marks(9, None), "𝍸𝍷𝍷𝍷𝍷"); + assert_eq!(tally_marks(10, None), "𝍸𝍸"); + assert_eq!(tally_marks(11, None), "𝍸𝍸𝍷"); + assert_eq!(tally_marks(1, Some("x")), "x"); + assert_eq!(tally_marks(4, Some("x")), "xxxx"); + assert_eq!(tally_marks(5, Some("x")), "xxxxx"); + assert_eq!(tally_marks(6, Some("x")), "xxxxxx"); + assert_eq!(tally_marks(2, Some("🍔")), "🍔🍔"); } fn read_rows(input: impl std::io::Read) -> Result, std::io::Error> { @@ -625,6 +651,7 @@ mod tests { .substitute_labels["foo"], "bar" ); + assert_eq!(read_config(&b"!mark foo:*"[..]).unwrap().mark["foo"], "*"); let bad_command = read_config(&b"!no such command"[..]); assert!(bad_command.is_err()); @@ -637,6 +664,10 @@ mod tests { let bad_sub = read_config(&b"!label foo"[..]); assert!(bad_sub.is_err()); assert!(format!("{bad_sub:?}").contains("line 1: Annotation missing ':'")); + + let bad_mark = read_config(&b"!mark foo"[..]); + assert!(bad_mark.is_err()); + assert!(format!("{bad_mark:?}").contains("line 1: Mark missing ':'")); } #[test] @@ -815,6 +846,26 @@ mod tests { r#"𝍷"# ) ); + assert_eq!( + render_cell( + &Config { + column_threshold: 2, + static_columns: vec![], + hidden_columns: HashSet::new(), + substitute_labels: HashMap::new(), + mark: HashMap::from([("foo".to_owned(), "🦄".to_owned())]), + }, + "foo", + &mut Row { + label: "nope".to_owned(), + entries: HashMap::from([("foo".to_owned(), vec![None])]), + } + ), + HTML::from( + r#"🦄"# + ) + ); + let mut r = Row { label: "nope".to_owned(), entries: HashMap::from([ @@ -885,6 +936,22 @@ mod tests { ), HTML::from("") ); + assert_eq!( + render_all_leftovers( + &Config { + column_threshold: 2, + static_columns: vec![], + hidden_columns: HashSet::new(), + substitute_labels: HashMap::new(), + mark: HashMap::from([("foo".to_owned(), "🌈".to_owned())]), + }, + &Row { + label: "nope".to_owned(), + entries: HashMap::from([("foo".to_owned(), vec![None, None])]), + } + ), + HTML::from("foo: 🌈🌈") + ); } #[test]