use std::io::BufRead;
use std::iter::Iterator;
+fn tally_marks(n: usize) -> String {
+ let fives = { 0..n / 5 }.map(|_| 'πΈ');
+ let ones = { 0..n % 5 }.map(|_| 'π·');
+ fives.chain(ones).collect()
+}
+
#[derive(PartialEq, Eq, Debug)]
struct Config {
column_threshold: usize,
static_columns: Vec<Option<String>>,
hidden_columns: HashSet<String>,
+ substitute_labels: HashMap<String, String>,
}
impl Config {
fn apply_command(&mut self, line_num: usize, cmd: &str) -> Result<(), std::io::Error> {
self.static_columns.push(Some(col.to_owned()));
} else if cmd == "colsep" {
self.static_columns.push(None);
+ } else if let Some(directive) = cmd.strip_prefix("label ") {
+ match directive.split_once(':') {
+ None => {
+ return Err(std::io::Error::new(
+ std::io::ErrorKind::InvalidInput,
+ format!("line {line_num}: Annotation missing ':'"),
+ ))
+ }
+ Some((col, label)) => self
+ .substitute_labels
+ .insert(col.to_owned(), label.to_owned()),
+ };
} else {
return Err(std::io::Error::new(
std::io::ErrorKind::InvalidInput,
column_threshold: 2,
static_columns: vec![],
hidden_columns: HashSet::new(),
+ substitute_labels: HashMap::new(),
}
}
}
.collect()
}
-fn render_one_instance(instance: &Option<String>) -> HTML {
- match instance {
- None => HTML::from("β"),
- Some(instance) => HTML::escape(instance.as_ref()),
- }
-}
-
fn render_instances(instances: &[Option<String>]) -> 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.len()))
- } else {
- HTML(
- instances
- .iter()
- .map(render_one_instance)
- .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
- .collect::<Vec<_>>()
- .join(" "),
- )
+ let mut tally = 0;
+ let mut out = vec![];
+ for ins in instances {
+ match ins {
+ None => tally += 1,
+ Some(content) => {
+ if tally > 0 {
+ out.push(HTML(tally_marks(tally)));
+ tally = 0;
+ }
+ out.push(HTML::escape(content));
+ }
+ }
}
+ if tally > 0 {
+ out.push(HTML(tally_marks(tally)));
+ }
+ HTML(
+ out.into_iter()
+ .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
+ .collect::<Vec<_>>()
+ .join(" "),
+ )
}
-fn render_cell(col: &str, row: &mut Row) -> HTML {
+fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML {
let row_label = HTML::escape(row.label.as_ref());
- let col_label = HTML::escape(col);
+ let col_label = HTML::escape(
+ config
+ .substitute_labels
+ .get(col)
+ .map_or(col, std::string::String::as_str),
+ );
let instances: Option<&Vec<Option<String>>> = row.entries.get(col);
- let class = HTML::from(if instances.is_none() { "" } else { "yes" });
+ let is_empty = match instances {
+ None => true,
+ Some(is) => is.iter().all(|ins| match ins {
+ None => false,
+ Some(content) => content == "Γ",
+ }),
+ };
+ let class = HTML::from(if is_empty { "" } else { r#" class="yes""# });
let contents = match instances {
None => HTML::from(""),
Some(is) => render_instances(is),
};
row.entries.remove(col);
HTML(format!(
- r#"<td class="{class}" onmouseover="h2('{row_label}','{col_label}')" onmouseout="ch2('{row_label}','{col_label}')">{contents}</td>"#
+ r#"<td{class} onmouseover="h2('{row_label}','{col_label}')" onmouseout="ch2('{row_label}','{col_label}')">{contents}</td>"#
))
}
fn render_leftover(notcol: &str, instances: &[Option<String>]) -> HTML {
let label = HTML::escape(notcol);
- let rest = render_instances(instances);
- if rest == HTML::from("") {
+ if instances.len() == 1 && instances[0].is_none() {
HTML(format!("{label}"))
} else {
+ let rest = render_instances(instances);
HTML(format!("{label}: {rest}"))
}
}
.iter()
.map(|ocol| match ocol {
Some(col) if config.hidden_columns.contains(col) => HTML::from(""),
- Some(col) => render_cell(col, row),
+ Some(col) => render_cell(config, col, row),
None => HTML::from(r#"<td class="spacer_col"></td>"#),
})
.collect::<HTML>();
let dynamic_cells = columns
.iter()
.filter(|&col| !config.hidden_columns.contains(col))
- .map(|col| render_cell(col, row))
+ .map(|col| render_cell(config, col, row))
.collect::<HTML>();
let leftovers = render_all_leftovers(config, row);
HTML(format!(
}
}
-fn column_header_order<'a>(
+fn column_header_labels<'a>(
config: &'a Config,
columns: &'a [String],
) -> impl Iterator<Item = Option<&'a String>> {
let static_columns = config.static_columns.iter().map(|oc| oc.as_ref());
let dynamic_columns = columns.iter().map(Some);
- static_columns.chain(dynamic_columns).filter(|ocol| {
- ocol.map_or(true, |col| !config.hidden_columns.contains(col))
- })
+ static_columns
+ .chain(dynamic_columns)
+ .filter(|ocol| ocol.map_or(true, |col| !config.hidden_columns.contains(col)))
+ .map(|ocol| {
+ ocol.map(|col| match config.substitute_labels.get(col) {
+ None => col,
+ Some(substitute) => substitute,
+ })
+ })
}
fn render_column_headers(config: &Config, columns: &[String]) -> HTML {
HTML(
String::from(r#"<tr class="key"><th></th>"#)
- + &column_header_order(config, columns).fold(String::new(), |mut acc, ocol| {
+ + &column_header_labels(config, columns).fold(String::new(), |mut acc, ocol| {
match ocol {
Some(col) => {
let col_header = HTML::escape(col);
);
}
+ #[test]
+ fn test_tally_marks() {
+ assert_eq!(tally_marks(1), "π·");
+ assert_eq!(tally_marks(2), "π·π·");
+ assert_eq!(tally_marks(3), "π·π·π·");
+ assert_eq!(tally_marks(4), "π·π·π·π·");
+ assert_eq!(tally_marks(5), "πΈ");
+ assert_eq!(tally_marks(6), "πΈπ·");
+ assert_eq!(tally_marks(7), "πΈπ·π·");
+ assert_eq!(tally_marks(8), "πΈπ·π·π·");
+ assert_eq!(tally_marks(9), "πΈπ·π·π·π·");
+ assert_eq!(tally_marks(10), "πΈπΈ");
+ assert_eq!(tally_marks(11), "πΈπΈπ·");
+ }
+
fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
read_input(input).map(|(rows, _)| rows)
}
read_config(&b"!col foo"[..]).unwrap().static_columns,
vec![Some("foo".to_owned())]
);
+ assert_eq!(
+ read_config(&b"!label foo:bar"[..])
+ .unwrap()
+ .substitute_labels["foo"],
+ "bar"
+ );
let bad_command = read_config(&b"!no such command"[..]);
assert!(bad_command.is_err());
let bad_num = read_config(&b"!col_threshold foo"[..]);
assert!(bad_num.is_err());
assert!(format!("{bad_num:?}").contains("line 1: col_threshold must be numeric"));
+
+ let bad_sub = read_config(&b"!label foo"[..]);
+ assert!(bad_sub.is_err());
+ assert!(format!("{bad_sub:?}").contains("line 1: Annotation missing ':'"));
}
#[test]
}
#[test]
- fn test_column_header_order() {
+ fn test_column_header_labels() {
let mut cfg = Config::default();
- assert!(column_header_order(&cfg, &["foo".to_owned()]).eq([Some(&"foo".to_owned())]));
+ assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([Some(&"foo".to_owned())]));
cfg.static_columns.push(Some("bar".to_owned()));
- assert!(column_header_order(&cfg, &["foo".to_owned()])
+ assert!(column_header_labels(&cfg, &["foo".to_owned()])
.eq([Some(&"bar".to_owned()), Some(&"foo".to_owned())]));
cfg.static_columns.push(None);
- assert!(column_header_order(&cfg, &["foo".to_owned()]).eq([
+ assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([
Some(&"bar".to_owned()),
None,
Some(&"foo".to_owned())
]));
+ cfg.substitute_labels
+ .insert("foo".to_owned(), "foo (bits)".to_owned());
+ assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([
+ Some(&"bar".to_owned()),
+ None,
+ Some(&"foo (bits)".to_owned())
+ ]));
+
cfg.hidden_columns.insert("foo".to_owned());
- assert!(column_header_order(&cfg, &["foo".to_owned()]).eq([Some(&"bar".to_owned()), None]));
+ assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([Some(&"bar".to_owned()), None]));
cfg.hidden_columns.insert("bar".to_owned());
- assert!(column_header_order(&cfg, &["foo".to_owned()]).eq([None]));
+ assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([None]));
}
#[test]
fn test_render_cell() {
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "nope".to_owned(),
}
),
HTML::from(
- r#"<td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+ r#"<td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
)
);
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "nope".to_owned(),
}
),
HTML::from(
- r#"<td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+ r#"<td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
)
);
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "nope".to_owned(),
}
),
HTML::from(
- r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+ r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">π·</td>"#
)
);
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "nope".to_owned(),
}
),
HTML::from(
- r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">2</td>"#
+ r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">π·π·</td>"#
)
);
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "nope".to_owned(),
);
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "nope".to_owned(),
}
),
HTML::from(
- r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">5 β</td>"#
+ r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">5 π·</td>"#
)
);
assert_eq!(
render_cell(
+ &Config::default(),
+ "foo",
+ &mut Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![Some("Γ".to_owned())])]),
+ }
+ ),
+ HTML::from(
+ r#"<td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">Γ</td>"#
+ )
+ );
+ assert_eq!(
+ render_cell(
+ &Config::default(),
"heart",
&mut Row {
label: "nope".to_owned(),
);
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "bob's".to_owned(),
}
),
HTML::from(
- r#"<td class="yes" onmouseover="h2('bob's','foo')" onmouseout="ch2('bob's','foo')"></td>"#
+ r#"<td class="yes" onmouseover="h2('bob's','foo')" onmouseout="ch2('bob's','foo')">π·</td>"#
)
);
let mut r = Row {
]),
};
assert_eq!(r.entries.len(), 2);
- render_cell("foo", &mut r);
+ render_cell(&Config::default(), "foo", &mut r);
assert_eq!(r.entries.len(), 1);
- render_cell("bar", &mut r);
+ render_cell(&Config::default(), "bar", &mut r);
assert_eq!(r.entries.len(), 1);
- render_cell("baz", &mut r);
+ render_cell(&Config::default(), "baz", &mut r);
assert_eq!(r.entries.len(), 0);
}
]),
}
),
- HTML::from("bar: 2, foo")
+ HTML::from("bar: π·π·, foo")
);
assert_eq!(
render_all_leftovers(
column_threshold: 2,
static_columns: vec![],
hidden_columns: HashSet::from(["private".to_owned()]),
+ substitute_labels: HashMap::new(),
},
&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>
+ r#"<tr><th id="nope">nope</th><td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')">bar</td></tr>
"#
)
);
column_threshold: 0,
static_columns: vec![Some("foo".to_owned()), Some("bar".to_owned())],
hidden_columns: HashSet::new(),
+ substitute_labels: HashMap::new(),
},
&["baz".to_owned()],
&mut Rowlike::Row(Row {
column_threshold: 0,
static_columns: vec![Some("foo".to_owned()), None, Some("bar".to_owned())],
hidden_columns: HashSet::new(),
+ substitute_labels: HashMap::new(),
},
&[],
&mut Rowlike::Row(Row {
column_threshold: 0,
static_columns: vec![],
hidden_columns: HashSet::from(["foo".to_owned()]),
+ substitute_labels: HashMap::new(),
},
&[],
&mut Rowlike::Row(Row {
column_threshold: 0,
static_columns: vec![Some("foo".to_owned())],
hidden_columns: HashSet::from(["foo".to_owned()]),
+ substitute_labels: HashMap::new(),
},
&[],
&mut Rowlike::Row(Row {
),
HTML::from(
r#"<tr><th id="nope">nope</th><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
+"#
+ )
+ );
+ assert_eq!(
+ render_row(
+ &Config {
+ column_threshold: 0,
+ static_columns: vec![],
+ hidden_columns: HashSet::new(),
+ substitute_labels: HashMap::from([("foo".to_owned(), "bar".to_owned())]),
+ },
+ &["foo".to_owned()],
+ &mut Rowlike::Row(Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![None])]),
+ })
+ ),
+ HTML::from(
+ r#"<tr><th id="nope">nope</th><td class="yes" onmouseover="h2('nope','bar')" onmouseout="ch2('nope','bar')">π·</td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
"#
)
);
projects / tablify / blobdiff