X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/d9bfcf4d1b74bebfcc9881aad4f0aacd01238b01..e44de444711dd8dc9d79f4fd6ab86c2d0fd26862:/src/lib.rs?ds=inline
diff --git a/src/lib.rs b/src/lib.rs
index c5761d8..b52806a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,30 +4,45 @@ use std::fmt::Write;
use std::io::BufRead;
use std::iter::Iterator;
-pub struct Config {}
+#[derive(PartialEq, Eq, Debug)]
+struct Config {
+ column_threshold: usize,
+}
+impl Config {
+ fn apply_command(&mut self, cmd: &str) -> Result<(), std::io::Error> {
+ if let Some(threshold) = cmd.strip_prefix("col_threshold ") {
+ self.column_threshold = threshold
+ .parse()
+ .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidInput, e))?;
+ }
+ Ok(())
+ }
+}
-const HEADER: &str = "
+const HEADER: &str = r#"
-
-
+
+
@@ -35,7 +50,7 @@ const HEADER: &str = "
-";
+"#;
const FOOTER: &str = "
@@ -83,12 +98,15 @@ enum InputLine<'a> {
Blank,
RowHeader(&'a str),
Entry(&'a str, Option<&'a str>),
+ Command(&'a str),
}
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 let Some(cmd) = trimmed.strip_prefix('!') {
+ InputLine::Command(cmd)
} else if !trimmed.starts_with(' ') {
InputLine::RowHeader(value.trim())
} else {
@@ -106,30 +124,45 @@ struct Row {
entries: HashMap>>,
}
-struct Reader>> {
+#[derive(Debug, PartialEq, Eq)]
+enum Rowlike {
+ Row(Row),
+ Spacer,
+}
+
+struct Reader<'cfg, Input: Iterator- >> {
input: std::iter::Enumerate,
row: Option
,
+ config: &'cfg mut Config,
}
-impl>> Reader {
- fn new(input: Input) -> Self {
+impl<'cfg, Input: Iterator- >> Reader<'cfg, Input> {
+ fn new(config: &'cfg mut Config, input: Input) -> Self {
Self {
input: input.enumerate(),
row: None,
+ config,
}
}
}
-impl>> Iterator for Reader {
- type Item = Result;
+impl<'cfg, Input: Iterator
- >> Iterator
+ for Reader<'cfg, Input>
+{
+ type Item = Result;
fn next(&mut self) -> Option {
loop {
match self.input.next() {
- None => return Ok(std::mem::take(&mut self.row)).transpose(),
+ None => return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose(),
Some((_, Err(e))) => return Some(Err(e)),
Some((n, Ok(line))) => match InputLine::from(line.as_ref()) {
+ InputLine::Command(cmd) => {
+ if let Err(e) = self.config.apply_command(cmd) {
+ return Some(Err(e));
+ }
+ }
InputLine::Blank if self.row.is_some() => {
- return Ok(std::mem::take(&mut self.row)).transpose()
+ return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose()
}
- InputLine::Blank => {}
+ InputLine::Blank => return Some(Ok(Rowlike::Spacer)),
InputLine::Entry(col, instance) => match &mut self.row {
None => {
return Some(Err(std::io::Error::other(format!(
@@ -151,7 +184,7 @@ impl>> Iterator for Reader
entries: HashMap::new(),
});
if prev.is_some() {
- return Ok(prev).transpose();
+ return Ok(prev.map(Rowlike::Row)).transpose();
}
}
},
@@ -160,14 +193,24 @@ impl>> Iterator for Reader
}
}
-fn read_rows(input: impl std::io::Read) -> impl Iterator
- > {
- Reader::new(std::io::BufReader::new(input).lines())
+fn read_input(input: impl std::io::Read) -> Result<(Vec, Config), std::io::Error> {
+ let mut config = Config {
+ column_threshold: 2,
+ };
+ let reader = Reader::new(&mut config, std::io::BufReader::new(input).lines());
+ reader
+ .collect::, _>>()
+ .map(|rows| (rows, config))
}
-fn column_counts(rows: &[Row]) -> Vec<(usize, String)> {
+fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
+ let empty = HashMap::new();
let mut counts: Vec<_> = rows
.iter()
- .flat_map(|r| r.entries.keys())
+ .flat_map(|rl| match rl {
+ Rowlike::Row(r) => r.entries.keys(),
+ Rowlike::Spacer => empty.keys(),
+ })
.fold(HashMap::new(), |mut cs, col| {
cs.entry(col.to_owned())
.and_modify(|n| *n += 1)
@@ -180,67 +223,101 @@ fn column_counts(rows: &[Row]) -> Vec<(usize, String)> {
counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
counts
}
-fn column_order(rows: &[Row]) -> Vec {
+fn column_order(config: &Config, rows: &[Rowlike]) -> Vec {
column_counts(rows)
.into_iter()
- .map(|(_, col)| col)
+ .filter_map(|(n, col)| (n >= config.column_threshold).then_some(col))
.collect()
}
-fn render_instance(instance: &Option) -> HTML {
+fn render_one_instance(instance: &Option) -> HTML {
match instance {
None => HTML::from("â"),
Some(instance) => HTML::escape(instance.as_ref()),
}
}
-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 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) {
+fn render_instances(instances: &[Option]) -> HTML {
+ let all_empty = instances.iter().all(Option::is_none);
+ if all_empty && instances.len() == 1 {
HTML::from("")
} else if all_empty {
- HTML(format!("{}", instances.unwrap().len()))
+ HTML(format!("{}", instances.len()))
} else {
HTML(
instances
- .unwrap()
.iter()
- .map(render_instance)
+ .map(render_one_instance)
.map(|html| html.0) // Waiting for slice_concat_trait to stabilize
.collect::>()
.join(" "),
)
- };
- row.entries.remove(col);
- HTML(format!("
| {contents} | "))
+ }
}
-fn render_row(columns: &[String], row: &mut Row) -> 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 instances: Option<&Vec>> = row.entries.get(col);
+ let class = HTML::from(if instances.is_none() { "" } else { "yes" });
+ let contents = match instances {
+ None => HTML::from(""),
+ Some(is) => render_instances(is),
+ };
+ row.entries.remove(col);
HTML(format!(
- "| {row_label} | {}
|---|
\n",
- &columns
- .iter()
- .map(|col| render_cell(col, row))
- .collect::()
+ r#"{contents} | "#
))
}
+fn render_leftover(notcol: &str, instances: &[Option]) -> HTML {
+ let label = HTML::escape(notcol);
+ let rest = render_instances(instances);
+ if rest == HTML::from("") {
+ HTML(format!("{label}"))
+ } else {
+ HTML(format!("{label}: {rest}"))
+ }
+}
+
+fn render_all_leftovers(row: &Row) -> HTML {
+ let mut order: Vec<_> = row.entries.keys().collect();
+ order.sort_unstable();
+ HTML(
+ order
+ .into_iter()
+ .map(|notcol| render_leftover(notcol, row.entries.get(notcol).expect("Key vanished?!")))
+ .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
+ .collect::>()
+ .join(", "),
+ )
+}
+
+fn render_row(columns: &[String], rowlike: &mut Rowlike) -> HTML {
+ match rowlike {
+ Rowlike::Spacer => HTML::from(" |
|---|
\n"),
+ Rowlike::Row(row) => {
+ let row_label = HTML::escape(row.label.as_ref());
+ let cells = columns
+ .iter()
+ .map(|col| render_cell(col, row))
+ .collect::();
+ let leftovers = render_all_leftovers(row);
+ HTML(format!(
+ "| {row_label} | {cells}{leftovers} |
|---|
\n"
+ ))
+ }
+ }
+}
+
fn render_column_headers(columns: &[String]) -> HTML {
HTML(
- String::from(" | ")
+ String::from(r#"
|---|
| "#)
+ &columns.iter().fold(String::new(), |mut acc, col| {
let col_header = HTML::escape(col.as_ref());
write!(
&mut acc,
- ""
+ r#""#
)
.unwrap();
acc
@@ -255,9 +332,9 @@ fn render_column_headers(columns: &[String]) -> HTML {
/// * 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(config: &Config, input: impl std::io::Read) -> Result {
- let rows = read_rows(input).collect::, _>>()?;
- let columns = column_order(&rows);
+pub fn tablify(input: impl std::io::Read) -> Result {
+ let (rows, config) = read_input(input)?;
+ let columns = column_order(&config, &rows);
Ok(HTML(format!(
"{HEADER}{}{}{FOOTER}",
render_column_headers(&columns),
@@ -300,134 +377,146 @@ mod tests {
);
}
+ fn read_rows(input: impl std::io::Read) -> Result, std::io::Error> {
+ read_input(input).map(|(rows, _)| rows)
+ }
+ fn read_config(input: impl std::io::Read) -> Result {
+ read_input(input).map(|(_, config)| config)
+ }
#[test]
fn test_read_rows() {
assert_eq!(
- read_rows(&b"foo"[..]).flatten().collect::>(),
- vec![Row {
+ read_rows(&b"foo"[..]).unwrap(),
+ vec![Rowlike::Row(Row {
label: "foo".to_owned(),
entries: HashMap::new(),
- }]
+ })]
);
assert_eq!(
- read_rows(&b"bar"[..]).flatten().collect::>(),
- vec![Row {
+ read_rows(&b"bar"[..]).unwrap(),
+ vec![Rowlike::Row(Row {
label: "bar".to_owned(),
entries: HashMap::new(),
- }]
+ })]
);
assert_eq!(
- read_rows(&b"foo\nbar\n"[..]).flatten().collect::>(),
+ read_rows(&b"foo\nbar\n"[..]).unwrap(),
vec![
- Row {
+ Rowlike::Row(Row {
label: "foo".to_owned(),
entries: HashMap::new(),
- },
- Row {
+ }),
+ Rowlike::Row(Row {
label: "bar".to_owned(),
entries: HashMap::new(),
- }
+ })
]
);
assert_eq!(
- read_rows(&b"foo\n bar\n"[..]).flatten().collect::>(),
- vec![Row {
+ read_rows(&b"foo\n bar\n"[..]).unwrap(),
+ vec![Rowlike::Row(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![Row {
+ read_rows(&b"foo\n bar\n baz\n"[..]).unwrap(),
+ vec![Rowlike::Row(Row {
label: "foo".to_owned(),
entries: HashMap::from([
("bar".to_owned(), vec![None]),
("baz".to_owned(), vec![None])
]),
- }]
+ })]
);
assert_eq!(
- read_rows(&b"foo\n\nbar\n"[..])
- .flatten()
- .collect::>(),
+ read_rows(&b"foo\n\nbar\n"[..]).unwrap(),
vec![
- Row {
+ Rowlike::Row(Row {
label: "foo".to_owned(),
entries: HashMap::new(),
- },
- Row {
+ }),
+ Rowlike::Row(Row {
label: "bar".to_owned(),
entries: HashMap::new(),
- }
+ })
]
);
assert_eq!(
- read_rows(&b"foo\n \nbar\n"[..])
- .flatten()
- .collect::>(),
+ read_rows(&b"foo\n\n\nbar\n"[..]).unwrap(),
vec![
- Row {
+ Rowlike::Row(Row {
label: "foo".to_owned(),
entries: HashMap::new(),
- },
- Row {
+ }),
+ Rowlike::Spacer,
+ Rowlike::Row(Row {
label: "bar".to_owned(),
entries: HashMap::new(),
- }
+ })
+ ]
+ );
+ assert_eq!(
+ read_rows(&b"foo\n \nbar\n"[..]).unwrap(),
+ vec![
+ Rowlike::Row(Row {
+ label: "foo".to_owned(),
+ entries: HashMap::new(),
+ }),
+ Rowlike::Row(Row {
+ label: "bar".to_owned(),
+ entries: HashMap::new(),
+ })
]
);
assert_eq!(
- read_rows(&b"foo \n bar \n"[..])
- .flatten()
- .collect::>(),
- vec![Row {
+ read_rows(&b"foo \n bar \n"[..]).unwrap(),
+ vec![Rowlike::Row(Row {
label: "foo".to_owned(),
entries: HashMap::from([("bar".to_owned(), vec![None])]),
- }]
+ })]
);
- let bad = read_rows(&b" foo"[..]).next().unwrap();
+ let bad = read_rows(&b" foo"[..]);
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();
+ let bad2 = read_rows(&b"foo\n\n bar"[..]);
assert!(bad2.is_err());
assert!(format!("{bad2:?}").contains("3: Entry with no header"));
}
+ #[test]
+ fn test_read_config() {
+ assert_eq!(
+ read_config(&b"!col_threshold 10"[..]).unwrap(),
+ Config {
+ column_threshold: 10
+ }
+ );
+
+ let bad_num = read_config(&b"!col_threshold foo"[..]);
+ assert!(bad_num.is_err());
+ assert!(format!("{bad_num:?}").contains("Parse"));
+ }
+
#[test]
fn test_column_counts() {
assert_eq!(
- column_counts(
- &read_rows(&b"foo\n bar\n baz\n"[..])
- .collect::, _>>()
- .unwrap()
- ),
+ column_counts(&read_rows(&b"foo\n bar\n baz\n"[..]).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::, _>>()
- .unwrap()
- ),
+ column_counts(&read_rows(&b"foo\n bar\n baz\nquux\n baz"[..]).unwrap()),
vec![(2, String::from("baz")), (1, String::from("bar"))]
);
assert_eq!(
- column_counts(
- &read_rows(&b"foo\n bar\n bar\n baz\n bar\nquux\n baz"[..])
- .collect::, _>>()
- .unwrap()
- ),
+ column_counts(&read_rows(&b"foo\n bar\n bar\n baz\n bar\nquux\n baz"[..]).unwrap()),
vec![(2, String::from("baz")), (1, String::from("bar"))]
);
assert_eq!(
column_counts(
- &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..])
- .collect::, _>>()
- .unwrap()
+ &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..]).unwrap()
),
vec![(2, String::from("baz")), (1, String::from("bar"))]
);
@@ -443,7 +532,9 @@ mod tests {
entries: HashMap::new(),
}
),
- HTML::from(" | ")
+ HTML::from(
+ r#" | "#
+ )
);
assert_eq!(
render_cell(
@@ -453,7 +544,9 @@ mod tests {
entries: HashMap::from([("bar".to_owned(), vec![None])]),
}
),
- HTML::from(" | ")
+ HTML::from(
+ r#" | "#
+ )
);
assert_eq!(
render_cell(
@@ -463,7 +556,9 @@ mod tests {
entries: HashMap::from([("foo".to_owned(), vec![None])]),
}
),
- HTML::from(" | ")
+ HTML::from(
+ r#" | "#
+ )
);
assert_eq!(
render_cell(
@@ -473,17 +568,24 @@ mod tests {
entries: HashMap::from([("foo".to_owned(), vec![None, None])]),
}
),
- HTML::from("2 | ")
+ HTML::from(
+ r#"2 | "#
+ )
);
assert_eq!(
render_cell(
"foo",
&mut Row {
label: "nope".to_owned(),
- entries: HashMap::from([("foo".to_owned(), vec![Some("5".to_owned()), Some("10".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(
@@ -493,7 +595,9 @@ mod tests {
entries: HashMap::from([("foo".to_owned(), vec![Some("5".to_owned()), None])]),
}
),
- HTML::from("5 â | ")
+ HTML::from(
+ r#"5 â | "#
+ )
);
assert_eq!(
render_cell(
@@ -503,7 +607,9 @@ mod tests {
entries: HashMap::from([("heart".to_owned(), vec![Some("<3".to_owned())])]),
}
),
- HTML::from("<3 | ")
+ HTML::from(
+ r#"<3 | "#
+ )
);
assert_eq!(
render_cell(
@@ -513,7 +619,9 @@ mod tests {
entries: HashMap::from([("foo".to_owned(), vec![None])]),
}
),
- HTML::from(" | ")
+ HTML::from(
+ r#" | "#
+ )
);
let mut r = Row {
label: "nope".to_owned(),
@@ -530,4 +638,52 @@ mod tests {
render_cell("baz", &mut r);
assert_eq!(r.entries.len(), 0);
}
+
+ #[test]
+ fn test_render_leftovers() {
+ assert_eq!(
+ render_all_leftovers(&Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![None])]),
+ }),
+ HTML::from("foo")
+ );
+ assert_eq!(
+ render_all_leftovers(&Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([
+ ("foo".to_owned(), vec![None]),
+ ("bar".to_owned(), vec![None])
+ ]),
+ }),
+ HTML::from("bar, foo")
+ );
+ assert_eq!(
+ render_all_leftovers(&Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([
+ ("foo".to_owned(), vec![None]),
+ ("bar".to_owned(), vec![None, None])
+ ]),
+ }),
+ HTML::from("bar: 2, foo")
+ );
+ }
+
+ #[test]
+ fn test_render_row() {
+ assert_eq!(
+ render_row(
+ &["foo".to_owned()],
+ &mut Rowlike::Row(Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("bar".to_owned(), vec![None])]),
+ })
+ ),
+ HTML::from(
+ r#"| nope | | bar |
|---|
+"#
+ )
+ );
+ }
}
|---|