optimize: 优化 getSystemPlatform 方法

docmirror · Nov 28, 2024 · 13741d3 · 13741d3
1 parent 81c1433
commit 13741d3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/packages/core/src/shell/shell.js b/packages/core/src/shell/shell.js
@@ -93,20 +93,19 @@ function childExec (composeCmds, options = {}) {
 }
 
 function getSystemShell () {
-  switch (getSystemPlatform()) {
+  switch (getSystemPlatform(true)) {
     case 'mac':
       return DarwinSystemShell
     case 'linux':
       return LinuxSystemShell
     case 'windows':
       return WindowsSystemShell
-    case 'unknown os':
     default:
       throw new Error(`UNKNOWN OS TYPE ${os.platform()}`)
   }
 }
 
-function getSystemPlatform () {
+function getSystemPlatform (throwIfUnknown = false) {
   switch (os.platform()) {
     case 'darwin':
       return 'mac'
@@ -116,14 +115,18 @@ function getSystemPlatform () {
       return 'windows'
     case 'win64':
       return 'windows'
-    case 'unknown os':
     default:
-      throw new Error(`UNKNOWN OS TYPE ${os.platform()}`)
+      log.error(`UNKNOWN OS TYPE: ${os.platform()}`)
+      if (throwIfUnknown) {
+        throw new Error(`UNKNOWN OS TYPE '${os.platform()}'`)
+      } else {
+        return 'unknown-os'
+      }
   }
 }
 
 async function execute (executor, args) {
-  return executor[getSystemPlatform()](getSystemShell().exec, args)
+  return executor[getSystemPlatform(true)](getSystemShell().exec, args)
 }
 
 async function execFile (file, args, options) {

diff --git a/packages/gui/src/bridge/api/backend.js b/packages/gui/src/bridge/api/backend.js
@@ -30,7 +30,7 @@ const getDateTimeStr = function () {
 const localApi = {
   /**
    * 返回所有api列表，供vue来ipc调用
-   * @returns {[]}
+   * @returns {[]} api列表
    */
   getApiList () {
     const core = lodash.cloneDeep(DevSidecar.api)
@@ -50,8 +50,8 @@ const localApi = {
     getConfigDir () {
       return getDefaultConfigBasePath()
     },
-    getSystemPlatform () {
-      return DevSidecar.api.shell.getSystemPlatform()
+    getSystemPlatform (throwIfUnknown = false) {
+      return DevSidecar.api.shell.getSystemPlatform(throwIfUnknown)
     },
   },
   /**

diff --git a/packages/gui/src/bridge/auto-start/backend.js b/packages/gui/src/bridge/auto-start/backend.js
@@ -26,9 +26,7 @@ EOF
 }
 export default {
   install (context) {
-    const { ipcMain, dialog, log, app } = context
-
-    const ex = app.getPath('exe')
+    const { ipcMain, app } = context
 
     // 定义事件，渲染进程中直接使用
 

diff --git a/packages/gui/src/utils/util.apppath.js b/packages/gui/src/utils/util.apppath.js
@@ -1,7 +1,8 @@
 import os from 'node:os'
 import path from 'node:path'
+import log from './util.log'
 
-function getSystemPlatform () {
+function getSystemPlatform (throwIfUnknown = false) {
   switch (os.platform()) {
     case 'darwin':
       return 'mac'
@@ -11,11 +12,16 @@ function getSystemPlatform () {
       return 'windows'
     case 'win64':
       return 'windows'
-    case 'unknown os':
     default:
-      throw new Error(`UNKNOWN OS TYPE ${os.platform()}`)
+      log.error(`UNKNOWN OS TYPE: ${os.platform()}`)
+      if (throwIfUnknown) {
+        throw new Error(`UNKNOWN OS TYPE ${os.platform()}`)
+      } else {
+        return 'unknown-os'
+      }
   }
 }
+
 export default {
   getAppRootPath (app) {
     const exePath = app.getPath('exe')

diff --git a/packages/gui/src/view/components/setup-ca.vue b/packages/gui/src/view/components/setup-ca.vue
@@ -30,8 +30,7 @@ export default {
     },
   },
   async created () {
-    const platform = await this.$api.info.getSystemPlatform()
-    this.systemPlatform = platform
+    this.systemPlatform = await this.$api.info.getSystemPlatform()
   },
   methods: {
     async openExternal (url) {