]> git.scottworley.com Git - tablify/blobdiff - src/lib.rs
projects / tablify / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Read column threshold from `!col_threshold <N>` in input
[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs
index e11f08b7f623f921b4df1ead0f429d318c7f6219..b52806a744df217691d50d43d471f01cdbd15e0d 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,8 +4,19 @@ use std::fmt::Write;
 use std::io::BufRead;
 use std::iter::Iterator;
 
 use std::io::BufRead;
 use std::iter::Iterator;
 
-pub struct Config {
-    pub column_threshold: usize,
+#[derive(PartialEq, Eq, Debug)]
+struct Config {
+    column_threshold: usize,
+}
+impl Config {
+    fn apply_command(&mut self, cmd: &str) -> Result<(), std::io::Error> {
+        if let Some(threshold) = cmd.strip_prefix("col_threshold ") {
+            self.column_threshold = threshold
+                .parse()
+                .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidInput, e))?;
+        }
+        Ok(())
+    }
 }
 
 const HEADER: &str = r#"<!DOCTYPE html>
 }
 
 const HEADER: &str = r#"<!DOCTYPE html>
@@ -18,6 +29,7 @@ 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; }
     table { border-collapse: collapse }
     tr.key > th { height: 10em; vertical-align: bottom; line-height: 1 }
     tr.key > th > div { width: 1em; }
