]> git.scottworley.com Git - tablify/blobdiff - src/lib.rs
projects / tablify / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Start on 0.5.0
[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs
index 74a54a2b814b96c88ba540c61bb962036105922e..2111e1ed798d3c4ce31582999baf8b141f8ef667 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,6 +8,7 @@ use std::iter::Iterator;
 struct Config {
     column_threshold: usize,
     static_columns: Vec<Option<String>>,
 struct Config {
     column_threshold: usize,
     static_columns: Vec<Option<String>>,
+    hidden_columns: HashSet<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> {
@@ -18,6 +19,8 @@ impl Config {
                     format!("line {line_num}: col_threshold must be numeric: {e}"),
                 )
             })?;
                     format!("line {line_num}: col_threshold must be numeric: {e}"),
                 )
             })?;
+        } else if let Some(col) = cmd.strip_prefix("hide ") {
+            self.hidden_columns.insert(col.to_owned());
         } else if let Some(col) = cmd.strip_prefix("col ") {
             self.static_columns.push(Some(col.to_owned()));
         } else if cmd == "colsep" {
         } else if let Some(col) = cmd.strip_prefix("col ") {
             self.static_columns.push(Some(col.to_owned()));
         } else if cmd == "colsep" {
@@ -31,11 +34,15 @@ impl Config {
         Ok(())
     }
 }
         Ok(())
     }
 }
-
-const DEFAULT_CONFIG: Config = Config {
-    column_threshold: 2,
-    static_columns: vec![],
-};
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            column_threshold: 2,
+            static_columns: vec![],
+            hidden_columns: HashSet::new(),
+        }
+    }
+}
 
 const HEADER: &str = r#"<!DOCTYPE html>
 <html>
 
 const HEADER: &str = r#"<!DOCTYPE html>
 <html>
@@ -213,7 +220,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> {
 }
 
 fn read_input(input: impl std::io::Read) -> Result<(Vec<Rowlike>, Config), std::io::Error> {
-    let mut config = DEFAULT_CONFIG;
+    let mut config = Config::default();
     let reader = Reader::new(&mut config, std::io::BufReader::new(input).lines());
     reader
         .collect::<Result<Vec<_>, _>>()
     let reader = Reader::new(&mut config, std::io::BufReader::new(input).lines());
     reader
         .collect::<Result<Vec<_>, _>>()
@@ -250,7 +257,10 @@ fn column_order(config: &Config, rows: &[Rowlike]) -> Vec<String> {
     column_counts(rows)
         .into_iter()
         .filter_map(|(n, col)| {
     column_counts(rows)
         .into_iter()
         .filter_map(|(n, col)| {
-            (n >= config.column_threshold && !static_columns.contains(col.as_str())).then_some(col)
+            (n >= config.column_threshold
+                && !static_columns.contains(col.as_str())
+                && !config.hidden_columns.contains(&col))
+            .then_some(col)
         })
         .collect()
 }
         })
         .collect()
 }
@@ -305,8 +315,12 @@ fn render_leftover(notcol: &str, instances: &[Option<String>]) -> HTML {
     }
 }
 
     }
 }
 
