From b89077705f91d010ac22f3f4cabe5336257a0758 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Mon, 19 Aug 2024 12:41:49 -0700 Subject: [PATCH] Split entries at ':' to separate instance data --- src/lib.rs | 52 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index bebbcf7..01668eb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -41,13 +41,19 @@ const FOOTER: &str = " #[derive(Debug, PartialEq, Eq, Hash)] struct Entry { col: String, - instance: String, + instance: Option, } impl From<&str> for Entry { fn from(value: &str) -> Entry { - Entry { - col: String::from(value), - instance: String::from(""), + match value.split_once(':') { + None => Entry { + col: String::from(value), + instance: None, + }, + Some((col, instance)) => Entry { + col: String::from(col), + instance: Some(String::from(instance)), + }, } } } @@ -116,9 +122,15 @@ fn read_rows(input: impl std::io::Read) -> impl Iterator Vec<(usize, String)> { let mut counts: Vec<_> = rows .iter() - .flat_map(|r| r.entries.iter().collect::>().into_iter()) - .fold(HashMap::new(), |mut cs, e| { - cs.entry(String::from(&e.col)) + .flat_map(|r| { + r.entries + .iter() + .map(|e| &e.col) + .collect::>() + .into_iter() + }) + .fold(HashMap::new(), |mut cs, col| { + cs.entry(String::from(col)) .and_modify(|n| *n += 1) .or_insert(1); cs @@ -146,6 +158,24 @@ pub fn tablify(input: impl std::io::Read) -> Result { mod tests { use super::*; + #[test] + fn test_parse_entry() { + assert_eq!( + Entry::from("foo"), + Entry { + col: String::from("foo"), + instance: None + } + ); + assert_eq!( + Entry::from("foo:bar"), + Entry { + col: String::from("foo"), + instance: Some(String::from("bar")) + } + ); + } + #[test] fn test_read_rows() { assert_eq!( @@ -266,5 +296,13 @@ mod tests { ), vec![(1, String::from("bar")), (2, String::from("baz"))] ); + assert_eq!( + column_counts( + &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..]) + .collect::, _>>() + .unwrap() + ), + vec![(1, String::from("bar")), (2, String::from("baz"))] + ); } } -- 2.44.1