notohh/rustlings
notohh/rustlings
1
0
Fork 0
mirror of https://github.com/notohh/rustlings.git synced 2024-11-22 05:52:23 -05:00
Code Issues Projects Releases Packages Wiki Activity

Improvements to verify

Browse source
This commit is contained in:
mo8it 2024-04-01 18:21:56 +02:00
parent 2f30eac27f
commit fdd7de00bd
2 changed files with 22 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/main.rs
View file

@ -8,7 +8,6 @@ use console::Emoji;
use notify_debouncer_mini::notify::{self, RecursiveMode}; use notify_debouncer_mini::notify::{self, RecursiveMode};
use notify_debouncer_mini::{new_debouncer, DebouncedEventKind}; use notify_debouncer_mini::{new_debouncer, DebouncedEventKind};
use shlex::Shlex; use shlex::Shlex;
use std::ffi::OsStr;
use std::io::{BufRead, Write}; use std::io::{BufRead, Write};
use std::path::Path; use std::path::Path;
use std::process::{exit, Command}; use std::process::{exit, Command};
@ -344,44 +343,40 @@ fn watch(
Ok(_) => return Ok(WatchStatus::Finished), Ok(_) => return Ok(WatchStatus::Finished),
Err(exercise) => Arc::new(Mutex::new(Some(exercise.hint.clone()))), Err(exercise) => Arc::new(Mutex::new(Some(exercise.hint.clone()))),
}; };
spawn_watch_shell(Arc::clone(&failed_exercise_hint), Arc::clone(&should_quit)); spawn_watch_shell(Arc::clone(&failed_exercise_hint), Arc::clone(&should_quit));
let mut pending_exercises = Vec::with_capacity(exercises.len());
loop { loop {
match rx.recv_timeout(Duration::from_secs(1)) { match rx.recv_timeout(Duration::from_secs(1)) {
Ok(event) => match event { Ok(event) => match event {
Ok(events) => { Ok(events) => {
for event in events { for event in events {
let event_path = event.path;
if event.kind == DebouncedEventKind::Any if event.kind == DebouncedEventKind::Any
&& event_path.extension() == Some(OsStr::new("rs")) && event.path.extension().is_some_and(|ext| ext == "rs")
&& event_path.exists()
{ {
let filepath = event_path.as_path().canonicalize().unwrap(); pending_exercises.extend(exercises.iter().filter(|exercise| {
// TODO: Remove unwrap !exercise.looks_done().unwrap_or(false)
let pending_exercises = exercises || event.path.ends_with(&exercise.path)
.iter() }));
.find(|e| filepath.ends_with(&e.path)) let num_done = exercises.len() - pending_exercises.len();
.into_iter()
.chain(exercises.iter().filter(|e| {
!e.looks_done().unwrap() && !filepath.ends_with(&e.path)
}));
let num_done = exercises
.iter()
.filter(|e| e.looks_done().unwrap() && !filepath.ends_with(&e.path))
.count();
clear_screen(); clear_screen();
match verify( match verify(
pending_exercises, pending_exercises.iter().copied(),
(num_done, exercises.len()), (num_done, exercises.len()),
verbose, verbose,
success_hints, success_hints,
) { ) {
Ok(_) => return Ok(WatchStatus::Finished), Ok(_) => return Ok(WatchStatus::Finished),
Err(exercise) => { Err(exercise) => {
let mut failed_exercise_hint = let hint = exercise.hint.clone();
failed_exercise_hint.lock().unwrap(); *failed_exercise_hint.lock().unwrap() = Some(hint);
*failed_exercise_hint = Some(exercise.hint.clone());
} }
} }
pending_exercises.clear();
} }
} }
} }

17
src/verify.rs
View file

@ -16,7 +16,7 @@ use crate::exercise::{Exercise, Mode, State};
// If the Exercise being verified is a test, the verbose boolean // If the Exercise being verified is a test, the verbose boolean
// determines whether or not the test harness outputs are displayed. // determines whether or not the test harness outputs are displayed.
pub fn verify<'a>( pub fn verify<'a>(
exercises: impl IntoIterator<Item = &'a Exercise>, pending_exercises: impl IntoIterator<Item = &'a Exercise>,
progress: (usize, usize), progress: (usize, usize),
verbose: bool, verbose: bool,
success_hints: bool, success_hints: bool,
@ -33,7 +33,7 @@ pub fn verify<'a>(
bar.set_position(num_done as u64); bar.set_position(num_done as u64);
bar.set_message(format!("({percentage:.1} %)")); bar.set_message(format!("({percentage:.1} %)"));
for exercise in exercises { for exercise in pending_exercises {
let compile_result = match exercise.mode { let compile_result = match exercise.mode {
Mode::Test => compile_and_test(exercise, RunMode::Interactive, verbose, success_hints), Mode::Test => compile_and_test(exercise, RunMode::Interactive, verbose, success_hints),
Mode::Compile => compile_and_run_interactively(exercise, success_hints), Mode::Compile => compile_and_run_interactively(exercise, success_hints),
@ -45,16 +45,11 @@ pub fn verify<'a>(
percentage += 100.0 / total as f32; percentage += 100.0 / total as f32;
bar.inc(1); bar.inc(1);
bar.set_message(format!("({percentage:.1} %)")); bar.set_message(format!("({percentage:.1} %)"));
if bar.position() == total as u64 {
println!(
"Progress: You completed {} / {} exercises ({:.1} %).",
bar.position(),
total,
percentage
);
bar.finish();
}
} }
bar.finish();
println!("You completed all exercises!");
Ok(()) Ok(())
} }