marco/rustlings-solutions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Start verification at most recently modified file

Browse Source
This commit is contained in:
Andrew Bagshaw 2019-03-13 13:50:54 -07:00
parent abf175111d
commit 3f114cc069
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.rs
View File

@ -52,7 +52,7 @@ fn main() {
} }
if matches.subcommand_matches("verify").is_some() { if matches.subcommand_matches("verify").is_some() {
match verify() { match verify(None) {
Ok(_) => {} Ok(_) => {}
Err(_) => std::process::exit(1), Err(_) => std::process::exit(1),
} }
@ -81,14 +81,14 @@ fn watch() -> notify::Result<()> {
let mut watcher: RecommendedWatcher = Watcher::new(tx, Duration::from_secs(2))?; let mut watcher: RecommendedWatcher = Watcher::new(tx, Duration::from_secs(2))?;
watcher.watch("./exercises", RecursiveMode::Recursive)?; watcher.watch("./exercises", RecursiveMode::Recursive)?;
let _ignored = verify(); let _ignored = verify(None);
loop { loop {
match rx.recv() { match rx.recv() {
Ok(event) => match event { Ok(event) => match event {
DebouncedEvent::Create(b) | DebouncedEvent::Chmod(b) | DebouncedEvent::Write(b) => { DebouncedEvent::Create(b) | DebouncedEvent::Chmod(b) | DebouncedEvent::Write(b) => {
if b.extension() == Some(OsStr::new("rs")) { if b.extension() == Some(OsStr::new("rs")) {
let _ignored = verify(); let _ignored = verify(Some(b.as_path().to_str().unwrap()));
} }
} }
_ => {} _ => {}

14
src/verify.rs
View File

@ -5,10 +5,22 @@ use std::fs;
use std::process::Command; use std::process::Command;
use toml::Value; use toml::Value;
pub fn verify() -> Result<(), ()> { pub fn verify(start_at: Option<&str>) -> Result<(), ()> {
let toml: Value = fs::read_to_string("info.toml").unwrap().parse().unwrap(); let toml: Value = fs::read_to_string("info.toml").unwrap().parse().unwrap();
let tomlvec: &Vec<Value> = toml.get("exercises").unwrap().as_array().unwrap(); let tomlvec: &Vec<Value> = toml.get("exercises").unwrap().as_array().unwrap();
let mut hit_start_at = false;
for i in tomlvec { for i in tomlvec {
let path = i.get("path").unwrap().as_str().unwrap();
if let Some(start_at) = start_at {
if start_at.ends_with(path) {
hit_start_at = true;
} else if !hit_start_at {
continue;
}
}
match i.get("mode").unwrap().as_str().unwrap() { match i.get("mode").unwrap().as_str().unwrap() {
"test" => test(i.get("path").unwrap().as_str().unwrap())?, "test" => test(i.get("path").unwrap().as_str().unwrap())?,
"compile" => compile_only(i.get("path").unwrap().as_str().unwrap())?, "compile" => compile_only(i.get("path").unwrap().as_str().unwrap())?,