summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bagshaw <abagshaw@hotmail.ca>2019-03-13 13:50:54 -0700
committerAndrew Bagshaw <abagshaw@hotmail.ca>2019-03-13 13:50:54 -0700
commit3f114cc0699e2600e92acb466ae2dd90e0626715 (patch)
tree215a3835321a02c2ffbebb48b22dae0fa0439bbc
parentabf175111d9bd997bc1c4ef5e078308fad681480 (diff)
Start verification at most recently modified file
-rw-r--r--src/main.rs6
-rw-r--r--src/verify.rs14
2 files changed, 16 insertions, 4 deletions
diff --git a/src/main.rs b/src/main.rs
index 0e2c975..19c0ae0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -52,7 +52,7 @@ fn main() {
}
if matches.subcommand_matches("verify").is_some() {
- match verify() {
+ match verify(None) {
Ok(_) => {}
Err(_) => std::process::exit(1),
}
@@ -81,14 +81,14 @@ 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();
+ let _ignored = verify(Some(b.as_path().to_str().unwrap()));
}
}
_ => {}
diff --git a/src/verify.rs b/src/verify.rs
index ab08a27..877a2aa 100644
--- a/src/verify.rs
+++ b/src/verify.rs
@@ -5,10 +5,22 @@ 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())?,