From 8cac21511cbcc148ea7a4c8c6d196c9c0bf17255 Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Mon, 14 Oct 2024 00:42:49 +0200
Subject: Small improvements to showing progress

---
 src/term.rs | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'src/term.rs')

diff --git a/src/term.rs b/src/term.rs
index 0294017..8a2f8c5 100644
--- a/src/term.rs
+++ b/src/term.rs
@@ -164,26 +164,34 @@ pub fn show_exercises_check_progress(
 
     let mut exercise_num = 1;
     for exercise_progress in progresses {
-        let color = match exercise_progress {
-            ExerciseCheckProgress::None => Color::Reset,
-            ExerciseCheckProgress::Checking => Color::Blue,
-            ExerciseCheckProgress::Done => Color::Green,
-            ExerciseCheckProgress::Pending => Color::Red,
-        };
-
-        stdout.queue(SetForegroundColor(color))?;
+        match exercise_progress {
+            ExerciseCheckProgress::None => (),
+            ExerciseCheckProgress::Checking => {
+                stdout.queue(SetForegroundColor(Color::Blue))?;
+            }
+            ExerciseCheckProgress::Done => {
+                stdout.queue(SetForegroundColor(Color::Green))?;
+            }
+            ExerciseCheckProgress::Pending => {
+                stdout.queue(SetForegroundColor(Color::Red))?;
+            }
+        }
+
         write!(stdout, "{exercise_num:<3}")?;
+        stdout.queue(ResetColor)?;
 
-        if exercise_num % n_cols == 0 {
-            stdout.write_all(b"\n")?;
-        } else {
-            stdout.write_all(b" ")?;
-        }
+        if exercise_num != progresses.len() {
+            if exercise_num % n_cols == 0 {
+                stdout.write_all(b"\n")?;
+            } else {
+                stdout.write_all(b" ")?;
+            }
 
-        exercise_num += 1;
+            exercise_num += 1;
+        }
     }
 
-    stdout.queue(ResetColor)?.flush()
+    stdout.flush()
 }
 
 pub fn clear_terminal(stdout: &mut StdoutLock) -> io::Result<()> {
-- 
cgit v1.2.3