From 4f1de4745baf934c5156398f156fad746b1d70c6 Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Wed, 24 Aug 2022 20:01:29 +0900 Subject: [PATCH] condensed most total detection in results summary #675 --- src/afterfact.rs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/afterfact.rs b/src/afterfact.rs index 2a8638b0..c4585b8f 100644 --- a/src/afterfact.rs +++ b/src/afterfact.rs @@ -516,7 +516,9 @@ fn _print_detection_summary_by_date( let mut wtr = buf_wtr.buffer(); wtr.set_color(ColorSpec::new().set_fg(None)).ok(); - for level in LEVEL_ABBR.values() { + write!(wtr, "Most Total detections: ").ok(); + + for (idx, level) in LEVEL_ABBR.values().enumerate() { // output_levelsはlevelsからundefinedを除外した配列であり、各要素は必ず初期化されているのでSomeであることが保証されているのでunwrapをそのまま実施 let detections_by_day = detect_counts_by_date.get(level).unwrap(); let mut max_detect_str = String::default(); @@ -537,13 +539,18 @@ fn _print_detection_summary_by_date( if !exist_max_data { max_detect_str = "n/a".to_string(); } - writeln!( + write!( wtr, - "Date with most total {} detections: {}", + "{} detections: {}", LEVEL_FULL.get(level.as_str()).unwrap(), &max_detect_str ) .ok(); + if idx != LEVEL_ABBR.len() - 1 { + wtr.set_color(ColorSpec::new().set_fg(None)).ok(); + + write!(wtr, ", ").ok(); + } } buf_wtr.print(&wtr).ok(); }