From 117bed6bd6882dacf893e1cfb12acc0c0b04af06 Mon Sep 17 00:00:00 2001 From: Andrew Bagshaw Date: Wed, 13 Mar 2019 13:50:54 -0700 Subject: [PATCH 1/5] Start verification at most recently modified file --- src/main.rs | 6 +++--- src/verify.rs | 14 +++++++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main.rs b/src/main.rs index 0e2c97576d..19c0ae0a71 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 ab08a2775a..877a2aa0c5 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 = 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())?, From e8325e6d79355cd6d960726259a02398e5328fda Mon Sep 17 00:00:00 2001 From: Andrew Bagshaw Date: Wed, 13 Mar 2019 13:53:24 -0700 Subject: [PATCH 2/5] deduplicate --- src/verify.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/verify.rs b/src/verify.rs index 877a2aa0c5..5aa2f5cf97 100644 --- a/src/verify.rs +++ b/src/verify.rs @@ -22,8 +22,8 @@ pub fn verify(start_at: Option<&str>) -> Result<(), ()> { } 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)?, _ => (), } } From de84abf4306faa70b98766a5ea4794a4a606a7c7 Mon Sep 17 00:00:00 2001 From: Andrew Bagshaw Date: Wed, 13 Mar 2019 14:08:28 -0700 Subject: [PATCH 3/5] Add clear break between verify executions --- src/main.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 19c0ae0a71..1b62e28ef9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -84,10 +84,12 @@ fn watch() -> notify::Result<()> { let _ignored = verify(None); loop { - match rx.recv() { + match rx.recv() { Ok(event) => match event { DebouncedEvent::Create(b) | DebouncedEvent::Chmod(b) | DebouncedEvent::Write(b) => { if b.extension() == Some(OsStr::new("rs")) { + println!("----------**********----------"); + println!(); let _ignored = verify(Some(b.as_path().to_str().unwrap())); } } From 8bf4e8695b2f83036587f81e1086305e0648e2ae Mon Sep 17 00:00:00 2001 From: Andrew Bagshaw Date: Fri, 15 Mar 2019 12:47:06 -0700 Subject: [PATCH 4/5] Change to \n --- src/main.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index 1b62e28ef9..9451f114e2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -88,8 +88,7 @@ fn watch() -> notify::Result<()> { Ok(event) => match event { DebouncedEvent::Create(b) | DebouncedEvent::Chmod(b) | DebouncedEvent::Write(b) => { if b.extension() == Some(OsStr::new("rs")) { - println!("----------**********----------"); - println!(); + println!("----------**********----------\n"); let _ignored = verify(Some(b.as_path().to_str().unwrap())); } } From d75e2f21dbe612645fc1fbe1dabfbc31b09de098 Mon Sep 17 00:00:00 2001 From: Andrew Bagshaw Date: Fri, 15 Mar 2019 16:01:45 -0700 Subject: [PATCH 5/5] Remove unnessecary whitespace --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 9451f114e2..3418685f77 100644 --- a/src/main.rs +++ b/src/main.rs @@ -84,7 +84,7 @@ fn watch() -> notify::Result<()> { let _ignored = verify(None); loop { - match rx.recv() { + match rx.recv() { Ok(event) => match event { DebouncedEvent::Create(b) | DebouncedEvent::Chmod(b) | DebouncedEvent::Write(b) => { if b.extension() == Some(OsStr::new("rs")) {