@@ -86,12 +98,15 @@ enum InputLine<'a> {
     Blank,
     RowHeader(&'a str),
     Entry(&'a str, Option<&'a str>),
     Blank,
     RowHeader(&'a str),
     Entry(&'a str, Option<&'a str>),
+    Command(&'a str),
 }
 impl<'a> From<&'a str> for InputLine<'a> {
     fn from(value: &'a str) -> InputLine<'a> {
         let trimmed = value.trim_end();
         if trimmed.is_empty() {
             InputLine::Blank
 }
 impl<'a> From<&'a str> for InputLine<'a> {
     fn from(value: &'a str) -> InputLine<'a> {
         let trimmed = value.trim_end();
         if trimmed.is_empty() {
             InputLine::Blank
+        } else if let Some(cmd) = trimmed.strip_prefix('!') {
+            InputLine::Command(cmd)
         } else if !trimmed.starts_with(' ') {
             InputLine::RowHeader(value.trim())
         } else {
         } else if !trimmed.starts_with(' ') {
             InputLine::RowHeader(value.trim())
         } else {
@@ -115,19 +130,23 @@ enum Rowlike {
     Spacer,
 }
 
     Spacer,
 }
 
-struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
+struct Reader<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> {
     input: std::iter::Enumerate<Input>,
     row: Option<Row>,
     input: std::iter::Enumerate<Input>,
     row: Option<Row>,
+    config: &'cfg mut Config,
 }
 }
-impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
-    fn new(input: Input) -> Self {
+impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Reader<'cfg, Input> {
+    fn new(config: &'cfg mut Config, input: Input) -> Self {
         Self {
             input: input.enumerate(),
             row: None,
         Self {
             input: input.enumerate(),
             row: None,
+            config,
         }
     }
 }
         }
     }
 }
-impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<Input> {
+impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Iterator
+    for Reader<'cfg, Input>
+{
     type Item = Result<Rowlike, std::io::Error>;
     fn next(&mut self) -> Option<Self::Item> {
         loop {
     type Item = Result<Rowlike, std::io::Error>;
     fn next(&mut self) -> Option<Self::Item> {
         loop {
@@ -135,10 +154,15 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
                 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()) {
                 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::Command(cmd) => {
+                        if let Err(e) = self.config.apply_command(cmd) {
+                            return Some(Err(e));
+                        }
+                    }
                     InputLine::Blank if self.row.is_some() => {
                         return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose()
                     }
                     InputLine::Blank if self.row.is_some() => {
                         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!(
@@ -169,8 +193,14 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
     }
 }
 
     }
 }
 
-fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<Rowlike, std::io::Error>> {
-    Reader::new(std::io::BufReader::new(input).lines())
+fn read_input(input: impl std::io::Read) -> Result<(Vec<Rowlike>, Config), std::io::Error> {
+    let mut config = Config {
+        column_threshold: 2,
+    };
+    let reader = Reader::new(&mut config, std::io::BufReader::new(input).lines());
+    reader
+        .collect::<Result<Vec<_>, _>>()
+        .map(|rows| (rows, config))
 }
 
 fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
 }
 
 fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
@@ -265,7 +295,7 @@ fn render_all_leftovers(row: &Row) -> HTML {
 
 fn render_row(columns: &[String], rowlike: &mut Rowlike) -> HTML {
     match rowlike {
 
 fn render_row(columns: &[String], rowlike: &mut Rowlike) -> HTML {
     match rowlike {
-        Rowlike::Spacer => HTML::from("<tr><td>&nbsp;</td></tr>"),
+        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
         Rowlike::Row(row) => {
             let row_label = HTML::escape(row.label.as_ref());
             let cells = columns
@@ -302,9 +332,9 @@ fn render_column_headers(columns: &[String]) -> HTML {
 ///   * there's an i/o error while reading `input`
 ///   * the log has invalid syntax:
 ///     * an indented line with no preceding non-indented line
 ///   * 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(config: &Config, input: impl std::io::Read) -> Result<HTML, std::io::Error> {
-    let rows = read_rows(input).collect::<Result<Vec<_>, _>>()?;
-    let columns = column_order(config, &rows);
+pub fn tablify(input: impl std::io::Read) -> Result<HTML, std::io::Error> {
+    let (rows, config) = read_input(input)?;
+    let columns = column_order(&config, &rows);
     Ok(HTML(format!(
         "{HEADER}{}{}{FOOTER}",
         render_column_headers(&columns),
     Ok(HTML(format!(
         "{HEADER}{}{}{FOOTER}",
         render_column_headers(&columns),
@@ -347,24 +377,30 @@ mod tests {
         );
     }
 
         );
     }
 
+    fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
+        read_input(input).map(|(rows, _)| rows)
+    }
+    fn read_config(input: impl std::io::Read) -> Result<Config, std::io::Error> {
+        read_input(input).map(|(_, config)| config)
+    }
     #[test]
     fn test_read_rows() {
         assert_eq!(
     #[test]
     fn test_read_rows() {
         assert_eq!(
-            read_rows(&b"foo"[..]).flatten().collect::<Vec<_>>(),
+            read_rows(&b"foo"[..]).unwrap(),
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::new(),
             })]
         );
         assert_eq!(
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::new(),
             })]
         );
         assert_eq!(
-            read_rows(&b"bar"[..]).flatten().collect::<Vec<_>>(),
+            read_rows(&b"bar"[..]).unwrap(),
             vec![Rowlike::Row(Row {
                 label: "bar".to_owned(),
                 entries: HashMap::new(),
             })]
         );
         assert_eq!(
             vec![Rowlike::Row(Row {
                 label: "bar".to_owned(),
                 entries: HashMap::new(),
             })]
         );
         assert_eq!(
-            read_rows(&b"foo\nbar\n"[..]).flatten().collect::<Vec<_>>(),
+            read_rows(&b"foo\nbar\n"[..]).unwrap(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
@@ -377,16 +413,14 @@ mod tests {
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(
-            read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),
+            read_rows(&b"foo\n bar\n"[..]).unwrap(),
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
             })]
         );
         assert_eq!(
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
             })]
         );
         assert_eq!(
-            read_rows(&b"foo\n bar\n baz\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n bar\n baz\n"[..]).unwrap(),
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([
@@ -396,9 +430,7 @@ mod tests {
             })]
         );
         assert_eq!(
             })]
         );
         assert_eq!(
-            read_rows(&b"foo\n\nbar\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n\nbar\n"[..]).unwrap(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
@@ -411,14 +443,13 @@ mod tests {
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(
-            read_rows(&b"foo\n\n\nbar\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n\n\nbar\n"[..]).unwrap(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
                 }),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
                 }),
+                Rowlike::Spacer,
                 Rowlike::Row(Row {
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
                 Rowlike::Row(Row {
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
@@ -426,9 +457,7 @@ mod tests {
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(
-            read_rows(&b"foo\n \nbar\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n \nbar\n"[..]).unwrap(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
@@ -441,55 +470,53 @@ mod tests {
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(
-            read_rows(&b"foo  \n bar  \n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo  \n bar  \n"[..]).unwrap(),
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
             })]
         );
 
             vec![Rowlike::Row(Row {
                 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"));
     }
 
+    #[test]
+    fn test_read_config() {
+        assert_eq!(
+            read_config(&b"!col_threshold 10"[..]).unwrap(),
+            Config {
+                column_threshold: 10
+            }
+        );
+
+        let bad_num = read_config(&b"!col_threshold foo"[..]);
+        assert!(bad_num.is_err());
+        assert!(format!("{bad_num:?}").contains("Parse"));
+    }
+
     #[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"))]
         );
Summarize a text log as an HTML table