]> git.scottworley.com Git - tablify/blobdiff - src/lib.rs
projects / tablify / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Make read_rows() strict (not lazy)
[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs
index a7c28198b5faa15056fd274f1b9bd85ea61dd1dc..dbcfc7b90930da83effdcba5c75f60ecf2ae1254 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,11 +18,13 @@ const HEADER: &str = r#"<!DOCTYPE html>
     /* 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; }
     /* 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; }
+    th.spacer_row { height: .3em; }
     table { border-collapse: collapse }
     tr.key > th { height: 10em; 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; }
     table { border-collapse: collapse }
     tr.key > th { height: 10em; 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.leftover { text-align: left; border: none; padding-left: .4em; }
     td.yes { border: thin solid gray; background-color: #ddd; }
     /* 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; }
     td.yes { border: thin solid gray; background-color: #ddd; }
     /* 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; }
@@ -108,6 +110,12 @@ struct Row {
     entries: HashMap<String, Vec<Option<String>>>,
 }
 
     entries: HashMap<String, Vec<Option<String>>>,
 }
 
+#[derive(Debug, PartialEq, Eq)]
+enum Rowlike {
+    Row(Row),
+    Spacer,
+}
+
 struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
     input: std::iter::Enumerate<Input>,
     row: Option<Row>,
 struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
     input: std::iter::Enumerate<Input>,
     row: Option<Row>,
@@ -121,17 +129,17 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
     }
 }
 impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<Input> {
     }
 }
 impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<Input> {
-    type Item = Result<Row, std::io::Error>;
+    type Item = Result<Rowlike, std::io::Error>;
     fn next(&mut self) -> Option<Self::Item> {
         loop {
             match self.input.next() {
     fn next(&mut self) -> Option<Self::Item> {
         loop {
             match self.input.next() {
-                None => return Ok(std::mem::take(&mut self.row)).transpose(),
+                None => return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose(),
                 Some((_, Err(e))) => return Some(Err(e)),
                 Some((n, Ok(line))) => match InputLine::from(line.as_ref()) {
                     InputLine::Blank if self.row.is_some() => {
                 Some((_, Err(e))) => return Some(Err(e)),
                 Some((n, Ok(line))) => match InputLine::from(line.as_ref()) {
                     InputLine::Blank if self.row.is_some() => {
-                        return Ok(std::mem::take(&mut self.row)).transpose()
+                        return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose()
                     }
                     }
-                    InputLine::Blank => {}
+                    InputLine::Blank => return Some(Ok(Rowlike::Spacer)),
                     InputLine::Entry(col, instance) => match &mut self.row {
                         None => {
                             return Some(Err(std::io::Error::other(format!(
                     InputLine::Entry(col, instance) => match &mut self.row {
                         None => {
                             return Some(Err(std::io::Error::other(format!(
@@ -153,7 +161,7 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
                             entries: HashMap::new(),
                         });
                         if prev.is_some() {
                             entries: HashMap::new(),
                         });
                         if prev.is_some() {
-                            return Ok(prev).transpose();
+                            return Ok(prev.map(Rowlike::Row)).transpose();
                         }
                     }
                 },
                         }
                     }
                 },
@@ -162,14 +170,18 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
     }
 }
 
     }
 }
 
-fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<Row, std::io::Error>> {
-    Reader::new(std::io::BufReader::new(input).lines())
+fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
+    Reader::new(std::io::BufReader::new(input).lines()).collect::<Result<Vec<_>, _>>()
 }
 
 }
 
-fn column_counts(rows: &[Row]) -> Vec<(usize, String)> {
+fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
+    let empty = HashMap::new();
     let mut counts: Vec<_> = rows
         .iter()
     let mut counts: Vec<_> = rows
         .iter()
-        .flat_map(|r| r.entries.keys())
+        .flat_map(|rl| match rl {
+            Rowlike::Row(r) => r.entries.keys(),
+            Rowlike::Spacer => empty.keys(),
+        })
         .fold(HashMap::new(), |mut cs, col| {
             cs.entry(col.to_owned())
                 .and_modify(|n| *n += 1)
         .fold(HashMap::new(), |mut cs, col| {
             cs.entry(col.to_owned())
                 .and_modify(|n| *n += 1)
@@ -182,7 +194,7 @@ fn column_counts(rows: &[Row]) -> Vec<(usize, String)> {
     counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
     counts
 }
     counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
     counts
 }
-fn column_order(config: &Config, rows: &[Row]) -> Vec<String> {
+fn column_order(config: &Config, rows: &[Rowlike]) -> Vec<String> {
     column_counts(rows)
         .into_iter()
         .filter_map(|(n, col)| (n >= config.column_threshold).then_some(col))
     column_counts(rows)
         .into_iter()
         .filter_map(|(n, col)| (n >= config.column_threshold).then_some(col))
@@ -252,16 +264,21 @@ fn render_all_leftovers(row: &Row) -> HTML {
     )
 }
 
     )
 }
 
-fn render_row(columns: &[String], row: &mut Row) -> HTML {
-    let row_label = HTML::escape(row.label.as_ref());
-    let cells = columns
-        .iter()
-        .map(|col| render_cell(col, row))
-        .collect::<HTML>();
-    let leftovers = render_all_leftovers(row);
-    HTML(format!(
-        "<tr><th id=\"{row_label}\">{row_label}</th>{cells}<td onmouseover=\"highlight('{row_label}')\" onmouseout=\"clear_highlight('{row_label}')\">{leftovers}</td></tr>\n"
-    ))
+fn render_row(columns: &[String], rowlike: &mut Rowlike) -> HTML {
+    match rowlike {
+        Rowlike::Spacer => HTML::from("<tr><th class=\"spacer_row\"></th></tr>\n"),
+        Rowlike::Row(row) => {
+            let row_label = HTML::escape(row.label.as_ref());
+            let cells = columns
+                .iter()
+                .map(|col| render_cell(col, row))
+                .collect::<HTML>();
+            let leftovers = render_all_leftovers(row);
+            HTML(format!(
+                "<tr><th id=\"{row_label}\">{row_label}</th>{cells}<td class=\"leftover\" onmouseover=\"highlight('{row_label}')\" onmouseout=\"clear_highlight('{row_label}')\">{leftovers}</td></tr>\n"
+            ))
+        }
+    }
 }
 
 fn render_column_headers(columns: &[String]) -> HTML {
 }
 
 fn render_column_headers(columns: &[String]) -> HTML {
@@ -287,7 +304,7 @@ fn render_column_headers(columns: &[String]) -> HTML {
 ///   * the log has invalid syntax:
 ///     * an indented line with no preceding non-indented line
 pub fn tablify(config: &Config, input: impl std::io::Read) -> Result<HTML, std::io::Error> {
 ///   * the log has invalid syntax:
 ///     * an indented line with no preceding non-indented line
 pub fn tablify(config: &Config, input: impl std::io::Read) -> Result<HTML, std::io::Error> {
-    let rows = read_rows(input).collect::<Result<Vec<_>, _>>()?;
+    let rows = read_rows(input)?;
     let columns = column_order(config, &rows);
     Ok(HTML(format!(
         "{HEADER}{}{}{FOOTER}",
     let columns = column_order(config, &rows);
     Ok(HTML(format!(
         "{HEADER}{}{}{FOOTER}",
@@ -334,96 +351,102 @@ mod tests {
     #[test]
     fn test_read_rows() {
         assert_eq!(
     #[test]
     fn test_read_rows() {
         assert_eq!(
-            read_rows(&b"foo"[..]).flatten().collect::<Vec<_>>(),
-            vec![Row {
+            read_rows(&b"foo"[..]).unwrap(),
+            vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::new(),
                 label: "foo".to_owned(),
                 entries: HashMap::new(),
-            }]
+            })]
         );
         assert_eq!(
         );
         assert_eq!(
-            read_rows(&b"bar"[..]).flatten().collect::<Vec<_>>(),
-            vec![Row {
+            read_rows(&b"bar"[..]).unwrap(),
+            vec![Rowlike::Row(Row {
                 label: "bar".to_owned(),
                 entries: HashMap::new(),
                 label: "bar".to_owned(),
                 entries: HashMap::new(),
-            }]
+            })]
         );
         assert_eq!(
         );
         assert_eq!(
-            read_rows(&b"foo\nbar\n"[..]).flatten().collect::<Vec<_>>(),
+            read_rows(&b"foo\nbar\n"[..]).unwrap(),
             vec![
             vec![
-                Row {
+                Rowlike::Row(Row {
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
-                },
-                Row {
+                }),
+                Rowlike::Row(Row {
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
-                }
+                })
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(
-            read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),
-            vec![Row {
+            read_rows(&b"foo\n bar\n"[..]).unwrap(),
+            vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
-            }]
+            })]
         );
         assert_eq!(
         );
         assert_eq!(
-            read_rows(&b"foo\n bar\n baz\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
-            vec![Row {
+            read_rows(&b"foo\n bar\n baz\n"[..]).unwrap(),
+            vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([
                     ("bar".to_owned(), vec![None]),
                     ("baz".to_owned(), vec![None])
                 ]),
                 label: "foo".to_owned(),
                 entries: HashMap::from([
                     ("bar".to_owned(), vec![None]),
                     ("baz".to_owned(), vec![None])
                 ]),
-            }]
+            })]
         );
         assert_eq!(
         );
         assert_eq!(
-            read_rows(&b"foo\n\nbar\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n\nbar\n"[..]).unwrap(),
             vec![
             vec![
-                Row {
+                Rowlike::Row(Row {
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
-                },
-                Row {
+                }),
+                Rowlike::Row(Row {
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
-                }
+                })
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(
-            read_rows(&b"foo\n \nbar\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n\n\nbar\n"[..]).unwrap(),
             vec![
             vec![
-                Row {
+                Rowlike::Row(Row {
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
-                },
-                Row {
+                }),
+                Rowlike::Spacer,
+                Rowlike::Row(Row {
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
-                }
+                })
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(
-            read_rows(&b"foo  \n bar  \n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
-            vec![Row {
+            read_rows(&b"foo\n \nbar\n"[..]).unwrap(),
+            vec![
+                Rowlike::Row(Row {
+                    label: "foo".to_owned(),
+                    entries: HashMap::new(),
+                }),
+                Rowlike::Row(Row {
+                    label: "bar".to_owned(),
+                    entries: HashMap::new(),
+                })
+            ]
+        );
+        assert_eq!(
+            read_rows(&b"foo  \n bar  \n"[..]).unwrap(),
+            vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
-            }]
+            })]
         );
 
         );
 
-        let bad = read_rows(&b" foo"[..]).next().unwrap();
+        let bad = read_rows(&b" foo"[..]);
         assert!(bad.is_err());
         assert!(format!("{bad:?}").contains("1: Entry with no header"));
 
         assert!(bad.is_err());
         assert!(format!("{bad:?}").contains("1: Entry with no header"));
 
-        let bad2 = read_rows(&b"foo\n\n bar"[..]).nth(1).unwrap();
+        let bad2 = read_rows(&b"foo\n\n bar"[..]);
         assert!(bad2.is_err());
         assert!(format!("{bad2:?}").contains("3: Entry with no header"));
     }
         assert!(bad2.is_err());
         assert!(format!("{bad2:?}").contains("3: Entry with no header"));
     }
@@ -431,34 +454,20 @@ mod tests {
     #[test]
     fn test_column_counts() {
         assert_eq!(
     #[test]
     fn test_column_counts() {
         assert_eq!(
-            column_counts(
-                &read_rows(&b"foo\n bar\n baz\n"[..])
-                    .collect::<Result<Vec<_>, _>>()
-                    .unwrap()
-            ),
+            column_counts(&read_rows(&b"foo\n bar\n baz\n"[..]).unwrap()),
             vec![(1, String::from("bar")), (1, String::from("baz"))]
         );
         assert_eq!(
             vec![(1, String::from("bar")), (1, String::from("baz"))]
         );
         assert_eq!(
-            column_counts(
-                &read_rows(&b"foo\n bar\n baz\nquux\n baz"[..])
-                    .collect::<Result<Vec<_>, _>>()
-                    .unwrap()
-            ),
+            column_counts(&read_rows(&b"foo\n bar\n baz\nquux\n baz"[..]).unwrap()),
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
-            column_counts(
-                &read_rows(&b"foo\n bar\n bar\n baz\n bar\nquux\n baz"[..])
-                    .collect::<Result<Vec<_>, _>>()
-                    .unwrap()
-            ),
+            column_counts(&read_rows(&b"foo\n bar\n bar\n baz\n bar\nquux\n baz"[..]).unwrap()),
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
             column_counts(
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         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()
+                &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..]).unwrap()
             ),
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
             ),
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
@@ -617,13 +626,13 @@ mod tests {
         assert_eq!(
             render_row(
                 &["foo".to_owned()],
         assert_eq!(
             render_row(
                 &["foo".to_owned()],
-                &mut Row {
+                &mut Rowlike::Row(Row {
                     label: "nope".to_owned(),
                     entries: HashMap::from([("bar".to_owned(), vec![None])]),
                     label: "nope".to_owned(),
                     entries: HashMap::from([("bar".to_owned(), vec![None])]),
-                }
+                })
             ),
             HTML::from(
             ),
             HTML::from(
-                r#"<tr><th id="nope">nope</th><td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td><td onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')">bar</td></tr>
+                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>
 "#
             )
         );
 "#
             )
         );
Summarize a text log as an HTML table