X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/116fc215a7f859e20b60e91bcb24d314a9d911f9..5ffe8e3a8394fc46b50659b0e197b0b0a22e18c8:/src/lib.rs?ds=inline
diff --git a/src/lib.rs b/src/lib.rs
index 199b8ab..cfaeb4b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,13 +1,16 @@
-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 = "
+pub struct Config {}
+
+const HEADER: &str = r#"
-
-";
+"#;
const FOOTER: &str = "
@@ -75,37 +78,39 @@ impl std::fmt::Display for HTML {
}
}
-#[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>,
+struct Row {
+ label: String,
+ entries: HashMap>>,
}
-struct Reader<'a, Input: Iterator- >> {
+struct Reader
>> {
input: std::iter::Enumerate>,
+ row: Option,
}
-impl<'a, Input: Iterator- >> Reader<'a, Input> {
+impl
>> Reader- >> Reader<'a, Inpu
}
}
}
-impl<'a, Input: Iterator
- >> Iterator for Reader<'a, Input> {
- type Item = Result
, std::io::Error>;
+impl>> Iterator for Reader;
fn next(&mut self) -> Option {
loop {
- match self
- .input
- .next()
- // TODO: Don't leak
- .map(|(n, r)| (n, r.map(|line| String::from(line).leak().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() => {
- 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((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()
}
- 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();
+ 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- , std::io::Error>> {
+fn read_rows(input: impl std::io::Read) -> impl Iterator
- > {
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::
>()
- .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
@@ -181,45 +180,51 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
counts
}
-fn column_order(rows: &[RowInput]) -> Vec {
+fn column_order(rows: &[Row]) -> Vec {
column_counts(rows)
.into_iter()
.map(|(_, col)| col)
.collect()
}
-fn render_instance(entry: &Entry) -> HTML {
- match &entry.instance {
+fn render_instance(instance: &Option) -> 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>> = 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::>()
.join(" "),
)
};
- HTML(format!("{contents} "))
+ row.entries.remove(col);
+ HTML(format!(
+ r#"{contents} "#
+ ))
}
-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!(
"{row_label} {} {
+pub fn tablify(config: &Config, input: impl std::io::Read) -> Result {
let rows = read_rows(input).collect::, _>>()?;
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::()
)))
}
@@ -269,27 +274,31 @@ mod tests {
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"))
);
}
@@ -297,45 +306,48 @@ mod tests {
fn test_read_rows() {
assert_eq!(
read_rows(&b"foo"[..]).flatten().collect::>(),
- vec![RowInput {
- label: "foo",
- entries: vec![]
+ vec![Row {
+ label: "foo".to_owned(),
+ entries: HashMap::new(),
}]
);
assert_eq!(
read_rows(&b"bar"[..]).flatten().collect::>(),
- 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![
- 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![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![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!(
@@ -343,13 +355,13 @@ mod tests {
.flatten()
.collect::>(),
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(),
}
]
);
@@ -358,13 +370,13 @@ mod tests {
.flatten()
.collect::>(),
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(),
}
]
);
@@ -372,9 +384,9 @@ mod tests {
read_rows(&b"foo \n bar \n"[..])
.flatten()
.collect::>(),
- vec![RowInput {
- label: "foo",
- entries: vec![Entry::from("bar")]
+ vec![Row {
+ label: "foo".to_owned(),
+ entries: HashMap::from([("bar".to_owned(), vec![None])]),
}]
);
@@ -428,82 +440,115 @@ mod tests {
assert_eq!(
render_cell(
"foo",
- &RowInput {
- label: "nope",
- entries: vec![]
+ &mut Row {
+ label: "nope".to_owned(),
+ entries: HashMap::new(),
}
),
- HTML::from("2 ")
+ HTML::from(
+ r#"2 "#
+ )
);
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("5 10 ")
+ HTML::from(
+ r#"5 10 "#
+ )
);
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("5 â ")
+ HTML::from(
+ r#"5 â "#
+ )
);
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("<3 ")
+ HTML::from(
+ r#"<3 "#
+ )
);
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("