Skip to content

Commit

Permalink
Merge pull request rust-lang#120 from abagshaw/master
Browse files Browse the repository at this point in the history
Start verification at most recently modified file
  • Loading branch information
komaeda committed Mar 16, 2019
2 parents a36bcbb + d75e2f2 commit 1a27d94
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
7 changes: 4 additions & 3 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ fn main() {
}

if matches.subcommand_matches("verify").is_some() {
match verify() {
match verify(None) {
Ok(_) => {}
Err(_) => std::process::exit(1),
}
Expand Down Expand Up @@ -81,14 +81,15 @@ fn watch() -> notify::Result<()> {
let mut watcher: RecommendedWatcher = Watcher::new(tx, Duration::from_secs(2))?;
watcher.watch("./exercises", RecursiveMode::Recursive)?;

let _ignored = verify();
let _ignored = verify(None);

loop {
match rx.recv() {
Ok(event) => match event {
DebouncedEvent::Create(b) | DebouncedEvent::Chmod(b) | DebouncedEvent::Write(b) => {
if b.extension() == Some(OsStr::new("rs")) {
let _ignored = verify();
println!("----------**********----------\n");
let _ignored = verify(Some(b.as_path().to_str().unwrap()));
}
}
_ => {}
Expand Down
18 changes: 15 additions & 3 deletions src/verify.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,25 @@ use std::fs;
use std::process::Command;
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 tomlvec: &Vec<Value> = toml.get("exercises").unwrap().as_array().unwrap();
let mut hit_start_at = false;

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() {
"test" => test(i.get("path").unwrap().as_str().unwrap())?,
"compile" => compile_only(i.get("path").unwrap().as_str().unwrap())?,
"test" => test(path)?,
"compile" => compile_only(path)?,
_ => (),
}
}
Expand Down

0 comments on commit 1a27d94

Please sign in to comment.