From 725fd1ebdfded2f86303e71f6d5083d6b76ca997 Mon Sep 17 00:00:00 2001
From: unitwk <unitwk@outlook.com>
Date: Tue, 6 Feb 2024 20:55:10 +0800
Subject: [PATCH] Feat: 7zip test

---
 daemon/src/common/compress.ts | 17 ++++++++++-------
 frontend/components.d.ts      |  1 -
 package-lock.json             |  8 +-------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/daemon/src/common/compress.ts b/daemon/src/common/compress.ts
index eea8f097..342d04fd 100755
--- a/daemon/src/common/compress.ts
+++ b/daemon/src/common/compress.ts
@@ -114,14 +114,15 @@ async function useZip(distZip: string, files: string[]): Promise<boolean> {
 }
 
 async function use7zipCompress(zipPath: string, files: string[]): Promise<boolean> {
-  const cmd = `7z.exe a ${zipPath} ${files.join(" ")}`.split(" ");
+  const cmd = ["7z.exe", "a", "-aoa", zipPath, ...files];
   console.log($t("TXT_CODE_common._7zip"), `${cmd.join(" ")}`);
   return new Promise((resolve, reject) => {
-    const p = cmd.splice(1);
-    const subProcess = child_process.spawn(cmd[0], [...p], {
-      cwd: path.normalize(path.join(process.cwd(), "7zip")),
+    const subProcess = child_process.spawn(cmd[0], cmd.splice(1), {
+      cwd: path.normalize(path.join(process.cwd(), "lib")),
       stdio: "pipe"
     });
+    subProcess.stdout.on("data", (text) => {});
+    subProcess.stderr.on("data", (text) => {});
     if (!subProcess || !subProcess.pid) return reject(new Error(COMPRESS_ERROR_MSG.startErr));
     subProcess.on("exit", (code) => {
       if (code) return reject(new Error(COMPRESS_ERROR_MSG.exitErr));
@@ -133,13 +134,15 @@ async function use7zipCompress(zipPath: string, files: string[]): Promise<boolea
 
 // ./7z.exe x archive.zip -oD:\7-Zip
 async function use7zipDecompress(sourceZip: string, destDir: string): Promise<boolean> {
-  const cmd = `7z.exe x ${sourceZip} -o${destDir}`.split(" ");
+  const cmd = [`7z.exe`, `x`, "-aoa", sourceZip, `-o${destDir}`];
   console.log($t("TXT_CODE_common._7unzip"), `${cmd.join(" ")}`);
   return new Promise((resolve, reject) => {
-    const subProcess = child_process.spawn(cmd[0], [cmd[1], cmd[2], cmd[3]], {
-      cwd: path.normalize(path.join(process.cwd(), "7zip")),
+    const subProcess = child_process.spawn(cmd[0], cmd.splice(1), {
+      cwd: path.normalize(path.join(process.cwd(), "lib")),
       stdio: "pipe"
     });
+    subProcess.stdout.on("data", (text) => {});
+    subProcess.stderr.on("data", (text) => {});
     if (!subProcess || !subProcess.pid) return reject(new Error(COMPRESS_ERROR_MSG.startErr));
     subProcess.on("exit", (code) => {
       if (code) return reject(new Error(COMPRESS_ERROR_MSG.exitErr));
diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index bfa64432..93e280be 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -65,7 +65,6 @@ declare module 'vue' {
     ATypographyTitle: typeof import('ant-design-vue/es')['TypographyTitle']
     AUpload: typeof import('ant-design-vue/es')['Upload']
     BetweenMenus: typeof import('./src/components/BetweenMenus.vue')['default']
-    BgWrap: typeof import('./src/components/BgWrap.vue')['default']
     CardError: typeof import('./src/components/CardError.vue')['default']
     CardOperator: typeof import('./src/components/CardOperator.vue')['default']
     CardPanel: typeof import('./src/components/CardPanel.vue')['default']
diff --git a/package-lock.json b/package-lock.json
index db741d0d..940e9856 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,8 +9,7 @@
       "version": "1.0.0",
       "dependencies": {
         "crc": "^4.3.2",
-        "i18next-scanner": "^4.4.0",
-        "wavesurfer.js": "^7.6.4"
+        "i18next-scanner": "^4.4.0"
       }
     },
     "node_modules/@babel/runtime": {
@@ -903,11 +902,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/wavesurfer.js": {
-      "version": "7.6.4",
-      "resolved": "https://registry.npmjs.org/wavesurfer.js/-/wavesurfer.js-7.6.4.tgz",
-      "integrity": "sha512-ZpGOHzFeShTD02OoXNSoo9hfHM7awPckNjlRuCbLb9eKcHTJB8tEE+REkNOwJKJ46uo0cT7VeRbMlVvKgzUV/w=="
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",