use std::borrow::ToOwned;
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
use std::fmt::Write;
use std::io::BufRead;
use std::iter::Iterator;
-pub struct Config {
- pub column_threshold: usize,
+#[derive(PartialEq, Eq, Debug)]
+struct Config {
+ column_threshold: usize,
+ static_columns: Vec<String>,
+}
+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))?;
+ } else if let Some(col) = cmd.strip_prefix("col ") {
+ self.static_columns.push(col.to_owned());
+ }
+ Ok(())
+ }
}
const HEADER: &str = r#"<!DOCTYPE html>
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 {
Spacer,
}
-struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
+struct Reader<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> {
input: std::iter::Enumerate<Input>,
row: Option<Row>,
+ config: &'cfg mut Config,
}
-impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
- fn new(input: Input) -> Self {
+impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Reader<'cfg, Input> {
+ fn new(config: &'cfg mut Config, input: Input) -> Self {
Self {
input: input.enumerate(),
row: None,
+ config,
}
}
}
-impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<Input> {
+impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Iterator
+ for Reader<'cfg, Input>
+{
type Item = Result<Rowlike, std::io::Error>;
fn next(&mut self) -> Option<Self::Item> {
loop {
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).map(Rowlike::Row)).transpose()
}
}
fn read_input(input: impl std::io::Read) -> Result<(Vec<Rowlike>, Config), std::io::Error> {
- let default_config = Config {
+ let mut config = Config {
column_threshold: 2,
+ static_columns: vec![],
};
- Reader::new(std::io::BufReader::new(input).lines())
+ let reader = Reader::new(&mut config, std::io::BufReader::new(input).lines());
+ reader
.collect::<Result<Vec<_>, _>>()
- .map(|rows| (rows, default_config))
+ .map(|rows| (rows, config))
}
fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
counts
}
fn column_order(config: &Config, rows: &[Rowlike]) -> Vec<String> {
+ let static_columns: HashSet<&str> = config
+ .static_columns
+ .iter()
+ .map(std::string::String::as_str)
+ .collect();
column_counts(rows)
.into_iter()
- .filter_map(|(n, col)| (n >= config.column_threshold).then_some(col))
+ .filter_map(|(n, col)| {
+ (n >= config.column_threshold && !static_columns.contains(col.as_str())).then_some(col)
+ })
.collect()
}
)
}
-fn render_row(columns: &[String], rowlike: &mut Rowlike) -> HTML {
+fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTML {
match rowlike {
Rowlike::Spacer => HTML::from("<tr><th class=\"spacer_row\"></th></tr>\n"),
Rowlike::Row(row) => {
let row_label = HTML::escape(row.label.as_ref());
- let cells = columns
+ let static_cells = config
+ .static_columns
+ .iter()
+ .map(|col| render_cell(col, row))
+ .collect::<HTML>();
+ let dynamic_cells = columns
.iter()
.map(|col| render_cell(col, row))
.collect::<HTML>();
let leftovers = render_all_leftovers(row);
HTML(format!(
- "<tr><th id=\"{row_label}\">{row_label}</th>{cells}<td class=\"leftover\" onmouseover=\"highlight('{row_label}')\" onmouseout=\"clear_highlight('{row_label}')\">{leftovers}</td></tr>\n"
+ "<tr><th id=\"{row_label}\">{row_label}</th>{static_cells}{dynamic_cells}<td class=\"leftover\" onmouseover=\"highlight('{row_label}')\" onmouseout=\"clear_highlight('{row_label}')\">{leftovers}</td></tr>\n"
))
}
}
}
-fn render_column_headers(columns: &[String]) -> HTML {
+fn render_column_headers(config: &Config, columns: &[String]) -> HTML {
HTML(
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,
- r#"<th id="{col_header}"><div><div>{col_header}</div></div></th>"#
- )
- .unwrap();
- acc
- })
+ + &config.static_columns.iter().chain(columns.iter()).fold(
+ String::new(),
+ |mut acc, col| {
+ let col_header = HTML::escape(col.as_ref());
+ write!(
+ &mut acc,
+ r#"<th id="{col_header}"><div><div>{col_header}</div></div></th>"#
+ )
+ .unwrap();
+ acc
+ },
+ )
+ "</tr>\n",
)
}
let columns = column_order(&config, &rows);
Ok(HTML(format!(
"{HEADER}{}{}{FOOTER}",
- render_column_headers(&columns),
+ render_column_headers(&config, &columns),
rows.into_iter()
- .map(|mut r| render_row(&columns, &mut r))
+ .map(|mut r| render_row(&config, &columns, &mut r))
.collect::<HTML>()
)))
}
fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
read_input(input).map(|(rows, _)| rows)
}
+ fn read_config(input: impl std::io::Read) -> Result<Config, std::io::Error> {
+ read_input(input).map(|(_, config)| config)
+ }
#[test]
fn test_read_rows() {
assert_eq!(
assert!(format!("{bad2:?}").contains("3: Entry with no header"));
}
+ #[test]
+ fn test_read_config() {
+ assert_eq!(
+ read_config(&b"!col_threshold 10"[..])
+ .unwrap()
+ .column_threshold,
+ 10
+ );
+ assert_eq!(
+ read_config(&b"!col foo"[..]).unwrap().static_columns,
+ vec!["foo".to_owned()]
+ );
+
+ 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!(
fn test_render_row() {
assert_eq!(
render_row(
+ &Config {
+ column_threshold: 0,
+ static_columns: vec![],
+ },
&["foo".to_owned()],
&mut Rowlike::Row(Row {
label: "nope".to_owned(),
),
HTML::from(
r#"<tr><th id="nope">nope</th><td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')">bar</td></tr>
+"#
+ )
+ );
+ assert_eq!(
+ render_row(
+ &Config {
+ column_threshold: 0,
+ static_columns: vec!["foo".to_owned(), "bar".to_owned()],
+ },
+ &["baz".to_owned()],
+ &mut Rowlike::Row(Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([
+ ("bar".to_owned(), vec![Some("r".to_owned())]),
+ ("baz".to_owned(), vec![Some("z".to_owned())]),
+ ("foo".to_owned(), vec![Some("f".to_owned())]),
+ ]),
+ })
+ ),
+ HTML::from(
+ r#"<tr><th id="nope">nope</th><td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">f</td><td class="yes" onmouseover="h2('nope','bar')" onmouseout="ch2('nope','bar')">r</td><td class="yes" onmouseover="h2('nope','baz')" onmouseout="ch2('nope','baz')">z</td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
"#
)
);
projects / tablify / blobdiff