-use std::collections::{HashMap, HashSet};
+use std::borrow::ToOwned;
+use std::collections::HashMap;
use std::fmt::Write;
use std::io::BufRead;
use std::iter::Iterator;
-const HEADER: &str = "<!DOCTYPE html>
+pub struct Config {}
+
+const HEADER: &str = r#"<!DOCTYPE html>
<html>
<head>
- <meta charset=\"utf-8\">
- <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<style>
td { text-align: center; }
/* h/t https://wabain.github.io/2019/10/13/css-rotated-table-header.html */
.highlight { text-shadow: -0.06ex 0 black, 0.06ex 0 black; }
</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 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>
<body>
<table>
<tbody>
-";
+"#;
const FOOTER: &str = " </tbody>
</table>
</body>
}
}
-#[derive(Debug, PartialEq, Eq, Hash)]
-struct Entry<'a> {
- col: &'a str,
- instance: Option<&'a str>,
+#[derive(Debug, PartialEq, Eq)]
+enum InputLine<'a> {
+ Blank,
+ RowHeader(&'a str),
+ Entry(&'a str, Option<&'a str>),
}
-impl<'a> From<&'a str> for Entry<'a> {
- fn from(value: &'a str) -> Entry<'a> {
- match value.split_once(':') {
- None => Entry {
- col: value,
- instance: None,
- },
- Some((col, instance)) => Entry {
- col: col.trim(),
- instance: Some(instance.trim()),
- },
+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 !trimmed.starts_with(' ') {
+ InputLine::RowHeader(value.trim())
+ } else {
+ match value.split_once(':') {
+ None => InputLine::Entry(value.trim(), None),
+ Some((col, instance)) => InputLine::Entry(col.trim(), Some(instance.trim())),
+ }
}
}
}
#[derive(Debug, PartialEq, Eq)]
-struct RowInput<'a> {
- label: &'a str,
- entries: Vec<Entry<'a>>,
+struct Row {
+ label: String,
+ entries: HashMap<String, Vec<Option<String>>>,
}
-struct Reader<'a, Input: Iterator<Item = Result<String, std::io::Error>>> {
+struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
input: std::iter::Enumerate<Input>,
- row: Option<RowInput<'a>>,
+ row: Option<Row>,
}
-impl<'a, Input: Iterator<Item = Result<String, std::io::Error>>> Reader<'a, Input> {
+impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
fn new(input: Input) -> Self {
Self {
input: input.enumerate(),
}
}
}
-impl<'a, Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<'a, Input> {
- type Item = Result<RowInput<'a>, std::io::Error>;
+impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<Input> {
+ type Item = Result<Row, std::io::Error>;
fn next(&mut self) -> Option<Self::Item> {
loop {
match self.input.next() {
None => return Ok(std::mem::take(&mut self.row)).transpose(),
Some((_, Err(e))) => return Some(Err(e)),
- Some((_, Ok(line))) if line.trim_end().is_empty() && self.row.is_some() => {
- return Ok(std::mem::take(&mut self.row)).transpose()
- }
- Some((_, Ok(line))) if line.trim_end().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((n, Ok(line))) => match InputLine::from(line.as_ref()) {
+ InputLine::Blank if self.row.is_some() => {
+ return Ok(std::mem::take(&mut self.row)).transpose()
}
- // TODO: Don't leak
- Some(ref mut row) => row.entries.push(Entry::from(line.leak().trim())),
- },
- Some((_, Ok(line))) => {
- let prev = std::mem::take(&mut self.row);
- self.row = Some(RowInput {
- // TODO: Don't leak
- label: line.leak().trim_end(),
- entries: vec![],
- });
- if prev.is_some() {
- return Ok(prev).transpose();
+ InputLine::Blank => {}
+ InputLine::Entry(col, instance) => 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
+ .entry(col.to_owned())
+ .and_modify(|is| is.push(instance.map(ToOwned::to_owned)))
+ .or_insert_with(|| vec![instance.map(ToOwned::to_owned)]);
+ }
+ },
+ InputLine::RowHeader(row) => {
+ let prev = std::mem::take(&mut self.row);
+ self.row = Some(Row {
+ label: row.to_owned(),
+ entries: HashMap::new(),
+ });
+ if prev.is_some() {
+ return Ok(prev).transpose();
+ }
}
- }
+ },
}
}
}
}
-fn read_rows(
- input: impl std::io::Read,
-) -> impl Iterator<Item = Result<RowInput<'static>, std::io::Error>> {
+fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<Row, std::io::Error>> {
Reader::new(std::io::BufReader::new(input).lines())
}
-fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
+fn column_counts(rows: &[Row]) -> Vec<(usize, String)> {
let mut counts: Vec<_> = rows
.iter()
- .flat_map(|r| {
- r.entries
- .iter()
- .map(|e| &e.col)
- .collect::<HashSet<_>>()
- .into_iter()
- })
+ .flat_map(|r| r.entries.keys())
.fold(HashMap::new(), |mut cs, col| {
- cs.entry(String::from(*col))
+ cs.entry(col.to_owned())
.and_modify(|n| *n += 1)
.or_insert(1);
cs
counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
counts
}
-fn column_order(rows: &[RowInput]) -> Vec<String> {
+fn column_order(rows: &[Row]) -> Vec<String> {
column_counts(rows)
.into_iter()
.map(|(_, col)| col)
.collect()
}
-fn render_instance(entry: &Entry) -> HTML {
- match &entry.instance {
+fn render_instance(instance: &Option<String>) -> HTML {
+ match instance {
None => HTML::from("✓"),
Some(instance) => HTML::escape(instance.as_ref()),
}
}
-fn render_cell(col: &str, row: &RowInput) -> HTML {
+fn render_cell(col: &str, row: &mut Row) -> HTML {
let row_label = HTML::escape(row.label.as_ref());
let col_label = HTML::escape(col);
- let entries: Vec<&Entry> = row.entries.iter().filter(|e| e.col == col).collect();
- let class = HTML::from(if entries.is_empty() { "" } else { "yes" });
- let all_empty = entries.iter().all(|e| e.instance.is_none());
- let contents = if entries.is_empty() || (all_empty && entries.len() == 1) {
+ let instances: Option<&Vec<Option<String>>> = row.entries.get(col);
+ let class = HTML::from(if instances.is_none() { "" } else { "yes" });
+ let all_empty = instances
+ .iter()
+ .flat_map(|is| is.iter())
+ .all(Option::is_none);
+ let contents = if instances.is_none() || (all_empty && instances.unwrap().len() == 1) {
HTML::from("")
} else if all_empty {
- HTML(format!("{}", entries.len()))
+ HTML(format!("{}", instances.unwrap().len()))
} else {
HTML(
- entries
+ instances
+ .unwrap()
.iter()
- .map(|i| render_instance(i))
+ .map(render_instance)
.map(|html| html.0) // Waiting for slice_concat_trait to stabilize
.collect::<Vec<_>>()
.join(" "),
)
};
- HTML(format!("<td class=\"{class}\" onmouseover=\"h2('{row_label}','{col_label}')\" onmouseout=\"ch2('{row_label}','{col_label}')\">{contents}</td>"))
+ row.entries.remove(col);
+ HTML(format!(
+ r#"<td class="{class}" onmouseover="h2('{row_label}','{col_label}')" onmouseout="ch2('{row_label}','{col_label}')">{contents}</td>"#
+ ))
}
-fn render_row(columns: &[String], row: &RowInput) -> HTML {
- // This is O(n^2) & doesn't need to be
+fn render_row(columns: &[String], row: &mut Row) -> HTML {
let row_label = HTML::escape(row.label.as_ref());
HTML(format!(
"<tr><th id=\"{row_label}\">{row_label}</th>{}</tr>\n",
fn render_column_headers(columns: &[String]) -> HTML {
HTML(
- String::from("<tr class=\"key\"><th></th>")
+ 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,
- "<th id=\"{col_header}\"><div><div>{col_header}</div></div></th>"
+ r#"<th id="{col_header}"><div><div>{col_header}</div></div></th>"#
)
.unwrap();
acc
/// * 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<HTML, std::io::Error> {
+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(&rows);
Ok(HTML(format!(
"{HEADER}{}{}{FOOTER}",
render_column_headers(&columns),
rows.into_iter()
- .map(|r| render_row(&columns, &r))
+ .map(|mut r| render_row(&columns, &mut r))
.collect::<HTML>()
)))
}
use super::*;
#[test]
- fn test_parse_entry() {
+ fn test_parse_line() {
+ assert_eq!(InputLine::from(""), InputLine::Blank);
+ assert_eq!(InputLine::from(" "), InputLine::Blank);
+ assert_eq!(InputLine::from("foo"), InputLine::RowHeader("foo"));
+ assert_eq!(InputLine::from("foo "), InputLine::RowHeader("foo"));
+ assert_eq!(InputLine::from(" foo"), InputLine::Entry("foo", None));
assert_eq!(
- Entry::from("foo"),
- Entry {
- col: "foo",
- instance: None
- }
+ InputLine::from(" foo:bar"),
+ InputLine::Entry("foo", Some("bar"))
);
assert_eq!(
- Entry::from("foo:bar"),
- Entry {
- col: "foo",
- instance: Some("bar")
- }
+ InputLine::from(" foo: bar"),
+ InputLine::Entry("foo", Some("bar"))
);
assert_eq!(
- Entry::from("foo: bar"),
- Entry {
- col: "foo",
- instance: Some("bar")
- }
+ InputLine::from(" foo: bar "),
+ InputLine::Entry("foo", Some("bar"))
+ );
+ assert_eq!(
+ InputLine::from(" foo: bar "),
+ InputLine::Entry("foo", Some("bar"))
+ );
+ assert_eq!(
+ InputLine::from(" foo : bar "),
+ InputLine::Entry("foo", Some("bar"))
);
}
fn test_read_rows() {
assert_eq!(
read_rows(&b"foo"[..]).flatten().collect::<Vec<_>>(),
- vec![RowInput {
- label: "foo",
- entries: vec![]
+ vec![Row {
+ label: "foo".to_owned(),
+ entries: HashMap::new(),
}]
);
assert_eq!(
read_rows(&b"bar"[..]).flatten().collect::<Vec<_>>(),
- vec![RowInput {
- label: "bar",
- entries: vec![]
+ vec![Row {
+ label: "bar".to_owned(),
+ entries: HashMap::new(),
}]
);
assert_eq!(
read_rows(&b"foo\nbar\n"[..]).flatten().collect::<Vec<_>>(),
vec![
- RowInput {
- label: "foo",
- entries: vec![]
+ Row {
+ label: "foo".to_owned(),
+ entries: HashMap::new(),
},
- RowInput {
- label: "bar",
- entries: vec![]
+ Row {
+ label: "bar".to_owned(),
+ entries: HashMap::new(),
}
]
);
assert_eq!(
read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),
- vec![RowInput {
- label: "foo",
- entries: vec![Entry::from("bar")]
+ vec![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<_>>(),
- vec![RowInput {
- label: "foo",
- entries: vec![Entry::from("bar"), Entry::from("baz")]
+ vec![Row {
+ label: "foo".to_owned(),
+ entries: HashMap::from([
+ ("bar".to_owned(), vec![None]),
+ ("baz".to_owned(), vec![None])
+ ]),
}]
);
assert_eq!(
.flatten()
.collect::<Vec<_>>(),
vec![
- RowInput {
- label: "foo",
- entries: vec![]
+ Row {
+ label: "foo".to_owned(),
+ entries: HashMap::new(),
},
- RowInput {
- label: "bar",
- entries: vec![]
+ Row {
+ label: "bar".to_owned(),
+ entries: HashMap::new(),
}
]
);
.flatten()
.collect::<Vec<_>>(),
vec![
- RowInput {
- label: "foo",
- entries: vec![]
+ Row {
+ label: "foo".to_owned(),
+ entries: HashMap::new(),
},
- RowInput {
- label: "bar",
- entries: vec![]
+ Row {
+ label: "bar".to_owned(),
+ entries: HashMap::new(),
}
]
);
read_rows(&b"foo \n bar \n"[..])
.flatten()
.collect::<Vec<_>>(),
- vec![RowInput {
- label: "foo",
- entries: vec![Entry::from("bar")]
+ vec![Row {
+ label: "foo".to_owned(),
+ entries: HashMap::from([("bar".to_owned(), vec![None])]),
}]
);
assert_eq!(
render_cell(
"foo",
- &RowInput {
- label: "nope",
- entries: vec![]
+ &mut Row {
+ label: "nope".to_owned(),
+ entries: HashMap::new(),
}
),
- HTML::from("<td class=\"\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+ HTML::from(
+ r#"<td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+ )
);
assert_eq!(
render_cell(
"foo",
- &RowInput {
- label: "nope",
- entries: vec![Entry::from("bar")]
+ &mut Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("bar".to_owned(), vec![None])]),
}
),
- HTML::from("<td class=\"\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+ HTML::from(
+ r#"<td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+ )
);
assert_eq!(
render_cell(
"foo",
- &RowInput {
- label: "nope",
- entries: vec![Entry::from("foo")]
+ &mut Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![None])]),
}
),
- HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+ HTML::from(
+ r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+ )
);
assert_eq!(
render_cell(
"foo",
- &RowInput {
- label: "nope",
- entries: vec![Entry::from("foo"), Entry::from("foo")]
+ &mut Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![None, None])]),
}
),
- HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">2</td>")
+ HTML::from(
+ r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">2</td>"#
+ )
);
assert_eq!(
render_cell(
"foo",
- &RowInput {
- label: "nope",
- entries: vec![Entry::from("foo: 5"), Entry::from("foo: 10")]
+ &mut Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([(
+ "foo".to_owned(),
+ vec![Some("5".to_owned()), Some("10".to_owned())]
+ )]),
}
),
- HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">5 10</td>")
+ HTML::from(
+ r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">5 10</td>"#
+ )
);
assert_eq!(
render_cell(
"foo",
- &RowInput {
- label: "nope",
- entries: vec![Entry::from("foo: 5"), Entry::from("foo")]
+ &mut Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![Some("5".to_owned()), None])]),
}
),
- HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">5 ✓</td>")
+ HTML::from(
+ r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">5 ✓</td>"#
+ )
);
assert_eq!(
render_cell(
"heart",
- &RowInput {
- label: "nope",
- entries: vec![Entry::from("heart: <3")]
+ &mut Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("heart".to_owned(), vec![Some("<3".to_owned())])]),
}
),
- HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','heart')\" onmouseout=\"ch2('nope','heart')\"><3</td>")
+ HTML::from(
+ r#"<td class="yes" onmouseover="h2('nope','heart')" onmouseout="ch2('nope','heart')"><3</td>"#
+ )
);
assert_eq!(
render_cell(
"foo",
- &RowInput {
- label: "bob's",
- entries: vec![Entry::from("foo")]
+ &mut Row {
+ label: "bob's".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![None])]),
+ }
+ ),
+ HTML::from(
+ r#"<td class="yes" onmouseover="h2('bob's','foo')" onmouseout="ch2('bob's','foo')"></td>"#
+ )
+ );
+ let mut r = Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([
+ ("foo".to_owned(), vec![None]),
+ ("baz".to_owned(), vec![None]),
+ ]),
+ };
+ assert_eq!(r.entries.len(), 2);
+ render_cell("foo", &mut r);
+ assert_eq!(r.entries.len(), 1);
+ render_cell("bar", &mut r);
+ assert_eq!(r.entries.len(), 1);
+ render_cell("baz", &mut r);
+ assert_eq!(r.entries.len(), 0);
+ }
+
+ #[test]
+ fn test_render_row() {
+ assert_eq!(
+ render_row(
+ &["foo".to_owned()],
+ &mut Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("bar".to_owned(), vec![None])]),
}
),
- HTML::from("<td class=\"yes\" onmouseover=\"h2('bob's','foo')\" onmouseout=\"ch2('bob's','foo')\"></td>")
+ HTML::from(
+ r#"<tr><th id="nope">nope</th><td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td></tr>
+"#
+ )
);
}
}
projects / tablify / blobdiff