Merge pull request #30 from Jeamee/feat/cmd-arg-support

Feat/cmd arg support
Jeamee · Dec 28, 2024 · 6efdbfd · 6efdbfd
2 parents cd4b89e + 94112bf
commit 6efdbfd
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mcphub-desktop",
   "private": true,
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mcphub-desktop"
-version = "0.1.0"
+version = "0.2.1"
 description = "A Tauri App"
 authors = ["you"]
 edition = "2021"
@@ -27,6 +27,7 @@ log = "0.4.22"
 glob = "0.3.1"
 home = "0.5.9"
 anyhow = "1.0.93"
+shell-escape = "0.1.5"
 tempfile = "3.8.1"
 xshell = "0.2.7"
 reqwest = { version = "0.11", features = ["blocking", "json"] }

diff --git a/src-tauri/src/api/servers/core.rs b/src-tauri/src/api/servers/core.rs
@@ -1,9 +1,11 @@
 use crate::utils::os::get_home;
+use std::borrow::Cow;
 use crate::APP_STATE_FILENAME;
 use log::{debug, error};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use tauri_plugin_store::StoreExt;
+use shell_escape::escape;
 
 #[derive(Debug, Serialize, Deserialize)]
 struct BaseServer {
@@ -246,7 +248,7 @@ pub async fn install_server_function(
     let env = env.unwrap_or_else(|| server.command_info.env.clone());
     if input_arg.is_some() {
         input_arg_config.value = input_arg.unwrap();
-        arg_configs = format!("{} {}", arg_configs, input_arg_config.value.join(" "));
+        arg_configs = format!("{} {}", arg_configs, escape(Cow::from(input_arg_config.value.join(" "))));
     }
 
     let mut config = ClientConfig::load();

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "mcphub-desktop",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "identifier": "com.mcphub-desktop.app",
   "build": {
     "beforeDevCommand": "pnpm dev",

diff --git a/src/components/ConfigModal.tsx b/src/components/ConfigModal.tsx
@@ -59,6 +59,8 @@ export function ConfigModal({ isOpen, onClose, env, guide, inputArg, onSave }: C
         onSave(config, argValues)
         onClose()
     }
+    console.log(argValues)
+    console.log(inputArg)
 
     return (
         <Dialog open={isOpen} onOpenChange={onClose}>
@@ -113,7 +115,7 @@ export function ConfigModal({ isOpen, onClose, env, guide, inputArg, onSave }: C
                                             {inputArg.name}
                                         </Label>
 
-                                        {argValues.map((value, index) => (
+                                        {(argValues.length > 0 ? argValues : [""]).map((value, index) => (
                                             <div key={index} className="flex gap-2">
                                                 {inputArg.class === "Text" ? (
                                                     <Input