Plumb config into render_leftover()

[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs

index 70dfb5286fc628819c9315618d655040b67221e1..3f3dde53e246ff290ff3e63c4970bf7ba73bddef 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,6 +16,7 @@ struct Config {
      static_columns: Vec<Option<String>>,
      hidden_columns: HashSet<String>,
      substitute_labels: HashMap<String, String>,
+    mark: HashMap<String, String>,
  }
  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#"<!DOCTYPE html>
      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; }
    </style>
@@ -313,7 +315,12 @@ fn render_instances(instances: &[Option<String>]) -> 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<Option<String>>> = row.entries.get(col);
      let is_empty = match instances {
          None => true,
@@ -333,7 +340,7 @@ fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML {
      ))
  }
  
-fn render_leftover(notcol: &str, instances: &[Option<String>]) -> HTML {
+fn render_leftover(config: &Config, notcol: &str, instances: &[Option<String>]) -> HTML {
      let label = HTML::escape(notcol);
      if instances.len() == 1 && instances[0].is_none() {
          HTML(format!("{label}"))
@@ -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::<Vec<_>>()
              .join(", "),
@@ -869,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(),
@@ -902,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 {
@@ -925,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 {
@@ -947,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 {
@@ -966,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 {
@@ -975,6 +993,26 @@ mod tests {
              ),
              HTML::from(
                  r#"<tr><th id="nope">nope</th><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
+"#
+            )
+        );
+        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#"<tr><th id="nope">nope</th><td class="yes" onmouseover="h2('nope','bar')" onmouseout="ch2('nope','bar')">𝍷</td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
  "#
              )
          );