Make a place in Entrty for instance data

[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs

index 8d60eb8ba898b65d93f3e50c00d859206f11ba36..bebbcf799792f0de82ad9d65bbe8543a0ddda01b 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,10 +2,60 @@ use std::collections::{HashMap, HashSet};
  use std::io::BufRead;
  use std::iter::Iterator;
  
  use std::io::BufRead;
  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: gray; }
+    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: String,
+}
+impl From<&str> for Entry {
+    fn from(value: &str) -> Entry {
+        Entry {
+            col: String::from(value),
+            instance: String::from(""),
+        }
+    }
+}
+
  #[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>>> {
@@ -42,7 +92,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);
@@ -68,7 +118,7 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
          .iter()
          .flat_map(|r| r.entries.iter().collect::<HashSet<_>>().into_iter())
          .fold(HashMap::new(), |mut cs, e| {
          .iter()
          .flat_map(|r| r.entries.iter().collect::<HashSet<_>>().into_iter())
          .fold(HashMap::new(), |mut cs, e| {
-            cs.entry(String::from(e))
+            cs.entry(String::from(&e.col))
                  .and_modify(|n| *n += 1)
                  .or_insert(1);
              cs
                  .and_modify(|n| *n += 1)
                  .or_insert(1);
              cs
@@ -89,7 +139,7 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
  pub fn tablify(input: impl std::io::Read) -> Result<String, std::io::Error> {
      let rows = read_rows(input).collect::<Result<Vec<_>, _>>()?;
      let _columns = column_counts(&rows);
  pub fn tablify(input: impl std::io::Read) -> Result<String, std::io::Error> {
      let rows = read_rows(input).collect::<Result<Vec<_>, _>>()?;
      let _columns = column_counts(&rows);
-    Ok(String::from("Hello, world!"))
+    Ok(String::from(HEADER) + "Hello, world!" + FOOTER)
  }
  
  #[cfg(test)]
  }
  
  #[cfg(test)]
@@ -129,7 +179,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!(
@@ -138,7 +188,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!(
@@ -177,7 +227,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")]
              }]
          );
  
              }]
          );