fix: in ui Run, avoid subshell execution

This may solve a problem on windows with the `--data` argument and quoting. It also avoids a powershell/sh/bash choice.

Signed-off-by: Nick Mitchell <[email protected]>

Author: starpit

pdl-live-react/src-tauri/src/cli/run.rs

@@ -1,22 +1,27 @@
+use ::file_diff::diff;
+use ::std::fs::{copy, create_dir_all};
+use ::std::path::PathBuf;
 use duct::cmd;
-use file_diff::diff;
-use std::fs::{copy, create_dir_all};
 
 use tauri::path::BaseDirectory;
 use tauri::Manager;
 
 #[cfg(desktop)]
-fn pip_install_if_needed(app_handle: tauri::AppHandle) -> Result<String, tauri::Error> {
+fn pip_install_if_needed(app_handle: tauri::AppHandle) -> Result<PathBuf, tauri::Error> {
     let cache_path = app_handle.path().cache_dir()?.join("pdl");
 
     create_dir_all(&cache_path)?;
     let venv_path = cache_path.join("interpreter-python");
-    let activate_path0 = if cfg!(windows) {
+    let activate_path = if cfg!(windows) {
         venv_path.join("Scripts").join("Activate.ps1")
     } else {
         venv_path.join("bin/activate")
     };
-    let activate_path = activate_path0.into_os_string().into_string().unwrap();
+    let activate_path_str = activate_path
+        .clone()
+        .into_os_string()
+        .into_string()
+        .unwrap();
     let cached_requirements_path = venv_path
         .join("requirements.txt")
         .into_os_string()
@@ -54,13 +59,13 @@ fn pip_install_if_needed(app_handle: tauri::AppHandle) -> Result<String, tauri::
             if cfg!(windows) {
                 format!(
                     "{activate} ; pip install -r '{requirements}'",
-                    activate = activate_path,
+                    activate = activate_path_str,
                     requirements = requirements_path
                 )
             } else {
                 format!(
                     "source '{activate}' && pip install -r '{requirements}'",
-                    activate = activate_path,
+                    activate = activate_path_str,
                     requirements = requirements_path
                 )
             }
@@ -76,13 +81,13 @@ fn pip_install_if_needed(app_handle: tauri::AppHandle) -> Result<String, tauri::
             if cfg!(windows) {
                 format!(
                     "{activate} ; pip install -r '{requirements}'",
-                    activate = activate_path,
+                    activate = activate_path_str,
                     requirements = requirements_path
                 )
             } else {
                 format!(
                     "source '{activate}' && pip install -r '{requirements}'",
-                    activate = activate_path,
+                    activate = activate_path_str,
                     requirements = requirements_path
                 )
             }
@@ -93,7 +98,10 @@ fn pip_install_if_needed(app_handle: tauri::AppHandle) -> Result<String, tauri::
         copy(requirements_path, cached_requirements_path)?;
     }
 
-    Ok(activate_path)
+    match activate_path.parent() {
+        Some(parent) => Ok(parent.to_path_buf()),
+        _ => Err(tauri::Error::UnknownPath),
+    }
 }
 
 #[cfg(desktop)]
@@ -105,10 +113,10 @@ pub fn run_pdl_program(
     stream: Option<&tauri_plugin_cli::ArgData>,
 ) -> Result<(), tauri::Error> {
     println!("Running {:?}", source_file_path);
-    let activate = pip_install_if_needed(app_handle)?;
+    let bin_path = pip_install_if_needed(app_handle)?;
     let trace_arg = if let Some(arg) = trace_file {
         if let serde_json::Value::String(f) = &arg.value {
-            "--trace ".to_owned() + f
+            "--trace=".to_owned() + f
         } else {
             "".to_owned()
         }
@@ -118,7 +126,7 @@ pub fn run_pdl_program(
 
     let data_arg = if let Some(arg) = data {
         if let serde_json::Value::String(s) = &arg.value {
-            format!("--data '{}'", s)
+            format!("--data={}", s)
         } else {
             "".to_owned()
         }
@@ -128,33 +136,22 @@ pub fn run_pdl_program(
 
     let stream_arg = if let Some(arg) = stream {
         if let serde_json::Value::String(s) = &arg.value {
-            "--stream ".to_owned() + s
+            "--stream=".to_owned() + s
         } else {
             "".to_owned()
         }
     } else {
         "".to_owned()
     };
 
-    cmd!(
-        if cfg!(windows) { "powershell" } else { "sh" },
-        if cfg!(windows) {
-            "invoke-expression"
-        } else {
-            "-c"
-        },
-        &[
-            if cfg!(windows) { "" } else { "source" },
-            activate.as_str(),
-            "; pdl",
-            trace_arg.as_str(),
-            data_arg.as_str(),
-            stream_arg.as_str(),
-            source_file_path.as_str(),
-        ]
-        .join(" "),
-    )
-    .run()?;
+    let mut args = vec![
+        source_file_path.as_str(),
+        trace_arg.as_str(),
+        data_arg.as_str(),
+        stream_arg.as_str(),
+    ];
+    args.retain(|x| x.chars().count() > 0);
+    cmd(bin_path.join("pdl"), &args).run()?;
 
     Ok(())
 }