]> git.scottworley.com Git - tablify/blobdiff - src/lib.rs
projects / tablify / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Pass mark overrides to tally_marks()
[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs
index 84cb336301e83f47b6e13bf4b484c41dca1322b5..731457e6b07389fdd1cf39ff5e423d71b3c6e27a 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,7 +4,7 @@ use std::fmt::Write;
 use std::io::BufRead;
 use std::iter::Iterator;
 
 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()
     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<Option<String>>,
     hidden_columns: HashSet<String>,
     substitute_labels: HashMap<String, String>,
     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> {
 }
 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(),
             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; }
     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>
     /* 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>
@@ -285,7 +287,7 @@ fn column_order(config: &Config, rows: &[Rowlike]) -> Vec<String> {
         .collect()
 }
 
         .collect()
 }
 
-fn render_instances(instances: &[Option<String>]) -> HTML {
+fn render_instances(instances: &[Option<String>], mark: Option<&str>) -> HTML {
     let mut tally = 0;
     let mut out = vec![];
     for ins in instances {
     let mut tally = 0;
     let mut out = vec![];
     for ins in instances {
@@ -293,7 +295,7 @@ fn render_instances(instances: &[Option<String>]) -> HTML {
             None => tally += 1,
             Some(content) => {
                 if tally > 0 {
             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));
                     tally = 0;
                 }
                 out.push(HTML::escape(content));
@@ -301,7 +303,7 @@ fn render_instances(instances: &[Option<String>]) -> HTML {
         }
     }
     if tally > 0 {
         }
     }
     if tally > 0 {
-        out.push(HTML(tally_marks(tally)));
+        out.push(HTML(tally_marks(tally, mark)));
     }
     HTML(
         out.into_iter()
     }
     HTML(
         out.into_iter()
@@ -311,27 +313,39 @@ fn render_instances(instances: &[Option<String>]) -> 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 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 instances: Option<&Vec<Option<String>>> = row.entries.get(col);
-    let class = HTML::from(if instances.is_none() { "" } else { "yes" });
+    let is_empty = match instances {
+        None => true,
+        Some(is) => is.iter().all(|ins| match ins {
+            None => false,
+            Some(content) => content == "Γ—",
+        }),
+    };
+    let class = HTML::from(if is_empty { "" } else { r#" class="yes""# });
     let contents = match instances {
         None => HTML::from(""),
     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!(
     };
     row.entries.remove(col);
     HTML(format!(
-        r#"<td class="{class}" onmouseover="h2('{row_label}','{col_label}')" onmouseout="ch2('{row_label}','{col_label}')">{contents}</td>"#
+        r#"<td{class} onmouseover="h2('{row_label}','{col_label}')" onmouseout="ch2('{row_label}','{col_label}')">{contents}</td>"#
     ))
 }
 
     ))
 }
 
-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}"))
     } else {
     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}"))
     }
 }
         HTML(format!("{label}: {rest}"))
     }
 }
@@ -346,7 +360,13 @@ fn render_all_leftovers(config: &Config, row: &Row) -> HTML {
     HTML(
         order
             .into_iter()
     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(", "),
             .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
             .collect::<Vec<_>>()
             .join(", "),
@@ -363,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(""),
                 .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#"<td class="spacer_col"></td>"#),
                 })
                 .collect::<HTML>();
             let dynamic_cells = columns
                 .iter()
                 .filter(|&col| !config.hidden_columns.contains(col))
                     None => HTML::from(r#"<td class="spacer_col"></td>"#),
                 })
                 .collect::<HTML>();
             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::<HTML>();
             let leftovers = render_all_leftovers(config, row);
             HTML(format!(
                 .collect::<HTML>();
             let leftovers = render_all_leftovers(config, row);
             HTML(format!(
@@ -471,17 +491,17 @@ mod tests {
 
     #[test]
     fn test_tally_marks() {
 
     #[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<Vec<Rowlike>, std::io::Error> {
     }
 
     fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
@@ -683,6 +703,7 @@ mod tests {
     fn test_render_cell() {
         assert_eq!(
             render_cell(
     fn test_render_cell() {
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -690,11 +711,12 @@ mod tests {
                 }
             ),
             HTML::from(
                 }
             ),
             HTML::from(
-                r#"<td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+                r#"<td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
             )
         );
         assert_eq!(
             render_cell(
             )
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -702,11 +724,12 @@ mod tests {
                 }
             ),
             HTML::from(
                 }
             ),
             HTML::from(
-                r#"<td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+                r#"<td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
             )
         );
         assert_eq!(
             render_cell(
             )
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -719,6 +742,7 @@ mod tests {
         );
         assert_eq!(
             render_cell(
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -731,6 +755,7 @@ mod tests {
         );
         assert_eq!(
             render_cell(
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -746,6 +771,7 @@ mod tests {
         );
         assert_eq!(
             render_cell(
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -758,6 +784,20 @@ mod tests {
         );
         assert_eq!(
             render_cell(
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
+                "foo",
+                &mut Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![Some("Γ—".to_owned())])]),
+                }
+            ),
+            HTML::from(
+                r#"<td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">Γ—</td>"#
+            )
+        );
+        assert_eq!(
+            render_cell(
+                &Config::default(),
                 "heart",
                 &mut Row {
                     label: "nope".to_owned(),
                 "heart",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -770,6 +810,7 @@ mod tests {
         );
         assert_eq!(
             render_cell(
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "bob's".to_owned(),
                 "foo",
                 &mut Row {
                     label: "bob's".to_owned(),
@@ -788,11 +829,11 @@ mod tests {
             ]),
         };
         assert_eq!(r.entries.len(), 2);
             ]),
         };
         assert_eq!(r.entries.len(), 2);
-        render_cell("foo", &mut r);
+        render_cell(&Config::default(), "foo", &mut r);
         assert_eq!(r.entries.len(), 1);
         assert_eq!(r.entries.len(), 1);
-        render_cell("bar", &mut r);
+        render_cell(&Config::default(), "bar", &mut r);
         assert_eq!(r.entries.len(), 1);
         assert_eq!(r.entries.len(), 1);
-        render_cell("baz", &mut r);
+        render_cell(&Config::default(), "baz", &mut r);
         assert_eq!(r.entries.len(), 0);
     }
 
         assert_eq!(r.entries.len(), 0);
     }
 
@@ -841,6 +882,7 @@ mod tests {
                     static_columns: vec![],
                     hidden_columns: HashSet::from(["private".to_owned()]),
                     substitute_labels: HashMap::new(),
                     static_columns: vec![],
                     hidden_columns: HashSet::from(["private".to_owned()]),
                     substitute_labels: HashMap::new(),
+                    mark: HashMap::new(),
                 },
                 &Row {
                     label: "nope".to_owned(),
                 },
                 &Row {
                     label: "nope".to_owned(),
@@ -863,7 +905,7 @@ mod tests {
                 })
             ),
             HTML::from(
                 })
             ),
             HTML::from(
-                r#"<tr><th id="nope">nope</th><td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')">bar</td></tr>
+                r#"<tr><th id="nope">nope</th><td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')">bar</td></tr>
 "#
             )
         );
 "#
             )
         );
@@ -874,6 +916,7 @@ mod tests {
                     static_columns: vec![Some("foo".to_owned()), Some("bar".to_owned())],
                     hidden_columns: HashSet::new(),
                     substitute_labels: HashMap::new(),
                     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 {
                 },
                 &["baz".to_owned()],
                 &mut Rowlike::Row(Row {
@@ -897,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(),
                     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 {
                 },
                 &[],
                 &mut Rowlike::Row(Row {
@@ -919,6 +963,7 @@ mod tests {
                     static_columns: vec![],
                     hidden_columns: HashSet::from(["foo".to_owned()]),
                     substitute_labels: HashMap::new(),
                     static_columns: vec![],
                     hidden_columns: HashSet::from(["foo".to_owned()]),
                     substitute_labels: HashMap::new(),
+                    mark: HashMap::new(),
                 },
                 &[],
                 &mut Rowlike::Row(Row {
                 },
                 &[],
                 &mut Rowlike::Row(Row {
@@ -938,6 +983,7 @@ mod tests {
                     static_columns: vec![Some("foo".to_owned())],
                     hidden_columns: HashSet::from(["foo".to_owned()]),
                     substitute_labels: HashMap::new(),
                     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 {
                 },
                 &[],
                 &mut Rowlike::Row(Row {
@@ -947,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>
             ),
             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>
 "#
             )
         );
 "#
             )
         );
Summarize a text log as an HTML table