]> git.scottworley.com Git - tablify/blobdiff - src/lib.rs
projects / tablify / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Lighter gray background for active cells
[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs
index c7271f3932965c7a2f64712764307af83e1ec593..1aee9782fcd4b477ba9205fc3badb924bd20765d 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,14 +1,69 @@
-#[cfg(test)]
 use std::collections::{HashMap, HashSet};
 use std::collections::{HashMap, HashSet};
-#[cfg(test)]
+use std::fmt::Write;
 use std::io::BufRead;
 use std::io::BufRead;
-#[cfg(test)]
 use std::iter::Iterator;
 
 use std::iter::Iterator;
 
+const HEADER: &str = "<!DOCTYPE html>
+<html>
+<head>
+  <meta charset=\"utf-8\">
+  <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">
+  <style>
+    /* h/t https://wabain.github.io/2019/10/13/css-rotated-table-header.html */
+    th, td { white-space: nowrap; }
+    th { text-align: left; font-weight: normal; }
+    table { border-collapse: collapse }
+    tr.key > th { height: 8em; vertical-align: bottom; line-height: 1 }
+    tr.key > th > div { width: 1em; }
+    tr.key > th > div > div { width: 5em; transform-origin: bottom left; transform: translateX(1em) rotate(-65deg) }
+    td { border: thin solid gray; }
+    td.numeric { text-align: right; }
+    td.yes { border: thin solid gray; background-color: #ddd; }
+    td.spacer { border: none; }
+    /* 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; }
+    img { height: 1.2em; }
+  </style>
+  <script>
+    function highlight(id)       { const e = document.getElementById(id); if (e) { e.classList.add(   \"highlight\"); } }
+    function clear_highlight(id) { const e = document.getElementById(id); if (e) { e.classList.remove(\"highlight\"); } }
+    function h2(a, b)  {       highlight(a);       highlight(b); }
+    function ch2(a, b) { clear_highlight(a); clear_highlight(b); }
+  </script>
+</head>
+<body>
+  <table>
+    <tbody>
+";
+const FOOTER: &str = "    </tbody>
+  </table>
+</body>
+</html>";
+
+#[derive(Debug, PartialEq, Eq, Hash)]
+struct Entry {
+    col: String,
+    instance: Option<String>,
+}
+impl From<&str> for Entry {
+    fn from(value: &str) -> Entry {
+        match value.split_once(':') {
+            None => Entry {
+                col: String::from(value),
+                instance: None,
+            },
+            Some((col, instance)) => Entry {
+                col: String::from(col.trim()),
+                instance: Some(String::from(instance.trim())),
+            },
+        }
+    }
+}
+
 #[derive(Debug, PartialEq, Eq)]
 struct RowInput {
     label: String,
 #[derive(Debug, PartialEq, Eq)]
 struct RowInput {
     label: String,
-    entries: Vec<String>,
+    entries: Vec<Entry>,
 }
 
 struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
 }
 
 struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
@@ -16,7 +71,6 @@ struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
     row: Option<RowInput>,
 }
 impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
     row: Option<RowInput>,
 }
 impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
-    #[cfg(test)]
     fn new(input: Input) -> Self {
         Self {
             input: input.enumerate(),
     fn new(input: Input) -> Self {
         Self {
             input: input.enumerate(),
@@ -46,7 +100,7 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
                             n + 1
                         ))))
                     }
                             n + 1
                         ))))
                     }
-                    Some(ref mut row) => row.entries.push(String::from(line.trim())),
+                    Some(ref mut row) => row.entries.push(Entry::from(line.trim())),
                 },
                 Some((_, Ok(line))) => {
                     let prev = std::mem::take(&mut self.row);
                 },
                 Some((_, Ok(line))) => {
                     let prev = std::mem::take(&mut self.row);
@@ -63,32 +117,134 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
     }
 }
 
     }
 }
 
-#[cfg(test)]
 fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<RowInput, std::io::Error>> {
     Reader::new(std::io::BufReader::new(input).lines())
 }
 
 fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<RowInput, std::io::Error>> {
     Reader::new(std::io::BufReader::new(input).lines())
 }
 
-#[cfg(test)]
-fn column_counts(rows: &[RowInput]) -> HashMap<String, usize> {
-    rows.iter()
-        .flat_map(|r| r.entries.iter().collect::<HashSet<_>>().into_iter())
-        .fold(HashMap::new(), |mut counts, e| {
-            counts
-                .entry(String::from(e))
-                .and_modify(|c| *c += 1)
+fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
+    let mut counts: Vec<_> = rows
+        .iter()
+        .flat_map(|r| {
+            r.entries
+                .iter()
+                .map(|e| &e.col)
+                .collect::<HashSet<_>>()
+                .into_iter()
+        })
+        .fold(HashMap::new(), |mut cs, col| {
+            cs.entry(String::from(col))
+                .and_modify(|n| *n += 1)
                 .or_insert(1);
                 .or_insert(1);
-            counts
+            cs
         })
         })
+        .into_iter()
+        .map(|(col, n)| (n, col))
+        .collect();
+    counts.sort();
+    counts
+}
+fn column_order(rows: &[RowInput]) -> Vec<String> {
+    column_counts(rows)
+        .into_iter()
+        .map(|(_, col)| col)
+        .collect()
+}
+
+fn render_instance(entry: &Entry) -> String {
+    match &entry.instance {
+        None => String::from("✓ "),
+        Some(instance) => String::from(instance) + " ",
+    }
+}
+
+fn render_cell(col: &str, row: &RowInput) -> String {
+    // TODO: Escape HTML special characters
+    let entries: Vec<&Entry> = row.entries.iter().filter(|e| e.col == col).collect();
+    let class = if entries.is_empty() { "" } else { "yes" };
+    let all_empty = entries.iter().all(|e| e.instance.is_none());
+    let contents = if entries.is_empty() || (all_empty && entries.len() == 1) {
+        String::new()
+    } else if all_empty {
+        format!("{}", entries.len())
+    } else {
+        entries
+            .iter()
+            .map(|i| render_instance(i))
+            .collect::<String>()
+    };
+    format!("<td class=\"{class}\">{}</td>", contents.trim())
 }
 
 }
 
-pub fn tablify(_input: &impl std::io::Read) -> String {
-    String::from("Hello, world!")
+fn render_row(columns: &[String], row: &RowInput) -> String {
+    // This is O(n^2) & doesn't need to be
+    // TODO: Escape HTML special characters
+    format!(
+        "<tr><th>{}</th>{}</tr>\n",
+        row.label,
+        &columns
+            .iter()
+            .map(|col| render_cell(col, row))
+            .collect::<String>()
+    )
+}
+
+fn render_column_headers(columns: &[String]) -> String {
+    // TODO: Escape HTML special characters
+    String::from("<th></th>")
+        + &columns.iter().fold(String::new(), |mut acc, c| {
+            write!(&mut acc, "<th>{c}</th>").unwrap();
+            acc
+        })
+        + "\n"
+}
+
+/// # Errors
+///
+/// Will return `Err` if
+///   * there's an i/o error while reading `input`
+///   * the log has invalid syntax:
+///     * an indented line with no preceding non-indented line
+pub fn tablify(input: impl std::io::Read) -> Result<String, std::io::Error> {
+    let rows = read_rows(input).collect::<Result<Vec<_>, _>>()?;
+    let columns = column_order(&rows);
+    Ok(String::from(HEADER)
+        + &render_column_headers(&columns)
+        + &rows
+            .into_iter()
+            .map(|r| render_row(&columns, &r))
+            .collect::<String>()
+        + FOOTER)
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
+    #[test]
+    fn test_parse_entry() {
+        assert_eq!(
+            Entry::from("foo"),
+            Entry {
+                col: String::from("foo"),
+                instance: None
+            }
+        );
+        assert_eq!(
+            Entry::from("foo:bar"),
+            Entry {
+                col: String::from("foo"),
+                instance: Some(String::from("bar"))
+            }
+        );
+        assert_eq!(
+            Entry::from("foo: bar"),
+            Entry {
+                col: String::from("foo"),
+                instance: Some(String::from("bar"))
+            }
+        );
+    }
+
     #[test]
     fn test_read_rows() {
         assert_eq!(
     #[test]
     fn test_read_rows() {
         assert_eq!(
@@ -122,7 +278,7 @@ mod tests {
             read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),
             vec![RowInput {
                 label: String::from("foo"),
             read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),
             vec![RowInput {
                 label: String::from("foo"),
-                entries: vec![String::from("bar")]
+                entries: vec![Entry::from("bar")]
             }]
         );
         assert_eq!(
             }]
         );
         assert_eq!(
@@ -131,7 +287,7 @@ mod tests {
                 .collect::<Vec<_>>(),
             vec![RowInput {
                 label: String::from("foo"),
                 .collect::<Vec<_>>(),
             vec![RowInput {
                 label: String::from("foo"),
-                entries: vec![String::from("bar"), String::from("baz")]
+                entries: vec![Entry::from("bar"), Entry::from("baz")]
             }]
         );
         assert_eq!(
             }]
         );
         assert_eq!(
@@ -170,7 +326,7 @@ mod tests {
                 .collect::<Vec<_>>(),
             vec![RowInput {
                 label: String::from("foo"),
                 .collect::<Vec<_>>(),
             vec![RowInput {
                 label: String::from("foo"),
-                entries: vec![String::from("bar")]
+                entries: vec![Entry::from("bar")]
             }]
         );
 
             }]
         );
 
@@ -191,7 +347,7 @@ mod tests {
                     .collect::<Result<Vec<_>, _>>()
                     .unwrap()
             ),
                     .collect::<Result<Vec<_>, _>>()
                     .unwrap()
             ),
-            HashMap::from([(String::from("bar"), 1), (String::from("baz"), 1)])
+            vec![(1, String::from("bar")), (1, String::from("baz"))]
         );
         assert_eq!(
             column_counts(
         );
         assert_eq!(
             column_counts(
@@ -199,7 +355,7 @@ mod tests {
                     .collect::<Result<Vec<_>, _>>()
                     .unwrap()
             ),
                     .collect::<Result<Vec<_>, _>>()
                     .unwrap()
             ),
-            HashMap::from([(String::from("bar"), 1), (String::from("baz"), 2)])
+            vec![(1, String::from("bar")), (2, String::from("baz"))]
         );
         assert_eq!(
             column_counts(
         );
         assert_eq!(
             column_counts(
@@ -207,7 +363,79 @@ mod tests {
                     .collect::<Result<Vec<_>, _>>()
                     .unwrap()
             ),
                     .collect::<Result<Vec<_>, _>>()
                     .unwrap()
             ),
-            HashMap::from([(String::from("bar"), 1), (String::from("baz"), 2)])
+            vec![(1, String::from("bar")), (2, String::from("baz"))]
+        );
+        assert_eq!(
+            column_counts(
+                &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..])
+                    .collect::<Result<Vec<_>, _>>()
+                    .unwrap()
+            ),
+            vec![(1, String::from("bar")), (2, String::from("baz"))]
+        );
+    }
+
+    #[test]
+    fn test_render_cell() {
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![]
+                }
+            ),
+            String::from("<td class=\"\"></td>")
+        );
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![Entry::from("bar")]
+                }
+            ),
+            String::from("<td class=\"\"></td>")
+        );
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![Entry::from("foo")]
+                }
+            ),
+            String::from("<td class=\"yes\"></td>")
+        );
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![Entry::from("foo"), Entry::from("foo")]
+                }
+            ),
+            String::from("<td class=\"yes\">2</td>")
+        );
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![Entry::from("foo: 5"), Entry::from("foo: 10")]
+                }
+            ),
+            String::from("<td class=\"yes\">5 10</td>")
+        );
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![Entry::from("foo: 5"), Entry::from("foo")]
+                }
+            ),
+            String::from("<td class=\"yes\">5 ✓</td>")
         );
     }
 }
         );
     }
 }
Summarize a text log as an HTML table