-#[cfg(test)]
+use std::collections::{HashMap, HashSet};
+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: Option<String>,
+}
+impl From<&str> for Entry {
+ fn from(value: &str) -> Entry {
+ match value.split_once(':') {
+ None => Entry {
+ col: String::from(value),
+ instance: None,
+ },
+ Some((col, instance)) => Entry {
+ col: String::from(col.trim()),
+ instance: Some(String::from(instance.trim())),
+ },
+ }
+ }
+}
+
#[derive(Debug, PartialEq, Eq)]
struct RowInput {
label: String,
- entries: Vec<String>,
+ entries: Vec<Entry>,
}
-#[cfg(test)]
-fn read_rows(_input: &impl std::io::Read) -> impl Iterator<Item = RowInput> {
- vec![RowInput {
- label: String::from("foo"),
- entries: vec![],
- }]
- .into_iter()
+struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
+ input: std::iter::Enumerate<Input>,
+ row: Option<RowInput>,
+}
+impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
+ fn new(input: Input) -> Self {
+ Self {
+ input: input.enumerate(),
+ row: None,
+ }
+ }
+}
+impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<Input> {
+ type Item = Result<RowInput, std::io::Error>;
+ fn next(&mut self) -> Option<Self::Item> {
+ loop {
+ match self
+ .input
+ .next()
+ .map(|(n, r)| (n, r.map(|line| String::from(line.trim_end()))))
+ {
+ None => return Ok(std::mem::take(&mut self.row)).transpose(),
+ Some((_, Err(e))) => return Some(Err(e)),
+ Some((_, Ok(line))) if line.is_empty() && self.row.is_some() => {
+ return Ok(std::mem::take(&mut self.row)).transpose()
+ }
+ Some((_, Ok(line))) if line.is_empty() => {}
+ Some((n, Ok(line))) if line.starts_with(' ') => match &mut self.row {
+ None => {
+ return Some(Err(std::io::Error::other(format!(
+ "{}: Entry with no header",
+ n + 1
+ ))))
+ }
+ Some(ref mut row) => row.entries.push(Entry::from(line.trim())),
+ },
+ Some((_, Ok(line))) => {
+ let prev = std::mem::take(&mut self.row);
+ self.row = Some(RowInput {
+ label: line,
+ entries: vec![],
+ });
+ if prev.is_some() {
+ return Ok(prev).transpose();
+ }
+ }
+ }
+ }
+ }
+}
+
+fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<RowInput, std::io::Error>> {
+ Reader::new(std::io::BufReader::new(input).lines())
+}
+
+fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
+ let mut counts: Vec<_> = rows
+ .iter()
+ .flat_map(|r| {
+ r.entries
+ .iter()
+ .map(|e| &e.col)
+ .collect::<HashSet<_>>()
+ .into_iter()
+ })
+ .fold(HashMap::new(), |mut cs, col| {
+ cs.entry(String::from(col))
+ .and_modify(|n| *n += 1)
+ .or_insert(1);
+ cs
+ })
+ .into_iter()
+ .map(|(col, n)| (n, col))
+ .collect();
+ counts.sort();
+ counts
+}
+fn column_order(rows: &[RowInput]) -> Vec<String> {
+ column_counts(rows)
+ .into_iter()
+ .map(|(_, col)| col)
+ .collect()
}
-pub fn tablify(_input: &impl std::io::Read) -> String {
- String::from("Hello, world!")
+/// # Errors
+///
+/// Will return `Err` if
+/// * 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(input: impl std::io::Read) -> Result<String, std::io::Error> {
+ let rows = read_rows(input).collect::<Result<Vec<_>, _>>()?;
+ let _columns = column_order(&rows);
+ Ok(String::from(HEADER) + "Hello, world!" + FOOTER)
}
#[cfg(test)]
mod tests {
use super::*;
+ #[test]
+ fn test_parse_entry() {
+ assert_eq!(
+ Entry::from("foo"),
+ Entry {
+ col: String::from("foo"),
+ instance: None
+ }
+ );
+ assert_eq!(
+ Entry::from("foo:bar"),
+ Entry {
+ col: String::from("foo"),
+ instance: Some(String::from("bar"))
+ }
+ );
+ assert_eq!(
+ Entry::from("foo: bar"),
+ Entry {
+ col: String::from("foo"),
+ instance: Some(String::from("bar"))
+ }
+ );
+ }
+
#[test]
fn test_read_rows() {
assert_eq!(
- read_rows(&&b"foo"[..]).collect::<Vec<_>>(),
+ read_rows(&b"foo"[..]).flatten().collect::<Vec<_>>(),
vec![RowInput {
label: String::from("foo"),
entries: vec![]
}]
);
+ assert_eq!(
+ read_rows(&b"bar"[..]).flatten().collect::<Vec<_>>(),
+ vec![RowInput {
+ label: String::from("bar"),
+ entries: vec![]
+ }]
+ );
+ assert_eq!(
+ read_rows(&b"foo\nbar\n"[..]).flatten().collect::<Vec<_>>(),
+ vec![
+ RowInput {
+ label: String::from("foo"),
+ entries: vec![]
+ },
+ RowInput {
+ label: String::from("bar"),
+ entries: vec![]
+ }
+ ]
+ );
+ assert_eq!(
+ read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),
+ vec![RowInput {
+ label: String::from("foo"),
+ entries: vec![Entry::from("bar")]
+ }]
+ );
+ assert_eq!(
+ read_rows(&b"foo\n bar\n baz\n"[..])
+ .flatten()
+ .collect::<Vec<_>>(),
+ vec![RowInput {
+ label: String::from("foo"),
+ entries: vec![Entry::from("bar"), Entry::from("baz")]
+ }]
+ );
+ assert_eq!(
+ read_rows(&b"foo\n\nbar\n"[..])
+ .flatten()
+ .collect::<Vec<_>>(),
+ vec![
+ RowInput {
+ label: String::from("foo"),
+ entries: vec![]
+ },
+ RowInput {
+ label: String::from("bar"),
+ entries: vec![]
+ }
+ ]
+ );
+ assert_eq!(
+ read_rows(&b"foo\n \nbar\n"[..])
+ .flatten()
+ .collect::<Vec<_>>(),
+ vec![
+ RowInput {
+ label: String::from("foo"),
+ entries: vec![]
+ },
+ RowInput {
+ label: String::from("bar"),
+ entries: vec![]
+ }
+ ]
+ );
+ assert_eq!(
+ read_rows(&b"foo \n bar \n"[..])
+ .flatten()
+ .collect::<Vec<_>>(),
+ vec![RowInput {
+ label: String::from("foo"),
+ entries: vec![Entry::from("bar")]
+ }]
+ );
+
+ let bad = read_rows(&b" foo"[..]).next().unwrap();
+ 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();
+ assert!(bad2.is_err());
+ assert!(format!("{bad2:?}").contains("3: Entry with no header"));
+ }
+
+ #[test]
+ fn test_column_counts() {
+ assert_eq!(
+ column_counts(
+ &read_rows(&b"foo\n bar\n baz\n"[..])
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap()
+ ),
+ 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()
+ ),
+ vec![(1, String::from("bar")), (2, String::from("baz"))]
+ );
+ assert_eq!(
+ column_counts(
+ &read_rows(&b"foo\n bar\n bar\n baz\n bar\nquux\n baz"[..])
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap()
+ ),
+ vec![(1, String::from("bar")), (2, String::from("baz"))]
+ );
+ 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()
+ ),
+ vec![(1, String::from("bar")), (2, String::from("baz"))]
+ );
}
}
projects / tablify / blobdiff