优化：命令行解析优化

modstart-lib · Dec 16, 2024 · 617cfde · 617cfde
1 parent 3eb40b4
commit 617cfde
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 29 deletions.
diff --git a/electron/lib/util.ts b/electron/lib/util.ts
@@ -265,6 +265,52 @@ export const MemoryCacheUtil = {
 export const ShellUtil = {
     quotaPath(p: string) {
         return `"${p}"`
+    },
+    parseCommandArgs(command: string) {
+        let args = []
+        let arg = ''
+        let quote = ''
+        let escape = false
+        for (let i = 0; i < command.length; i++) {
+            const c = command[i]
+            if (escape) {
+                arg += c
+                escape = false
+                continue
+            }
+            if ('\\' === c) {
+                escape = true
+                arg += c
+                continue
+            }
+            if ('' === quote && (' ' === c || '\t' === c)) {
+                if (arg) {
+                    args.push(arg)
+                    arg = ''
+                }
+                continue
+            }
+            if ('' === quote && ('"' === c || "'" === c)) {
+                quote = c
+                arg += c
+                continue
+            }
+            if ('"' === quote && '"' === c) {
+                quote = ''
+                arg += c
+                continue
+            }
+            if ("'" === quote && "'" === c) {
+                quote = ''
+                arg += c
+                continue
+            }
+            arg += c
+        }
+        if (arg) {
+            args.push(arg)
+        }
+        return args
     }
 }
 

diff --git a/electron/mapi/app/index.ts b/electron/mapi/app/index.ts
@@ -4,38 +4,11 @@ import {exec as _exec, spawn} from "node:child_process";
 import {isLinux, isMac, isWin, platformArch, platformName, platformUUID, platformVersion} from "../../lib/env";
 import {Log} from "../log/index";
 import iconv from "iconv-lite";
-import {StrUtil} from "../../lib/util";
+import {ShellUtil, StrUtil} from "../../lib/util";
 import {AppConfig} from "../../../src/config";
 
 const exec = util.promisify(_exec)
 
-const commandSplit = (command: string) => {
-    // split command with space, but ignore space in quotes
-    const args = []
-    let arg = ''
-    let quote = ''
-    for (let i = 0; i < command.length; i++) {
-        const c = command[i]
-        if (c === ' ' && !quote) {
-            if (arg) {
-                args.push(arg)
-                arg = ''
-            }
-            continue
-        }
-        if (c === '"' || c === "'") {
-            if (quote && quote === c) {
-                quote = ''
-                continue
-            }
-            quote = c
-            continue
-        }
-        arg += c
-    }
-    return args
-}
-
 const outputStringConvert = (outputEncoding: 'utf8' | 'cp936', data: any) => {
     if (!data) {
         return ''
@@ -90,7 +63,7 @@ const spawnShell = async (command: string | string[], option: {
         commandEntry = command[0]
         args = command.slice(1)
     } else {
-        args = commandSplit(command)
+        args = ShellUtil.parseCommandArgs(command)
         commandEntry = args.shift() as string
     }
     Log.info('App.spawnShell', {