Add support for variables in shell commands

Author: unsecretised

src/app.rs

@@ -315,7 +315,7 @@ impl Tile {
             }
 
             Message::RunFunction(command) => {
-                command.execute(&self.config);
+                command.execute(&self.config, &self.query);
 
                 if self.config.buffer_rules.clear_on_enter {
                     window::latest()
@@ -430,13 +430,21 @@ impl Tile {
 
         let mut exact: Vec<App> = filter_vec
             .par_iter()
-            .filter(|x| x.name_lc == query)
+            .filter(|x| match &x.open_command {
+                Function::RunShellCommand(_) => x
+                    .name_lc
+                    .starts_with(query.split_once(" ").unwrap_or((&query, "")).0),
+                _ => x.name_lc == query,
+            })
             .cloned()
             .collect();
 
         let mut prefix: Vec<App> = filter_vec
             .par_iter()
-            .filter(|x| x.name_lc != query && x.name_lc.starts_with(&query))
+            .filter(|x| match x.open_command {
+                Function::RunShellCommand(_) => false,
+                _ => x.name_lc != query && x.name_lc.starts_with(&query),
+            })
             .cloned()
             .collect();
 

src/commands.rs

@@ -9,25 +9,31 @@ use crate::config::Config;
 #[derive(Debug, Clone)]
 pub enum Function {
     OpenApp(String),
-    RunShellCommand(Vec<String>),
+    RunShellCommand(String),
     RandomVar(i32),
     GoogleSearch(String),
     OpenPrefPane,
     Quit,
 }
 
 impl Function {
-    pub fn execute(&self, config: &Config) {
+    pub fn execute(&self, config: &Config, query: &str) {
         match self {
             Function::OpenApp(path) => {
                 NSWorkspace::new().openURL(&NSURL::fileURLWithPath(
                     &objc2_foundation::NSString::from_str(path),
                 ));
             }
             Function::RunShellCommand(shell_command) => {
+                let mut final_command = shell_command.to_owned();
+
+                for (argument_num, argument) in query.split_whitespace().enumerate() {
+                    final_command =
+                        final_command.replace(&format!("$var{}", argument_num), argument);
+                }
                 Command::new("sh")
                     .arg("-c")
-                    .arg(shell_command.join(" "))
+                    .arg(final_command)
                     .status()
                     .ok();
             }

src/config.rs

@@ -122,7 +122,7 @@ impl Default for Buffer {
 /// Alias is the text that is used to call this command / search for it
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct Shelly {
-    command: Vec<String>,
+    command: String,
     icon_path: Option<String>,
     alias: String,
     alias_lc: String,