Merge branch 'main' into feat/new-ci-process

Author: anna-singleton

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Anna Singleton
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/main.rs

@@ -55,6 +55,11 @@ fn select_new_runner(runners_path: Option<String>) -> Option<Runner> {
         }
     }
 
+    if let Some(r) = &mut chosen_runner {
+        r.get_quit_fast();
+    }
+
+
     chosen_runner
 }
 

src/runner.rs

@@ -7,6 +7,7 @@ use std::process::Command;
 use directories::BaseDirs;
 use regex::Regex;
 use serde::{Serialize, Deserialize};
+use std::collections::HashSet;
 
 use skim::*;
 
@@ -57,24 +58,52 @@ impl Runner {
     /// process choose time arguments, and do corresponding string replacements
     pub fn get_args(&mut self) {
         let re = Regex::new(r"\{\s*(.*?)\s*\}").unwrap();
-        let handlebar_matches = re.find_iter(&self.cmd);
+        let handlebar_matches = re.captures_iter(&self.cmd);
 
-        let keys:Vec<_> = handlebar_matches.map(|m| m.as_str()).collect();
+        let keys:HashSet<_> = handlebar_matches.map(|m| m[1].to_string()).collect();
 
         if keys.is_empty() {
             return;
         }
 
         let mut newcmd = self.cmd.clone();
+
+        println!("Command is: {}", &newcmd);
+
         for key in keys {
-            let value = Self::get_arg(key);
+            let value = Self::get_arg(&key);
+            // yes this regex is horrid.
+            // breakdown of it is:
+            // the \ are just literal \
+            // the centre {} is where key is put
+            // the {{ and }} are escaped { and } respectively
+            let s = format!(r"\{{{}\}}", key);
+            let re = Regex::new(&s).unwrap();
             newcmd = re.replace_all(&newcmd, value).to_string();
             println!("Command is now: {}", newcmd);
         }
 
         self.cmd = newcmd;
     }
 
+    pub fn get_quit_fast(&mut self) {
+        let mut choice = String::new();
+
+        if self.quit_fast {
+            println!("Require an ENTER press after the runner exits? [y/N]?");
+        } else {
+            println!("Require an ENTER press after the runner exits? [Y/n]?")
+        }
+
+        std::io::stdin().read_line(&mut choice).expect("error reading from stdin");
+
+        self.quit_fast = match choice.trim().to_uppercase().as_str() {
+            "Y" => false,
+            "N" => true,
+            _ => self.quit_fast,
+        }
+    }
+
     fn get_arg(name: &str) -> String {
         println!("Enter value for {}", name);