From d5a6dee1b329f68d00bee61c6b6c7a0adbf8bab5 Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Fri, 12 Apr 2024 18:57:04 +0200
Subject: Handle the case when all exercises are done

---
 src/run.rs | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'src/run.rs')

diff --git a/src/run.rs b/src/run.rs
index 18da193..ea790e9 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -1,6 +1,6 @@
 use anyhow::{bail, Result};
 use crossterm::style::Stylize;
-use std::io::{stdout, Write};
+use std::io::{self, Write};
 
 use crate::app_state::{AppState, ExercisesProgress};
 
@@ -8,28 +8,24 @@ pub fn run(app_state: &mut AppState) -> Result<()> {
     let exercise = app_state.current_exercise();
     let output = exercise.run()?;
 
-    {
-        let mut stdout = stdout().lock();
-        stdout.write_all(&output.stdout)?;
-        stdout.write_all(&output.stderr)?;
-        stdout.flush()?;
-    }
+    let mut stdout = io::stdout().lock();
+    stdout.write_all(&output.stdout)?;
+    stdout.write_all(b"\n")?;
+    stdout.write_all(&output.stderr)?;
+    stdout.flush()?;
 
     if !output.status.success() {
         bail!("Ran {exercise} with errors");
     }
 
-    println!(
+    stdout.write_fmt(format_args!(
         "{}{}",
         "✓ Successfully ran ".green(),
         exercise.path.to_string_lossy().green(),
-    );
+    ))?;
 
-    match app_state.done_current_exercise()? {
-        ExercisesProgress::AllDone => println!(
-            "🎉 Congratulations! You have done all the exercises!
-🔚 There are no more exercises to do next!"
-        ),
+    match app_state.done_current_exercise(&mut stdout)? {
+        ExercisesProgress::AllDone => (),
         ExercisesProgress::Pending => println!("Next exercise: {}", app_state.current_exercise()),
     }
 
-- 
cgit v1.2.3