✨ Feature: add local plugin support && npm registry/proxy support

2025-01-23 06:38:13 -05:00 · 2021-04-04 17:52:50 +08:00 · 2021-04-04 17:52:50 +08:00 · f0e1fa12d7
commit f0e1fa12d7
parent 3cad5f378d
5 changed files with 168 additions and 97 deletions
--- a/package.json
+++ b/package.json
@ -42,7 +42,7 @@
    "keycode": "^2.2.0",
    "lodash-id": "^0.14.0",
    "lowdb": "^1.0.0",
-    "picgo": "^1.4.18",
+    "picgo": "^1.4.19",
    "qrcode.vue": "^1.7.0",
    "vue": "^2.6.10",
    "vue-gallery": "^2.0.1",
--- a/src/main/events/picgoCoreIPC.ts
+++ b/src/main/events/picgoCoreIPC.ts
@ -9,10 +9,13 @@ import {
 } from 'electron'
 import PicGoCore from '~/universal/types/picgo'
 import { IPicGoHelperType } from '#/types/enum'
-import shortKeyHandler from '../apis/app/shortKey/shortKeyHandler'
+import shortKeyHandler from 'apis/app/shortKey/shortKeyHandler'
 import picgo from '@core/picgo'
 import { handleStreamlinePluginName } from '~/universal/utils/common'
 import { IGuiMenuItem } from 'picgo/dist/src/types'
+import windowManager from 'apis/app/window/windowManager'
+import { IWindowList } from 'apis/app/window/constants'
+import { showNotification } from '~/main/utils/common'

 // eslint-disable-next-line
 const requireFunc = typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require
@ -58,8 +61,7 @@ const handleConfigWithFunction = (config: any[]) => {
  return config
 }

-const handleGetPluginList = () => {
-  ipcMain.on('getPluginList', (event: IpcMainEvent) => {
+const getPluginList = (): IPicGoPlugin[] => {
  const pluginList = picgo.pluginLoader.getFullList()
  const list = []
  for (let i in pluginList) {
@ -108,62 +110,52 @@ const handleGetPluginList = () => {
    }
    list.push(obj)
  }
+  return list
+}
+
+const handleGetPluginList = () => {
+  ipcMain.on('getPluginList', (event: IpcMainEvent) => {
+    const list = getPluginList()
    event.sender.send('pluginList', list)
-    picgo.cmd.program.removeAllListeners()
  })
 }

 const handlePluginInstall = () => {
  ipcMain.on('installPlugin', async (event: IpcMainEvent, msg: string) => {
    const dispose = handleNPMError()
-    picgo.once('installSuccess', (notice: PicGoNotice) => {
-      event.sender.send('installSuccess', notice.body[0])
-      shortKeyHandler.registerPluginShortKey(notice.body[0])
-      picgo.removeAllListeners('installFailed')
+    const res = await picgo.pluginHandler.install([msg])
+    if (res.success) {
+      event.sender.send('installSuccess', res.body[0])
+      shortKeyHandler.registerPluginShortKey(res.body[0])
+    }
+    event.sender.send('hideLoading')
    dispose()
  })
-    picgo.once('installFailed', () => {
-      picgo.removeAllListeners('installSuccess')
-      dispose()
-    })
-    await picgo.pluginHandler.install([msg])
-    picgo.cmd.program.removeAllListeners()
-  })
 }

 const handlePluginUninstall = () => {
  ipcMain.on('uninstallPlugin', async (event: IpcMainEvent, msg: string) => {
    const dispose = handleNPMError()
-    picgo.once('uninstallSuccess', (notice: PicGoNotice) => {
-      event.sender.send('uninstallSuccess', notice.body[0])
-      shortKeyHandler.unregisterPluginShortKey(notice.body[0])
-      picgo.removeAllListeners('uninstallFailed')
+    const res = await picgo.pluginHandler.uninstall([msg])
+    if (res.success) {
+      event.sender.send('uninstallSuccess', res.body[0])
+      shortKeyHandler.unregisterPluginShortKey(res.body[0])
+    }
+    event.sender.send('hideLoading')
    dispose()
  })
-    picgo.once('uninstallFailed', () => {
-      picgo.removeAllListeners('uninstallSuccess')
-      dispose()
-    })
-    await picgo.pluginHandler.uninstall([msg])
-    picgo.cmd.program.removeAllListeners()
-  })
 }

 const handlePluginUpdate = () => {
  ipcMain.on('updatePlugin', async (event: IpcMainEvent, msg: string) => {
    const dispose = handleNPMError()
-    picgo.once('updateSuccess', (notice: { body: string[], title: string }) => {
-      event.sender.send('updateSuccess', notice.body[0])
-      picgo.removeAllListeners('updateFailed')
+    const res = await picgo.pluginHandler.update([msg])
+    if (res.success) {
+      event.sender.send('updateSuccess', res.body[0])
+    }
+    event.sender.send('hideLoading')
    dispose()
  })
-    picgo.once('updateFailed', () => {
-      picgo.removeAllListeners('updateSuccess')
-      dispose()
-    })
-    await picgo.pluginHandler.update([msg])
-    picgo.cmd.program.removeAllListeners()
-  })
 }

 const handleNPMError = (): IDispose => {
@ -193,7 +185,6 @@ const handleGetPicBedConfig = () => {
    } else {
      event.sender.send('getPicBedConfig', [], name)
    }
-    picgo.cmd.program.removeAllListeners()
  })
 }

@ -227,6 +218,33 @@ const handlePicGoSaveData = () => {
  })
 }

