Watch start at (foundry-rs#117)

* Watch start at * Update README.md * Minor exercise message fix To follow with Command + Click * Update README.md * Update README.md
Utilitycoder · May 7, 2023 · 92a8980 · 92a8980
1 parent cae0f33
commit 92a8980
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -30,6 +30,17 @@ With rustup `curl https://sh.rustup.rs -sSf | sh -s`
 2. Run `cargo run --bin starklings`, this might take a while the first time.
 3. You should see this intro message, run `cargo run --bin starklings watch` when you are ready!
 
+## Start at a specific exercise `NEW`
+
+To start watch at a specific exercise pass the name of the exercise to watch command.
+For example, to start at `starknet1`,
+
+```
+cargo run --bin starklings watch starknet1
+```
+
+## Welcome message and instrucitons
+
 ```
 starklings - An interactive tutorial to get started with Cairo and Starknet
 

diff --git a/src/main.rs b/src/main.rs
@@ -4,6 +4,7 @@ use crate::run::{reset, run};
 use crate::verify::verify;
 use argh::FromArgs;
 use console::Emoji;
+use core::panic;
 use notify::DebouncedEvent;
 use notify::{RecommendedWatcher, RecursiveMode, Watcher};
 use std::ffi::OsStr;
@@ -64,7 +65,11 @@ struct VerifyArgs {}
 #[derive(FromArgs, PartialEq, Debug)]
 #[argh(subcommand, name = "watch")]
 /// Reruns `verify` when files were edited
-struct WatchArgs {}
+struct WatchArgs {
+    #[argh(positional)]
+    // Start from this exercise
+    start: Option<String>,
+}
 
 #[derive(FromArgs, PartialEq, Debug)]
 #[argh(subcommand, name = "compile_solutions")]
@@ -292,24 +297,36 @@ fn main() {
             }
         }
 
-        Subcommands::Watch(_subargs) => match watch(&exercises) {
-            Err(e) => {
-                println!("Error: Could not watch your progress. Error message was {e:?}.");
-                println!("Most likely you've run out of disk space or your 'inotify limit' has been reached.");
-                std::process::exit(1);
-            }
-            Ok(WatchStatus::Finished) => {
-                println!(
-                    "{emoji} All exercises completed! {emoji}",
-                    emoji = Emoji("🎉", "★")
-                );
-                println!("\n{FINISH_LINE}\n");
-            }
-            Ok(WatchStatus::Unfinished) => {
-                println!("We hope you're enjoying learning about Rust!");
-                println!("If you want to continue working on the exercises at a later point, you can simply run `starklings watch` again");
+        Subcommands::Watch(subargs) => {
+            let start = subargs.start;
+
+            let watching = match start {
+                Some(exercise) => match exercises.iter().position(|r| r.name == exercise) {
+                    Some(index) => watch(&exercises[index..]),
+                    None => panic!("Exercise {} not found.", exercise),
+                },
+                None => watch(&exercises),
+            };
+
+            match watching {
+                Err(e) => {
+                    println!("Error: Could not watch your progress. Error message was {e:?}.");
+                    println!("Most likely you've run out of disk space or your 'inotify limit' has been reached.");
+                    std::process::exit(1);
+                }
+                Ok(WatchStatus::Finished) => {
+                    println!(
+                        "{emoji} All exercises completed! {emoji}",
+                        emoji = Emoji("🎉", "★")
+                    );
+                    println!("\n{FINISH_LINE}\n");
+                }
+                Ok(WatchStatus::Unfinished) => {
+                    println!("We hope you're enjoying learning about Rust!");
+                    println!("If you want to continue working on the exercises at a later point, you can simply run `starklings watch` again");
+                }
             }
-        },
+        }
     }
 }
 
@@ -481,11 +498,11 @@ const FINISH_LINE: &str = r#"+--------------------------------------------------
                       @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@(                     
                    &@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@(                  
                  @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@                
-               @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@              
-             &@@@@@@@@@@@@ @@@@@@@@@@@@@@@@&               @@@@@@@@             
-            @@@@@@@@@@@,     *@@@@@@@@@@                      @@@@@@&           
+               @@@@@@@@@@@*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@              
+             &@@@@@@@@@@@   @@@@@@@@@@@@@@@&               @@@@@@@@             
+            @@@@@@@@@@,       *@@@@@@@@@                      @@@@@@&           
            @@@@@@@@@@@@@@   @@@@@@@@@@                         *@@@@@&          
-          /@@@@@@@@@@@@@@@ @@@@@@@@@               .*********/@@@@@@@@          
+          /@@@@@@@@@@@@@@@-@@@@@@@@@               .*********/@@@@@@@@          
           @@@@@@@@@@@@@@@@@@@@@@@@               **********@@@@@@@@@@@@         
           @@@@@@@@@@@@@@@@@@@@@@                *********@@@@@@@@@@@@@@         
           @@@@@@@@@@@@@@@@@@@@                *********@@@@@@@@@@@@@@@@         

diff --git a/src/verify.rs b/src/verify.rs
@@ -40,7 +40,7 @@ fn compile_and_run_interactively(exercise: &Exercise) -> Result<bool, ()> {
     let progress_bar = ProgressBar::new_spinner();
     progress_bar.enable_steady_tick(100);
 
-    progress_bar.set_message(format!("Running {exercise}..."));
+    progress_bar.set_message(format!("Running {exercise} exercise..."));
 
     let run_state = compile_and_run_cairo(exercise, &progress_bar)?;
 
@@ -54,7 +54,7 @@ fn compile_and_test_interactively(exercise: &Exercise) -> Result<bool, ()> {
     let progress_bar = ProgressBar::new_spinner();
     progress_bar.enable_steady_tick(100);
 
-    progress_bar.set_message(format!("Testing {exercise}..."));
+    progress_bar.set_message(format!("Testing {exercise} exercise..."));
 
     let run_state = compile_and_test_cairo(exercise, &progress_bar)?;