Show line number in command-related error messages

[tablify] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index acf53834208d68cc32fc75f9959c027e850f54ed..09e2e7ad11801dd754e20d98ce0eb37a8459bec7 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,5 @@
 use std::borrow::ToOwned;
 use std::borrow::ToOwned;

-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};

 use std::fmt::Write;
 use std::io::BufRead;
 use std::iter::Iterator;
 use std::fmt::Write;
 use std::io::BufRead;
 use std::iter::Iterator;


@@ -7,13 +7,24 @@ use std::iter::Iterator;
 #[derive(PartialEq, Eq, Debug)]
 struct Config {
     column_threshold: usize,
 #[derive(PartialEq, Eq, Debug)]
 struct Config {
     column_threshold: usize,

+    static_columns: Vec<String>,

 }
 impl Config {
 }
 impl Config {

-    fn apply_command(&mut self, cmd: &str) -> Result<(), std::io::Error> {
+    fn apply_command(&mut self, line_num: usize, cmd: &str) -> Result<(), std::io::Error> {

         if let Some(threshold) = cmd.strip_prefix("col_threshold ") {
         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))?;
+            self.column_threshold = threshold.parse().map_err(|e| {
+                std::io::Error::new(
+                    std::io::ErrorKind::InvalidInput,
+                    format!("line {line_num}: col_threshold must be numeric: {e}"),
+                )
+            })?;
+        } else if let Some(col) = cmd.strip_prefix("col ") {
+            self.static_columns.push(col.to_owned());
+        } else {
+            return Err(std::io::Error::new(
+                std::io::ErrorKind::InvalidInput,
+                format!("line {line_num}: Unknown command: {cmd}"),
+            ));

         }
         Ok(())
     }
         }
         Ok(())
     }


@@ -155,7 +166,7 @@ impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Iterator
                 Some((_, Err(e))) => return Some(Err(e)),
                 Some((n, Ok(line))) => match InputLine::from(line.as_ref()) {
                     InputLine::Command(cmd) => {
                 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) {
+                        if let Err(e) = self.config.apply_command(n + 1, cmd) {

                             return Some(Err(e));
                         }
                     }
                             return Some(Err(e));
                         }
                     }


@@ -166,7 +177,7 @@ impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Iterator
                     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!(

-                                "{}: Entry with no header",
+                                "line {}: Entry with no header",

                                 n + 1
                             ))))
                         }
                                 n + 1
                             ))))
                         }


@@ -196,6 +207,7 @@ impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Iterator
 fn read_input(input: impl std::io::Read) -> Result<(Vec<Rowlike>, Config), std::io::Error> {
     let mut config = Config {
         column_threshold: 2,
 fn read_input(input: impl std::io::Read) -> Result<(Vec<Rowlike>, Config), std::io::Error> {
     let mut config = Config {
         column_threshold: 2,

+        static_columns: vec![],

     };
     let reader = Reader::new(&mut config, std::io::BufReader::new(input).lines());
     reader
     };
     let reader = Reader::new(&mut config, std::io::BufReader::new(input).lines());
     reader


@@ -224,9 +236,16 @@ fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
     counts
 }
 fn column_order(config: &Config, rows: &[Rowlike]) -> Vec<String> {
     counts
 }
 fn column_order(config: &Config, rows: &[Rowlike]) -> Vec<String> {

+    let static_columns: HashSet<&str> = config
+        .static_columns
+        .iter()
+        .map(std::string::String::as_str)
+        .collect();

     column_counts(rows)
         .into_iter()
     column_counts(rows)
         .into_iter()

-        .filter_map(|(n, col)| (n >= config.column_threshold).then_some(col))
+        .filter_map(|(n, col)| {
+            (n >= config.column_threshold && !static_columns.contains(col.as_str())).then_some(col)
+        })

         .collect()
 }
 
         .collect()
 }
 


@@ -298,13 +317,18 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM
         Rowlike::Spacer => HTML::from("<tr><th class=\"spacer_row\"></th></tr>\n"),
         Rowlike::Row(row) => {
             let row_label = HTML::escape(row.label.as_ref());
         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
+            let static_cells = config
+                .static_columns
+                .iter()
+                .map(|col| render_cell(col, row))
+                .collect::<HTML>();
+            let dynamic_cells = columns

                 .iter()
                 .map(|col| render_cell(col, row))
                 .collect::<HTML>();
             let leftovers = render_all_leftovers(row);
             HTML(format!(
                 .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"
+                "<tr><th id=\"{row_label}\">{row_label}</th>{static_cells}{dynamic_cells}<td class=\"leftover\" onmouseover=\"highlight('{row_label}')\" onmouseout=\"clear_highlight('{row_label}')\">{leftovers}</td></tr>\n"

             ))
         }
     }
             ))
         }
     }