+const handleImportLocalPlugin = () => {
+  ipcMain.on('importLocalPlugin', (event: IpcMainEvent) => {
+    const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW)!
+    dialog.showOpenDialog(settingWindow, {
+      properties: ['openDirectory']
+    }, async (filePath: string[]) => {
+      if (filePath.length > 0) {
+        const res = await picgo.pluginHandler.install(filePath)
+        if (res.success) {
+          const list = getPluginList()
+          event.sender.send('pluginList', list)
+          showNotification({
+            title: '导入插件成功',
+            body: ''
+          })
+        } else {
+          showNotification({
+            title: '导入插件失败',
+            body: res.body as string
+          })
+        }
+      }
+      event.sender.send('hideLoading')
+    })
+  })
+}
+
 export default {
  listen () {
    handleGetPluginList()
@ -237,5 +255,6 @@ export default {
    handlePluginActions()
    handleRemoveFiles()
    handlePicGoSaveData()
+    handleImportLocalPlugin()
  }
 }
--- a/src/renderer/pages/PicGoSetting.vue
+++ b/src/renderer/pages/PicGoSetting.vue
@ -32,7 +32,7 @@
            <el-button type="primary" round size="mini" @click="customLinkVisible = true">点击设置</el-button>
          </el-form-item>
          <el-form-item
-            label="设置代理"
+            label="设置代理和镜像地址"
          >
            <el-button type="primary" round size="mini" @click="proxyVisible = true">点击设置</el-button>
          </el-form-item>
@ -183,19 +183,20 @@
      </span>
    </el-dialog>
    <el-dialog
-      title="设置代理"
+      title="设置代理和镜像地址"
      :visible.sync="proxyVisible"
      :modal-append-to-body="false"
+      width="70%"
    >
      <el-form
        label-position="right"
        :model="customLink"
        ref="customLink"
        :rules="rules"
-        label-width="80px"
+        label-width="120px"
      >
        <el-form-item
-          label="代理地址"
+          label="上传代理"
        >
          <el-input
            v-model="proxy"
@ -203,6 +204,24 @@
            placeholder="例如：http://127.0.0.1:1080"
          ></el-input>
        </el-form-item>
+        <el-form-item
+          label="插件安装代理"
+        >
+          <el-input
+            v-model="npmProxy"
+            :autofocus="true"
+            placeholder="例如：http://127.0.0.1:1080"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="插件镜像地址"
+        >
+          <el-input
+            v-model="npmRegistry"
+            :autofocus="true"
+            placeholder="例如：https://registry.npm.taobao.org/"
+          ></el-input>
+        </el-form-item>
      </el-form>
      <span slot="footer">
        <el-button @click="cancelProxy" round>取消</el-button>
@ -375,6 +394,8 @@ export default class extends Vue {
    upload: db.get('settings.shortKey.upload')
  }
  proxy = db.get('picBed.proxy') || ''
+  npmRegistry = db.get('settings.registry') || ''
+  npmProxy = db.get('settings.proxy') || ''
  rules = {
    value: [
      { validator: customLinkRule, trigger: 'blur' }
@ -452,7 +473,9 @@ export default class extends Vue {
  confirmProxy () {
    this.proxyVisible = false
    this.letPicGoSaveData({
-      'picBed.proxy': this.proxy
+      'picBed.proxy': this.proxy,
+      'settings.proxy': this.npmProxy,
+      'settings.registry': this.npmRegistry
    })
    const successNotification = new Notification('设置代理', {
      body: '设置成功'
--- a/src/renderer/pages/Plugin.vue
+++ b/src/renderer/pages/Plugin.vue
@ -1,7 +1,13 @@
 <template>
  <div id="plugin-view">
    <div class="view-title">
-      插件设置 - <i class="el-icon-goods" @click="goAwesomeList"></i>
+      插件设置 -
+      <el-tooltip :content="pluginListToolTip" placement="right">
+        <i class="el-icon-goods" @click="goAwesomeList"></i>
+      </el-tooltip>
+      <el-tooltip :content="importLocalPluginToolTip" placement="left">
+        <i class="el-icon-download" @click="handleImportLocalPlugin"/>
+      </el-tooltip>
    </div>
    <el-row class="handle-bar" :class="{ 'cut-width': pluginList.length > 6 }">
      <el-input
@ -126,6 +132,8 @@ export default class extends Vue {
  pluginNameList: string[] = []
  loading = true
  needReload = false
+  pluginListToolTip = '插件列表'
+  importLocalPluginToolTip = '导入本地插件'
  id = ''
  os = ''
  defaultLogo: string = 'this.src="https://cdn.jsdelivr.net/gh/Molunerfinn/PicGo@dev/public/roundLogo.png"'
@ -158,6 +166,9 @@ export default class extends Vue {
  }
  created () {
    this.os = process.platform
+    ipcRenderer.on('hideLoading', () => {
+      this.loading = false
+    })
    ipcRenderer.on('pluginList', (evt: IpcRendererEvent, list: IPicGoPlugin[]) => {
      this.pluginList = list
      this.pluginNameList = list.map(item => item.fullName)
@ -319,6 +330,7 @@ export default class extends Vue {
        item.ing = true
      }
    })
+    this.loading = true
    ipcRenderer.send('uninstallPlugin', val)
  }
  updatePlugin (val: string) {
@ -327,6 +339,7 @@ export default class extends Vue {
        item.ing = true
      }
    })
+    this.loading = true
    ipcRenderer.send('updatePlugin', val)
  }
  reloadApp () {
@ -460,11 +473,16 @@ export default class extends Vue {
  letPicGoSaveData (data: IObj) {
    ipcRenderer.send('picgoSaveData', data)
  }
+  handleImportLocalPlugin () {
+    ipcRenderer.send('importLocalPlugin')
+    this.loading = true
+  }
  beforeDestroy () {
    ipcRenderer.removeAllListeners('pluginList')
    ipcRenderer.removeAllListeners('installSuccess')
    ipcRenderer.removeAllListeners('uninstallSuccess')
    ipcRenderer.removeAllListeners('updateSuccess')
+    ipcRenderer.removeAllListeners('hideLoading')
  }
 }
 </script>
@ -494,6 +512,7 @@ $darwinBg = #172426
    font-size 20px
    text-align center
    margin 10px auto
+    position relative
    i.el-icon-goods
      font-size 20px
      vertical-align middle
@ -501,6 +520,16 @@ $darwinBg = #172426
      transition color .2s ease-in-out
      &:hover
        color #49B1F5
+    i.el-icon-download
+      position absolute
+      right 0
+      top 8px
+      font-size 20px
+      vertical-align middle
+      cursor pointer
+      transition color .2s ease-in-out
+      &:hover
+        color #49B1F5
  .handle-bar
    margin-bottom 20px
    &.cut-width
--- a/yarn.lock
+++ b/yarn.lock
@ -8289,10 +8289,10 @@ performance-now@^2.1.0:
  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=

-picgo@^1.4.18:
-  version "1.4.18"
-  resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.4.18.tgz#5c8582c1b6b87e734ffc8596da6c5a1712cff0b0"
-  integrity sha512-wUU76goKS5N5yjBKX9MszBcno1f0hTa+EdnuDknqLljtHe3ieBVZDbnu5IrYyqMge2u+tG8qx7G+PWvNjCPCHQ==
+picgo@^1.4.19:
+  version "1.4.19"
+  resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.4.19.tgz#cbd4b39f1d1a2a5f231e62a7fdbf87f53298f2a8"
+  integrity sha512-Y1BUrwq9rzEDQ06ZV5ZR8WRZqQe5hAHNVs4F/nEtwWBfr2YFwPxdce0b/rEPMZDSM7dfCWrts2M1qZC8VxB2+g==
  dependencies:
    chalk "^2.4.1"
    commander "^2.17.0"