fix (core): 修复 execute_home 为空导致进入空目录

Author: qianmoQ

src-tauri/src/main.rs

@@ -64,7 +64,7 @@ async fn execute_code(
     let start_time = std::time::Instant::now();
     let mut _last_error: String = String::new();
 
-    let cmd = plugin.get_command();
+    let cmd = plugin.get_command(None);
     let args = plugin.get_execute_args(file_path.to_str().unwrap());
     info!(
         "执行代码 -> 调用插件 [ {} ] 执行命令 {} 携带参数 {}",
@@ -74,7 +74,7 @@ async fn execute_code(
     );
 
     let output = Command::new(&cmd)
-        .args(&args)
+        .args(args)
         .stdout(Stdio::piped())
         .stderr(Stdio::piped())
         .output();
@@ -142,7 +142,9 @@ async fn execute_code(
             request.language,
             request.language,
             _last_error,
-            plugin.get_command().to_string()
+            plugin
+                .get_command(Some(file_path.to_str().unwrap()))
+                .to_string()
         ),
         execution_time,
         timestamp,
@@ -172,7 +174,7 @@ async fn get_info(
         format!("Pre-execution hook failed: {}", e)
     })?;
 
-    let cmd = plugin.get_command();
+    let cmd = plugin.get_command(None);
     debug!("获取环境 -> 插件 [ {} ] 命令 {}", language, cmd);
 
     let version_output = Command::new(&cmd).args(plugin.get_version_args()).output();
@@ -211,7 +213,7 @@ async fn get_info(
     Ok(LanguageInfo {
         installed: false,
         version: "Not found".to_string(),
-        path: format!("Not found - tried: {:?}", plugin.get_command()),
+        path: format!("Not found - tried: {:?}", plugin.get_command(None)),
         language: plugin.get_language_name().to_string(),
     })
 }

src-tauri/src/plugins/manager.rs

@@ -54,7 +54,7 @@ impl PluginManager {
         self.get_plugin(language).map(|plugin| PluginInfo {
             name: plugin.get_language_name().to_string(),
             file_extension: plugin.get_file_extension(),
-            available_commands: vec![plugin.get_command().to_string()],
+            available_commands: vec![plugin.get_command(None).to_string()],
         })
     }
 
@@ -65,7 +65,7 @@ impl PluginManager {
             .map(|plugin| PluginInfo {
                 name: plugin.get_language_name().to_string(),
                 file_extension: plugin.get_file_extension(),
-                available_commands: vec![plugin.get_command().to_string()],
+                available_commands: vec![plugin.get_command(None).to_string()],
             })
             .collect()
     }

src-tauri/src/plugins/mod.rs

@@ -63,18 +63,23 @@ pub trait LanguagePlugin: Send + Sync {
     fn get_execute_home(&self) -> Option<PathBuf> {
         self.get_config()
             .and_then(|config| config.execute_home.clone())
+            .filter(|path| !path.trim().is_empty()) // 过滤掉空字符串和只有空白字符的字符串
             .map(PathBuf::from)
     }
 
     // 获取插件支持的命令
-    fn get_command(&self) -> String {
+    fn get_command(&self, file_path: Option<&str>) -> String {
         if let Some(config) = self.get_config() {
             if let Some(run_cmd) = &config.run_command {
-                return run_cmd
-                    .split_whitespace()
-                    .next()
-                    .unwrap_or(&config.language)
-                    .to_string();
+                if let Some(path) = file_path {
+                    return run_cmd.replace("$filename", path);
+                } else {
+                    return run_cmd
+                        .split_whitespace()
+                        .next()
+                        .unwrap_or(&config.language)
+                        .to_string();
+                }
             }
         }
         self.get_default_command()
@@ -120,7 +125,23 @@ pub trait LanguagePlugin: Send + Sync {
     }
 
     fn get_version_args(&self) -> Vec<&'static str>;
-    fn get_execute_args(&self, file_path: &str) -> Vec<String>;
+
+    fn get_execute_args(&self, file_path: &str) -> Vec<String> {
+        if let Some(config) = self.get_config() {
+            if let Some(run_cmd) = &config.run_command {
+                // 替换 $filename 后分割，跳过第一个元素（命令本身）
+                let full_cmd = run_cmd.replace("$filename", file_path);
+                return full_cmd
+                    .split_whitespace()
+                    .skip(1) // 跳过命令部分，只返回参数
+                    .map(|s| s.to_string())
+                    .collect();
+            }
+        }
+        // 默认情况下，文件路径就是唯一的参数
+        vec![file_path.to_string()]
+    }
+
     fn get_path_command(&self) -> String;
 
     // 构建默认配置

src-tauri/src/plugins/python2.rs

@@ -20,10 +20,6 @@ impl LanguagePlugin for Python2Plugin {
         vec!["--version"]
     }
 
-    fn get_execute_args(&self, file_path: &str) -> Vec<String> {
-        vec![file_path.to_string()]
-    }
-
     fn get_path_command(&self) -> String {
         "import sys; print(sys.executable)".to_string()
     }

src-tauri/src/plugins/python3.rs

@@ -19,10 +19,6 @@ impl LanguagePlugin for Python3Plugin {
         vec!["--version"]
     }
 
-    fn get_execute_args(&self, file_path: &str) -> Vec<String> {
-        vec![file_path.to_string()]
-    }
-
     fn get_path_command(&self) -> String {
         "import sys; print(sys.executable)".to_string()
     }