@@ -313,15 +337,18 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM
 fn render_column_headers(config: &Config, columns: &[String]) -> HTML {
     HTML(
         String::from(r#"<tr class="key"><th></th>"#)
 fn render_column_headers(config: &Config, columns: &[String]) -> HTML {
     HTML(
         String::from(r#"<tr class="key"><th></th>"#)

-            + &columns.iter().fold(String::new(), |mut acc, col| {
-                let col_header = HTML::escape(col.as_ref());
-                write!(
-                    &mut acc,
-                    r#"<th id="{col_header}"><div><div>{col_header}</div></div></th>"#
-                )
-                .unwrap();
-                acc
-            })
+            + &config.static_columns.iter().chain(columns.iter()).fold(
+                String::new(),
+                |mut acc, col| {
+                    let col_header = HTML::escape(col.as_ref());
+                    write!(
+                        &mut acc,
+                        r#"<th id="{col_header}"><div><div>{col_header}</div></div></th>"#
+                    )
+                    .unwrap();
+                    acc
+                },
+            )

             + "</tr>\n",
     )
 }
             + "</tr>\n",
     )
 }


@@ -479,11 +506,11 @@ mod tests {
 
         let bad = read_rows(&b" foo"[..]);
         assert!(bad.is_err());
 
         let bad = read_rows(&b" foo"[..]);
         assert!(bad.is_err());

-        assert!(format!("{bad:?}").contains("1: Entry with no header"));
+        assert!(format!("{bad:?}").contains("line 1: Entry with no header"));

 
         let bad2 = read_rows(&b"foo\n\n bar"[..]);
         assert!(bad2.is_err());
 
         let bad2 = read_rows(&b"foo\n\n bar"[..]);
         assert!(bad2.is_err());

-        assert!(format!("{bad2:?}").contains("3: Entry with no header"));
+        assert!(format!("{bad2:?}").contains("line 3: Entry with no header"));

     }
 
     #[test]
     }
 
     #[test]


@@ -494,10 +521,18 @@ mod tests {
                 .column_threshold,
             10
         );
                 .column_threshold,
             10
         );

+        assert_eq!(
+            read_config(&b"!col foo"[..]).unwrap().static_columns,
+            vec!["foo".to_owned()]
+        );
+
+        let bad_command = read_config(&b"!no such command"[..]);
+        assert!(bad_command.is_err());
+        assert!(format!("{bad_command:?}").contains("line 1: Unknown command"));

 
         let bad_num = read_config(&b"!col_threshold foo"[..]);
         assert!(bad_num.is_err());
 
         let bad_num = read_config(&b"!col_threshold foo"[..]);
         assert!(bad_num.is_err());

-        assert!(format!("{bad_num:?}").contains("Parse"));
+        assert!(format!("{bad_num:?}").contains("line 1: col_threshold must be numeric"));

     }
 
     #[test]
     }
 
     #[test]


@@ -676,6 +711,7 @@ mod tests {
             render_row(
                 &Config {
                     column_threshold: 0,
             render_row(
                 &Config {
                     column_threshold: 0,

+                    static_columns: vec![],

                 },
                 &["foo".to_owned()],
                 &mut Rowlike::Row(Row {
                 },
                 &["foo".to_owned()],
                 &mut Rowlike::Row(Row {


@@ -685,6 +721,27 @@ mod tests {
             ),
             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>
             ),
             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>

+"#
+            )
+        );
+        assert_eq!(
+            render_row(
+                &Config {
+                    column_threshold: 0,
+                    static_columns: vec!["foo".to_owned(), "bar".to_owned()],
+                },
+                &["baz".to_owned()],
+                &mut Rowlike::Row(Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([
+                        ("bar".to_owned(), vec![Some("r".to_owned())]),
+                        ("baz".to_owned(), vec![Some("z".to_owned())]),
+                        ("foo".to_owned(), vec![Some("f".to_owned())]),
+                    ]),
+                })
+            ),
+            HTML::from(
+                r#"<tr><th id="nope">nope</th><td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">f</td><td class="yes" onmouseover="h2('nope','bar')" onmouseout="ch2('nope','bar')">r</td><td class="yes" onmouseover="h2('nope','baz')" onmouseout="ch2('nope','baz')">z</td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>

 "#
             )
         );
 "#
             )
         );