X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/a1a4b3c8f14d52f8b85e7fd72b5c430fe4407483..fdc441dab9c793956ea5c6e4a7c766eb87b16588:/src/lib.rs?ds=sidebyside diff --git a/src/lib.rs b/src/lib.rs index 859b3c1..731457e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,7 +4,7 @@ use std::fmt::Write; use std::io::BufRead; use std::iter::Iterator; -fn tally_marks(n: usize) -> String { +fn tally_marks(n: usize, mark: Option<&str>) -> String { let fives = { 0..n / 5 }.map(|_| '𝍸'); let ones = { 0..n % 5 }.map(|_| '𝍷'); fives.chain(ones).collect() @@ -16,6 +16,7 @@ struct Config { static_columns: Vec>, hidden_columns: HashSet, substitute_labels: HashMap, + mark: HashMap, } impl Config { fn apply_command(&mut self, line_num: usize, cmd: &str) -> Result<(), std::io::Error> { @@ -60,6 +61,7 @@ impl Default for Config { static_columns: vec![], hidden_columns: HashSet::new(), substitute_labels: HashMap::new(), + mark: HashMap::new(), } } } @@ -82,7 +84,7 @@ const HEADER: &str = r#" 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; } + td.yes { border: thin solid gray; background-color: #eee; } /* 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; } @@ -285,7 +287,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 { @@ -293,7 +295,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)); @@ -301,7 +303,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() @@ -311,9 +313,14 @@ fn render_instances(instances: &[Option]) -> HTML { ) } -fn render_cell(col: &str, row: &mut Row) -> HTML { +fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML { let row_label = HTML::escape(row.label.as_ref()); - let col_label = HTML::escape(col); + let col_label = HTML::escape( + config + .substitute_labels + .get(col) + .map_or(col, std::string::String::as_str), + ); let instances: Option<&Vec>> = row.entries.get(col); let is_empty = match instances { None => true, @@ -322,23 +329,23 @@ fn render_cell(col: &str, row: &mut Row) -> HTML { Some(content) => content == "×", }), }; - let class = HTML::from(if is_empty { "" } else { "yes" }); + 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!( - r#"{contents}"# + r#"{contents}"# )) } -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}")) } } @@ -353,7 +360,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(", "), @@ -370,14 +383,14 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM .iter() .map(|ocol| match ocol { Some(col) if config.hidden_columns.contains(col) => HTML::from(""), - Some(col) => render_cell(col, row), + Some(col) => render_cell(config, 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)) + .map(|col| render_cell(config, col, row)) .collect::(); let leftovers = render_all_leftovers(config, row); HTML(format!( @@ -478,17 +491,17 @@ 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), "𝍸𝍸𝍷"); } fn read_rows(input: impl std::io::Read) -> Result, std::io::Error> { @@ -690,6 +703,7 @@ mod tests { fn test_render_cell() { assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -697,11 +711,12 @@ mod tests { } ), HTML::from( - r#""# + r#""# ) ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -709,11 +724,12 @@ mod tests { } ), HTML::from( - r#""# + r#""# ) ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -726,6 +742,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -738,6 +755,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -753,6 +771,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -765,6 +784,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -772,11 +792,12 @@ mod tests { } ), HTML::from( - r#"×"# + r#"×"# ) ); assert_eq!( render_cell( + &Config::default(), "heart", &mut Row { label: "nope".to_owned(), @@ -789,6 +810,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "bob's".to_owned(), @@ -807,11 +829,11 @@ mod tests { ]), }; assert_eq!(r.entries.len(), 2); - render_cell("foo", &mut r); + render_cell(&Config::default(), "foo", &mut r); assert_eq!(r.entries.len(), 1); - render_cell("bar", &mut r); + render_cell(&Config::default(), "bar", &mut r); assert_eq!(r.entries.len(), 1); - render_cell("baz", &mut r); + render_cell(&Config::default(), "baz", &mut r); assert_eq!(r.entries.len(), 0); } @@ -860,6 +882,7 @@ mod tests { static_columns: vec![], hidden_columns: HashSet::from(["private".to_owned()]), substitute_labels: HashMap::new(), + mark: HashMap::new(), }, &Row { label: "nope".to_owned(), @@ -882,7 +905,7 @@ mod tests { }) ), HTML::from( - r#"nopebar + r#"nopebar "# ) ); @@ -893,6 +916,7 @@ mod tests { static_columns: vec![Some("foo".to_owned()), Some("bar".to_owned())], hidden_columns: HashSet::new(), substitute_labels: HashMap::new(), + mark: HashMap::new(), }, &["baz".to_owned()], &mut Rowlike::Row(Row { @@ -916,6 +940,7 @@ mod tests { static_columns: vec![Some("foo".to_owned()), None, Some("bar".to_owned())], hidden_columns: HashSet::new(), substitute_labels: HashMap::new(), + mark: HashMap::new(), }, &[], &mut Rowlike::Row(Row { @@ -938,6 +963,7 @@ mod tests { static_columns: vec![], hidden_columns: HashSet::from(["foo".to_owned()]), substitute_labels: HashMap::new(), + mark: HashMap::new(), }, &[], &mut Rowlike::Row(Row { @@ -957,6 +983,7 @@ mod tests { static_columns: vec![Some("foo".to_owned())], hidden_columns: HashSet::from(["foo".to_owned()]), substitute_labels: HashMap::new(), + mark: HashMap::new(), }, &[], &mut Rowlike::Row(Row { @@ -966,6 +993,26 @@ mod tests { ), HTML::from( r#"nope +"# + ) + ); + assert_eq!( + render_row( + &Config { + column_threshold: 0, + static_columns: vec![], + hidden_columns: HashSet::new(), + substitute_labels: HashMap::from([("foo".to_owned(), "bar".to_owned())]), + mark: HashMap::new(), + }, + &["foo".to_owned()], + &mut Rowlike::Row(Row { + label: "nope".to_owned(), + entries: HashMap::from([("foo".to_owned(), vec![None])]), + }) + ), + HTML::from( + r#"nope𝍷 "# ) );