mirror/rustlings
1
0
Fork 0
mirror of https://github.com/rust-lang/rustlings.git synced 2024-12-25 00:00:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Small improvements to showing progress

Browse source
This commit is contained in:
mo8it 2024-10-14 00:42:49 +02:00
parent 396ee4d618
commit 8cac21511c
3 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/app_state.rs
View file

@ -520,7 +520,6 @@ impl AppState {
}
self.write()?;
stdout.write_all(b"\n")?;
Ok(first_pending_exercise_ind)
}

4
src/main.rs
View file

@ -151,13 +151,15 @@ fn main() -> Result<ExitCode> {
app_state.set_current_exercise_ind(first_pending_exercise_ind)?;
}
stdout.write_all(b"\n\n")?;
let pending = app_state.n_pending();
if pending == 1 {
stdout.write_all(b"One exercise pending: ")?;
} else {
write!(
stdout,
"{pending}/{} exercises are pending. The first: ",
"{pending}/{} exercises pending. The first: ",
app_state.exercises().len(),
)?;
}

24
src/term.rs
View file

@ -164,16 +164,23 @@ 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,
};
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))?;
}
}
stdout.queue(SetForegroundColor(color))?;
write!(stdout, "{exercise_num:<3}")?;
stdout.queue(ResetColor)?;
if exercise_num != progresses.len() {
if exercise_num % n_cols == 0 {
stdout.write_all(b"\n")?;
} else {
@ -182,8 +189,9 @@ pub fn show_exercises_check_progress(
exercise_num += 1;
}
}
stdout.queue(ResetColor)?.flush()
stdout.flush()
}
pub fn clear_terminal(stdout: &mut StdoutLock) -> io::Result<()> {