X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/b59ad4335c434a858a991137445fd34aaa4c6b21..166aa6e27cae04eeddd34e2c395a9371ddc7edee:/src/lib.rs diff --git a/src/lib.rs b/src/lib.rs index d85de02..5077590 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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; } @@ -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, @@ -370,14 +377,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!( @@ -690,6 +697,7 @@ mod tests { fn test_render_cell() { assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -702,6 +710,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -714,6 +723,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -726,6 +736,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -738,6 +749,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -753,6 +765,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -765,6 +778,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -777,6 +791,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "heart", &mut Row { label: "nope".to_owned(), @@ -789,6 +804,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "bob's".to_owned(), @@ -807,11 +823,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 +876,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(), @@ -893,6 +910,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 +934,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 +957,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 +977,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 +987,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𝍷 "# ) );