From ef4e68bbf444b57c5f275c9e94643715b54d1af1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 22 May 2021 22:48:46 +0100 Subject: [PATCH] termprogress::Nest: Show outer phase number only if count>1 Signed-off-by: Ian Jackson --- src/termprogress.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/termprogress.rs b/src/termprogress.rs index 9374e6e0..6ef4291c 100644 --- a/src/termprogress.rs +++ b/src/termprogress.rs @@ -189,11 +189,17 @@ impl Reporter for Nest { } self.inner_last_phase = inner_pi.phase.i; + let desc = if self.outer_n > 1 { + format!("{}/{} {}", self.outer_i, self.outer_n, + &inner_pi.phase.desc).into() + } else { + inner_pi.phase.desc.clone() + }; + let outer_phase = progress::Count { i: inner_pi.phase.i + inner_pi.phase.n * self.outer_i, n: inner_pi.phase.n * self.outer_n, - desc: format!("{}/{} {}", self.outer_i, self.outer_n, - &inner_pi.phase.desc).into(), + desc, }; let outer_pi = ProgressInfo { -- 2.30.2