]> git.scottworley.com Git - tablify/blobdiff - src/lib.rs
projects / tablify / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
`!mark col:X` to override the tally mark character for a column
[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs
index c1a47617c701a4e018890b6106f6142733f271cd..e199470146730fd89cfea466878f926d0c42e488 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,10 +4,15 @@ 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 {
-    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)]
 }
 
 #[derive(PartialEq, Eq, Debug)]
@@ -16,6 +21,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> {
@@ -44,6 +50,16 @@ impl Config {
                     .substitute_labels
                     .insert(col.to_owned(), label.to_owned()),
             };
                     .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,
         } else {
             return Err(std::io::Error::new(
                 std::io::ErrorKind::InvalidInput,
@@ -60,6 +76,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 +99,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 +302,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 +310,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 +318,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()
@@ -330,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(""),
     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!(
     };
     row.entries.remove(col);
     HTML(format!(
@@ -338,12 +355,12 @@ 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}"))
     } 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}"))
     }
 }
@@ -358,7 +375,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(", "),
@@ -483,17 +506,22 @@ 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), "𝍸𝍸𝍷");
+        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<Vec<Rowlike>, std::io::Error> {
     }
 
     fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
@@ -623,6 +651,7 @@ mod tests {
                 .substitute_labels["foo"],
             "bar"
         );
                 .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());
 
         let bad_command = read_config(&b"!no such command"[..]);
         assert!(bad_command.is_err());
@@ -635,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_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]
     }
 
     #[test]
@@ -813,6 +846,26 @@ mod tests {
                 r#"<td class="yes" onmouseover="h2('bob&#39;s','foo')" onmouseout="ch2('bob&#39;s','foo')">𝍷</td>"#
             )
         );
                 r#"<td class="yes" onmouseover="h2('bob&#39;s','foo')" onmouseout="ch2('bob&#39;s','foo')">𝍷</td>"#
             )
         );
+        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#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">πŸ¦„</td>"#
+            )
+        );
+
         let mut r = Row {
             label: "nope".to_owned(),
             entries: HashMap::from([
         let mut r = Row {
             label: "nope".to_owned(),
             entries: HashMap::from([
@@ -874,6 +927,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(),
@@ -882,6 +936,22 @@ mod tests {
             ),
             HTML::from("")
         );
             ),
             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]
     }
 
     #[test]
@@ -907,6 +977,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 {
@@ -930,6 +1001,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 {
@@ -952,6 +1024,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 {
@@ -971,6 +1044,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 {
@@ -990,6 +1064,7 @@ mod tests {
                     static_columns: vec![],
                     hidden_columns: HashSet::new(),
                     substitute_labels: HashMap::from([("foo".to_owned(), "bar".to_owned())]),
                     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 {
                 },
                 &["foo".to_owned()],
                 &mut Rowlike::Row(Row {
Summarize a text log as an HTML table