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()
+fn tally_marks(n: usize, mark: Option<&str>) -> String {
+ match mark {
+ None => {
+ let fives = { 0..n / 5 }.map(|_| 'πΈ');
+ let ones = { 0..n % 5 }.map(|_| 'π·');
+ fives.chain(ones).collect()
+ }
+ Some(m) => { 0..n }.map(|_| m).collect(),
+ }
}
#[derive(PartialEq, Eq, Debug)]
static_columns: Vec<Option<String>>,
hidden_columns: HashSet<String>,
substitute_labels: HashMap<String, String>,
+ mark: HashMap<String, String>,
}
impl Config {
fn apply_command(&mut self, line_num: usize, cmd: &str) -> Result<(), std::io::Error> {
.substitute_labels
.insert(col.to_owned(), label.to_owned()),
};
+ } else if let Some(directive) = cmd.strip_prefix("mark ") {
+ match directive.split_once(':') {
+ None => {
+ return Err(std::io::Error::new(
+ std::io::ErrorKind::InvalidInput,
+ format!("line {line_num}: Mark missing ':'"),
+ ))
+ }
+ Some((col, label)) => self.mark.insert(col.to_owned(), label.to_owned()),
+ };
} else {
return Err(std::io::Error::new(
std::io::ErrorKind::InvalidInput,
static_columns: vec![],
hidden_columns: HashSet::new(),
substitute_labels: HashMap::new(),
+ mark: HashMap::new(),
}
}
}
tr.key > th > div > div { width: 5em; transform-origin: bottom left; transform: translateX(1em) rotate(-65deg) }
td { border: thin solid gray; }
td.leftover { text-align: left; border: none; padding-left: .4em; }
- td.yes { border: thin solid gray; background-color: #ddd; }
+ td.yes { border: thin solid gray; background-color: #eee; }
/* 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; }
</style>
.collect()
}
-fn render_instances(instances: &[Option<String>]) -> HTML {
+fn render_instances(instances: &[Option<String>], mark: Option<&str>) -> HTML {
let mut tally = 0;
let mut out = vec![];
for ins in instances {
None => tally += 1,
Some(content) => {
if tally > 0 {
- out.push(HTML(tally_marks(tally)));
+ out.push(HTML(tally_marks(tally, mark)));
tally = 0;
}
out.push(HTML::escape(content));
}
}
if tally > 0 {
- out.push(HTML(tally_marks(tally)));
+ out.push(HTML(tally_marks(tally, mark)));
}
HTML(
out.into_iter()
)
}
-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 is_empty = match instances {
None => true,
let class = HTML::from(if is_empty { "" } else { r#" class="yes""# });
let contents = match instances {
None => HTML::from(""),
- Some(is) => render_instances(is),
+ Some(is) => render_instances(is, config.mark.get(col).map(String::as_str)),
};
row.entries.remove(col);
HTML(format!(
))
}
-fn render_leftover(notcol: &str, instances: &[Option<String>]) -> HTML {
+fn render_leftover(config: &Config, notcol: &str, instances: &[Option<String>]) -> HTML {
let label = HTML::escape(notcol);
if instances.len() == 1 && instances[0].is_none() {
HTML(format!("{label}"))
} else {
- let rest = render_instances(instances);
+ let rest = render_instances(instances, config.mark.get(notcol).map(String::as_str));
HTML(format!("{label}: {rest}"))
}
}
HTML(
order
.into_iter()
- .map(|notcol| render_leftover(notcol, row.entries.get(notcol).expect("Key vanished?!")))
+ .map(|notcol| {
+ render_leftover(
+ config,
+ notcol,
+ row.entries.get(notcol).expect("Key vanished?!"),
+ )
+ })
.map(|html| html.0) // Waiting for slice_concat_trait to stabilize
.collect::<Vec<_>>()
.join(", "),
.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!(
#[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), "πΈπΈπ·");
+ assert_eq!(tally_marks(1, None), "π·");
+ assert_eq!(tally_marks(2, None), "π·π·");
+ assert_eq!(tally_marks(3, None), "π·π·π·");
+ assert_eq!(tally_marks(4, None), "π·π·π·π·");
+ assert_eq!(tally_marks(5, None), "πΈ");
+ assert_eq!(tally_marks(6, None), "πΈπ·");
+ assert_eq!(tally_marks(7, None), "πΈπ·π·");
+ assert_eq!(tally_marks(8, None), "πΈπ·π·π·");
+ assert_eq!(tally_marks(9, None), "πΈπ·π·π·π·");
+ assert_eq!(tally_marks(10, None), "πΈπΈ");
+ assert_eq!(tally_marks(11, None), "πΈπΈπ·");
+ assert_eq!(tally_marks(1, Some("x")), "x");
+ assert_eq!(tally_marks(4, Some("x")), "xxxx");
+ assert_eq!(tally_marks(5, Some("x")), "xxxxx");
+ assert_eq!(tally_marks(6, Some("x")), "xxxxxx");
+ assert_eq!(tally_marks(2, Some("π")), "ππ");
}
fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
.substitute_labels["foo"],
"bar"
);
+ assert_eq!(read_config(&b"!mark foo:*"[..]).unwrap().mark["foo"], "*");
let bad_command = read_config(&b"!no such command"[..]);
assert!(bad_command.is_err());
let bad_sub = read_config(&b"!label foo"[..]);
assert!(bad_sub.is_err());
assert!(format!("{bad_sub:?}").contains("line 1: Annotation missing ':'"));
+
+ let bad_mark = read_config(&b"!mark foo"[..]);
+ assert!(bad_mark.is_err());
+ assert!(format!("{bad_mark:?}").contains("line 1: Mark missing ':'"));
}
#[test]
fn test_render_cell() {
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(),
);
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(),
);
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(),
);
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "nope".to_owned(),
);
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(),
r#"<td class="yes" onmouseover="h2('bob's','foo')" onmouseout="ch2('bob's','foo')">π·</td>"#
)
);
+ assert_eq!(
+ render_cell(
+ &Config {
+ column_threshold: 2,
+ static_columns: vec![],
+ hidden_columns: HashSet::new(),
+ substitute_labels: HashMap::new(),
+ mark: HashMap::from([("foo".to_owned(), "π¦".to_owned())]),
+ },
+ "foo",
+ &mut Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![None])]),
+ }
+ ),
+ HTML::from(
+ r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">π¦</td>"#
+ )
+ );
+
let mut r = Row {
label: "nope".to_owned(),
entries: HashMap::from([
]),
};
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);
}
static_columns: vec![],
hidden_columns: HashSet::from(["private".to_owned()]),
substitute_labels: HashMap::new(),
+ mark: HashMap::new(),
},
&Row {
label: "nope".to_owned(),
),
HTML::from("")
);
+ assert_eq!(
+ render_all_leftovers(
+ &Config {
+ column_threshold: 2,
+ static_columns: vec![],
+ hidden_columns: HashSet::new(),
+ substitute_labels: HashMap::new(),
+ mark: HashMap::from([("foo".to_owned(), "π".to_owned())]),
+ },
+ &Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![None, None])]),
+ }
+ ),
+ HTML::from("foo: ππ")
+ );
}
#[test]
static_columns: vec![Some("foo".to_owned()), Some("bar".to_owned())],
hidden_columns: HashSet::new(),
substitute_labels: HashMap::new(),
+ mark: HashMap::new(),
},
&["baz".to_owned()],
&mut Rowlike::Row(Row {
static_columns: vec![Some("foo".to_owned()), None, Some("bar".to_owned())],
hidden_columns: HashSet::new(),
substitute_labels: HashMap::new(),
+ mark: HashMap::new(),
},
&[],
&mut Rowlike::Row(Row {
static_columns: vec![],
hidden_columns: HashSet::from(["foo".to_owned()]),
substitute_labels: HashMap::new(),
+ mark: HashMap::new(),
},
&[],
&mut Rowlike::Row(Row {
static_columns: vec![Some("foo".to_owned())],
hidden_columns: HashSet::from(["foo".to_owned()]),
substitute_labels: HashMap::new(),
+ mark: 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())]),
+ mark: HashMap::new(),
+ },
+ &["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