-fn render_all_leftovers(row: &Row) -> HTML {
-    let mut order: Vec<_> = row.entries.keys().collect();
+fn render_all_leftovers(config: &Config, row: &Row) -> HTML {
+    let mut order: Vec<_> = row
+        .entries
+        .keys()
+        .filter(|&col| !config.hidden_columns.contains(col))
+        .collect();
     order.sort_unstable();
     HTML(
         order
     order.sort_unstable();
     HTML(
         order
@@ -327,15 +341,17 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM
                 .static_columns
                 .iter()
                 .map(|ocol| match ocol {
                 .static_columns
                 .iter()
                 .map(|ocol| match ocol {
+                    Some(col) if config.hidden_columns.contains(col) => HTML::from(""),
                     Some(col) => render_cell(col, row),
                     None => HTML::from(r#"<td class="spacer_col"></td>"#),
                 })
                 .collect::<HTML>();
             let dynamic_cells = columns
                 .iter()
                     Some(col) => render_cell(col, row),
                     None => HTML::from(r#"<td class="spacer_col"></td>"#),
                 })
                 .collect::<HTML>();
             let dynamic_cells = columns
                 .iter()
+                .filter(|&col| !config.hidden_columns.contains(col))
                 .map(|col| render_cell(col, row))
                 .collect::<HTML>();
                 .map(|col| render_cell(col, row))
                 .collect::<HTML>();
-            let leftovers = render_all_leftovers(row);
+            let leftovers = render_all_leftovers(config, row);
             HTML(format!(
                 "<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"
             ))
             HTML(format!(
                 "<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"
             ))
@@ -350,6 +366,10 @@ fn render_column_headers(config: &Config, columns: &[String]) -> HTML {
         String::from(r#"<tr class="key"><th></th>"#)
             + &static_columns
                 .chain(dynamic_columns)
         String::from(r#"<tr class="key"><th></th>"#)
             + &static_columns
                 .chain(dynamic_columns)
+                .filter(|ocol| {
+                    ocol.map(|col| !config.hidden_columns.contains(col))
+                        .unwrap_or(true)
+                })
                 .fold(String::new(), |mut acc, ocol| {
                     match ocol {
                         Some(col) => {
                 .fold(String::new(), |mut acc, ocol| {
                     match ocol {
                         Some(col) => {
@@ -692,39 +712,62 @@ mod tests {
     #[test]
     fn test_render_leftovers() {
         assert_eq!(
     #[test]
     fn test_render_leftovers() {
         assert_eq!(
-            render_all_leftovers(&Row {
-                label: "nope".to_owned(),
-                entries: HashMap::from([("foo".to_owned(), vec![None])]),
-            }),
+            render_all_leftovers(
+                &Config::default(),
+                &Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![None])]),
+                }
+            ),
             HTML::from("foo")
         );
         assert_eq!(
             HTML::from("foo")
         );
         assert_eq!(
-            render_all_leftovers(&Row {
-                label: "nope".to_owned(),
-                entries: HashMap::from([
-                    ("foo".to_owned(), vec![None]),
-                    ("bar".to_owned(), vec![None])
-                ]),
-            }),
+            render_all_leftovers(
+                &Config::default(),
+                &Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([
+                        ("foo".to_owned(), vec![None]),
+                        ("bar".to_owned(), vec![None])
+                    ]),
+                }
+            ),
             HTML::from("bar, foo")
         );
         assert_eq!(
             HTML::from("bar, foo")
         );
         assert_eq!(
-            render_all_leftovers(&Row {
-                label: "nope".to_owned(),
-                entries: HashMap::from([
-                    ("foo".to_owned(), vec![None]),
-                    ("bar".to_owned(), vec![None, None])
-                ]),
-            }),
+            render_all_leftovers(
+                &Config::default(),
+                &Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([
+                        ("foo".to_owned(), vec![None]),
+                        ("bar".to_owned(), vec![None, None])
+                    ]),
+                }
+            ),
             HTML::from("bar: 2, foo")
         );
             HTML::from("bar: 2, foo")
         );
+        assert_eq!(
+            render_all_leftovers(
+                &Config {
+                    column_threshold: 2,
+                    static_columns: vec![],
+                    hidden_columns: HashSet::from(["private".to_owned()]),
+                },
+                &Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("private".to_owned(), vec![None]),]),
+                }
+            ),
+            HTML::from("")
+        );
     }
 
     #[test]
     fn test_render_row() {
         assert_eq!(
             render_row(
     }
 
     #[test]
     fn test_render_row() {
         assert_eq!(
             render_row(
-                &DEFAULT_CONFIG,
+                &Config::default(),
                 &["foo".to_owned()],
                 &mut Rowlike::Row(Row {
                     label: "nope".to_owned(),
                 &["foo".to_owned()],
                 &mut Rowlike::Row(Row {
                     label: "nope".to_owned(),
@@ -741,6 +784,7 @@ mod tests {
                 &Config {
                     column_threshold: 0,
                     static_columns: vec![Some("foo".to_owned()), Some("bar".to_owned())],
                 &Config {
                     column_threshold: 0,
                     static_columns: vec![Some("foo".to_owned()), Some("bar".to_owned())],
+                    hidden_columns: HashSet::new(),
                 },
                 &["baz".to_owned()],
                 &mut Rowlike::Row(Row {
                 },
                 &["baz".to_owned()],
                 &mut Rowlike::Row(Row {
@@ -762,6 +806,7 @@ mod tests {
                 &Config {
                     column_threshold: 0,
                     static_columns: vec![Some("foo".to_owned()), None, Some("bar".to_owned())],
                 &Config {
                     column_threshold: 0,
                     static_columns: vec![Some("foo".to_owned()), None, Some("bar".to_owned())],
+                    hidden_columns: HashSet::new(),
                 },
                 &[],
                 &mut Rowlike::Row(Row {
                 },
                 &[],
                 &mut Rowlike::Row(Row {
@@ -774,6 +819,42 @@ mod tests {
             ),
             HTML::from(
                 r#"<tr><th id="nope">nope</th><td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">f</td><td class="spacer_col"></td><td class="yes" onmouseover="h2('nope','bar')" onmouseout="ch2('nope','bar')">r</td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
             ),
             HTML::from(
                 r#"<tr><th id="nope">nope</th><td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">f</td><td class="spacer_col"></td><td class="yes" onmouseover="h2('nope','bar')" onmouseout="ch2('nope','bar')">r</td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
+"#
+            )
+        );
+        assert_eq!(
+            render_row(
+                &Config {
+                    column_threshold: 0,
+                    static_columns: vec![],
+                    hidden_columns: HashSet::from(["foo".to_owned()]),
+                },
+                &[],
+                &mut Rowlike::Row(Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![Some("f".to_owned())]),]),
+                })
+            ),
+            HTML::from(
+                r#"<tr><th id="nope">nope</th><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
+"#
+            )
+        );
+        assert_eq!(
+            render_row(
+                &Config {
+                    column_threshold: 0,
+                    static_columns: vec![Some("foo".to_owned())],
+                    hidden_columns: HashSet::from(["foo".to_owned()]),
+                },
+                &[],
+                &mut Rowlike::Row(Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![Some("f".to_owned())]),]),
+                })
+            ),
+            HTML::from(
+                r#"<tr><th id="nope">nope</th><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
 "#
             )
         );
 "#
             )
         );
Summarize a text log as an HTML table