<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 */
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 { height: 10em; 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: #ddd; }
- 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\"); } }
</body>
</html>";
+#[derive(PartialEq, Eq, Debug)]
+pub struct HTML(String);
+impl HTML {
+ fn escape(value: &str) -> HTML {
+ let mut escaped: String = String::new();
+ for c in value.chars() {
+ match c {
+ '>' => escaped.push_str(">"),
+ '<' => escaped.push_str("<"),
+ '\'' => escaped.push_str("'"),
+ '"' => escaped.push_str("""),
+ '&' => escaped.push_str("&"),
+ ok_c => escaped.push(ok_c),
+ }
+ }
+ HTML(escaped)
+ }
+}
+impl From<&str> for HTML {
+ fn from(value: &str) -> HTML {
+ HTML(String::from(value))
+ }
+}
+impl FromIterator<HTML> for HTML {
+ fn from_iter<T>(iter: T) -> HTML
+ where
+ T: IntoIterator<Item = HTML>,
+ {
+ HTML(iter.into_iter().map(|html| html.0).collect::<String>())
+ }
+}
+impl std::fmt::Display for HTML {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "{}", self.0)
+ }
+}
+
#[derive(Debug, PartialEq, Eq, Hash)]
-struct Entry {
- col: String,
- instance: Option<String>,
+struct Entry<'a> {
+ col: &'a str,
+ instance: Option<&'a str>,
}
-impl From<&str> for Entry {
- fn from(value: &str) -> Entry {
+impl<'a> From<&'a str> for Entry<'a> {
+ fn from(value: &'a str) -> Entry<'a> {
match value.split_once(':') {
None => Entry {
- col: String::from(value),
+ col: value,
instance: None,
},
Some((col, instance)) => Entry {
- col: String::from(col.trim()),
- instance: Some(String::from(instance.trim())),
+ col: col.trim(),
+ instance: Some(instance.trim()),
},
}
}
}
#[derive(Debug, PartialEq, Eq)]
-struct RowInput {
- label: String,
- entries: Vec<Entry>,
+struct RowInput<'a> {
+ label: &'a str,
+ entries: Vec<Entry<'a>>,
}
-struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
+struct Reader<'a, Input: Iterator<Item = Result<String, std::io::Error>>> {
input: std::iter::Enumerate<Input>,
- row: Option<RowInput>,
+ row: Option<RowInput<'a>>,
}
-impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
+impl<'a, Input: Iterator<Item = Result<String, std::io::Error>>> Reader<'a, Input> {
fn new(input: Input) -> Self {
Self {
input: input.enumerate(),
}
}
}
-impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<Input> {
- type Item = Result<RowInput, std::io::Error>;
+impl<'a, Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<'a, Input> {
+ type Item = Result<RowInput<'a>, 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()))))
- {
+ 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.is_empty() && self.row.is_some() => {
+ 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.is_empty() => {}
+ 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!(
n + 1
))))
}
- Some(ref mut row) => row.entries.push(Entry::from(line.trim())),
+ // 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 {
- label: line,
+ // TODO: Don't leak
+ label: line.leak().trim_end(),
entries: vec![],
});
if prev.is_some() {
}
}
-fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<RowInput, std::io::Error>> {
+fn read_rows(
+ input: impl std::io::Read,
+) -> impl Iterator<Item = Result<RowInput<'static>, std::io::Error>> {
Reader::new(std::io::BufReader::new(input).lines())
}
.into_iter()
})
.fold(HashMap::new(), |mut cs, col| {
- cs.entry(String::from(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.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
counts
}
fn column_order(rows: &[RowInput]) -> Vec<String> {
.collect()
}
-fn render_instance(entry: &Entry) -> String {
+fn render_instance(entry: &Entry) -> HTML {
match &entry.instance {
- None => String::from("✓ "),
- Some(instance) => String::from(instance) + " ",
+ None => HTML::from("✓"),
+ Some(instance) => HTML::escape(instance.as_ref()),
}
}
-fn render_cell(col: &str, row: &RowInput) -> String {
- // TODO: Escape HTML special characters
- let row_label = &row.label;
+fn render_cell(col: &str, row: &RowInput) -> 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 = if entries.is_empty() { "" } else { "yes" };
+ 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) {
- String::new()
+ HTML::from("")
} else if all_empty {
- format!("{}", entries.len())
+ HTML(format!("{}", entries.len()))
} else {
- entries
- .iter()
- .map(|i| render_instance(i))
- .collect::<String>()
+ HTML(
+ entries
+ .iter()
+ .map(|i| render_instance(i))
+ .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
+ .collect::<Vec<_>>()
+ .join(" "),
+ )
};
- format!("<td class=\"{class}\" onmouseover=\"h2('{row_label}','{col}')\" onmouseout=\"ch2('{row_label}','{col}')\">{}</td>", contents.trim())
+ HTML(format!("<td class=\"{class}\" onmouseover=\"h2('{row_label}','{col_label}')\" onmouseout=\"ch2('{row_label}','{col_label}')\">{contents}</td>"))
}
-fn render_row(columns: &[String], row: &RowInput) -> String {
+fn render_row(columns: &[String], row: &RowInput) -> HTML {
// This is O(n^2) & doesn't need to be
- // TODO: Escape HTML special characters
- let row_label = &row.label;
- format!(
+ let row_label = HTML::escape(row.label.as_ref());
+ HTML(format!(
"<tr><th id=\"{row_label}\">{row_label}</th>{}</tr>\n",
&columns
.iter()
.map(|col| render_cell(col, row))
- .collect::<String>()
- )
+ .collect::<HTML>()
+ ))
}
-fn render_column_headers(columns: &[String]) -> String {
- // TODO: Escape HTML special characters
- String::from("<tr class=\"key\"><th></th>")
- + &columns.iter().fold(String::new(), |mut acc, c| {
- write!(&mut acc, "<th id=\"{c}\"><div><div>{c}</div></div></th>").unwrap();
- acc
- })
- + "</tr>\n"
+fn render_column_headers(columns: &[String]) -> HTML {
+ HTML(
+ String::from("<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>"
+ )
+ .unwrap();
+ acc
+ })
+ + "</tr>\n",
+ )
}
/// # Errors
/// * 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> {
+pub fn tablify(input: impl std::io::Read) -> Result<HTML, std::io::Error> {
let rows = read_rows(input).collect::<Result<Vec<_>, _>>()?;
let columns = column_order(&rows);
- Ok(String::from(HEADER)
- + &render_column_headers(&columns)
- + &rows
- .into_iter()
+ Ok(HTML(format!(
+ "{HEADER}{}{}{FOOTER}",
+ render_column_headers(&columns),
+ rows.into_iter()
.map(|r| render_row(&columns, &r))
- .collect::<String>()
- + FOOTER)
+ .collect::<HTML>()
+ )))
}
#[cfg(test)]
assert_eq!(
Entry::from("foo"),
Entry {
- col: String::from("foo"),
+ col: "foo",
instance: None
}
);
assert_eq!(
Entry::from("foo:bar"),
Entry {
- col: String::from("foo"),
- instance: Some(String::from("bar"))
+ col: "foo",
+ instance: Some("bar")
}
);
assert_eq!(
Entry::from("foo: bar"),
Entry {
- col: String::from("foo"),
- instance: Some(String::from("bar"))
+ col: "foo",
+ instance: Some("bar")
}
);
}
assert_eq!(
read_rows(&b"foo"[..]).flatten().collect::<Vec<_>>(),
vec![RowInput {
- label: String::from("foo"),
+ label: "foo",
entries: vec![]
}]
);
assert_eq!(
read_rows(&b"bar"[..]).flatten().collect::<Vec<_>>(),
vec![RowInput {
- label: String::from("bar"),
+ label: "bar",
entries: vec![]
}]
);
read_rows(&b"foo\nbar\n"[..]).flatten().collect::<Vec<_>>(),
vec![
RowInput {
- label: String::from("foo"),
+ label: "foo",
entries: vec![]
},
RowInput {
- label: String::from("bar"),
+ label: "bar",
entries: vec![]
}
]
assert_eq!(
read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),
vec![RowInput {
- label: String::from("foo"),
+ label: "foo",
entries: vec![Entry::from("bar")]
}]
);
.flatten()
.collect::<Vec<_>>(),
vec![RowInput {
- label: String::from("foo"),
+ label: "foo",
entries: vec![Entry::from("bar"), Entry::from("baz")]
}]
);
.collect::<Vec<_>>(),
vec![
RowInput {
- label: String::from("foo"),
+ label: "foo",
entries: vec![]
},
RowInput {
- label: String::from("bar"),
+ label: "bar",
entries: vec![]
}
]
.collect::<Vec<_>>(),
vec![
RowInput {
- label: String::from("foo"),
+ label: "foo",
entries: vec![]
},
RowInput {
- label: String::from("bar"),
+ label: "bar",
entries: vec![]
}
]
.flatten()
.collect::<Vec<_>>(),
vec![RowInput {
- label: String::from("foo"),
+ label: "foo",
entries: vec![Entry::from("bar")]
}]
);
.collect::<Result<Vec<_>, _>>()
.unwrap()
),
- vec![(1, String::from("bar")), (2, String::from("baz"))]
+ vec![(2, String::from("baz")), (1, String::from("bar"))]
);
assert_eq!(
column_counts(
.collect::<Result<Vec<_>, _>>()
.unwrap()
),
- vec![(1, String::from("bar")), (2, String::from("baz"))]
+ vec![(2, String::from("baz")), (1, String::from("bar"))]
);
assert_eq!(
column_counts(
.collect::<Result<Vec<_>, _>>()
.unwrap()
),
- vec![(1, String::from("bar")), (2, String::from("baz"))]
+ vec![(2, String::from("baz")), (1, String::from("bar"))]
);
}
render_cell(
"foo",
&RowInput {
- label: String::from("nope"),
+ label: "nope",
entries: vec![]
}
),
- String::from("<td class=\"\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+ HTML::from("<td class=\"\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
);
assert_eq!(
render_cell(
"foo",
&RowInput {
- label: String::from("nope"),
+ label: "nope",
entries: vec![Entry::from("bar")]
}
),
- String::from("<td class=\"\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+ HTML::from("<td class=\"\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
);
assert_eq!(
render_cell(
"foo",
&RowInput {
- label: String::from("nope"),
+ label: "nope",
entries: vec![Entry::from("foo")]
}
),
- String::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+ HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
);
assert_eq!(
render_cell(
"foo",
&RowInput {
- label: String::from("nope"),
+ label: "nope",
entries: vec![Entry::from("foo"), Entry::from("foo")]
}
),
- String::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">2</td>")
+ HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">2</td>")
);
assert_eq!(
render_cell(
"foo",
&RowInput {
- label: String::from("nope"),
+ label: "nope",
entries: vec![Entry::from("foo: 5"), Entry::from("foo: 10")]
}
),
- String::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">5 10</td>")
+ HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">5 10</td>")
);
assert_eq!(
render_cell(
"foo",
&RowInput {
- label: String::from("nope"),
+ label: "nope",
entries: vec![Entry::from("foo: 5"), Entry::from("foo")]
}
),
- String::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">5 ✓</td>")
+ HTML::from("<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")]
+ }
+ ),
+ HTML::from("<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")]
+ }
+ ),
+ HTML::from("<td class=\"yes\" onmouseover=\"h2('bob's','foo')\" onmouseout=\"ch2('bob's','foo')\"></td>")
);
}
}
projects / tablify / blobdiff