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

Show the progress in the progress bar, not the current exercise index

Browse source
This commit is contained in:
mo8it 2024-04-10 00:51:41 +02:00
parent 4a80bf6441
commit 533a009257
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/watch/state.rs
View file

@ -20,6 +20,7 @@ pub struct WatchState<'a> {
exercises: &'static [Exercise], exercises: &'static [Exercise],
exercise: &'static Exercise, exercise: &'static Exercise,
current_exercise_ind: usize, current_exercise_ind: usize,
progress: u16,
stdout: Option<Vec<u8>>, stdout: Option<Vec<u8>>,
stderr: Option<Vec<u8>>, stderr: Option<Vec<u8>>,
message: Option<String>, message: Option<String>,
@ -29,6 +30,7 @@ pub struct WatchState<'a> {
impl<'a> WatchState<'a> { impl<'a> WatchState<'a> {
pub fn new(state_file: &StateFile, exercises: &'static [Exercise]) -> Self { pub fn new(state_file: &StateFile, exercises: &'static [Exercise]) -> Self {
let current_exercise_ind = state_file.next_exercise_ind(); let current_exercise_ind = state_file.next_exercise_ind();
let progress = state_file.progress().iter().filter(|done| **done).count() as u16;
let exercise = &exercises[current_exercise_ind]; let exercise = &exercises[current_exercise_ind];
let writer = io::stdout().lock(); let writer = io::stdout().lock();
@ -46,6 +48,7 @@ impl<'a> WatchState<'a> {
exercises, exercises,
exercise, exercise,
current_exercise_ind, current_exercise_ind,
progress,
stdout: None, stdout: None,
stderr: None, stderr: None,
message: None, message: None,
@ -139,11 +142,7 @@ You can keep working on this exercise or jump into the next one by removing the
self.writer.write_all(b"\n")?; self.writer.write_all(b"\n")?;
let line_width = size()?.0; let line_width = size()?.0;
let progress_bar = progress_bar( let progress_bar = progress_bar(self.progress, self.exercises.len() as u16, line_width)?;
self.current_exercise_ind as u16,
self.exercises.len() as u16,
line_width,
)?;
self.writer.write_all(progress_bar.as_bytes())?; self.writer.write_all(progress_bar.as_bytes())?;
self.show_prompt()?; self.show_prompt()?;