🎉 Release: v2.3.0-beta.5

Co-authored-by: jiawei <jiawei@parim.net>

.github/workflows/main.yml

@@ -0,0 +1,55 @@
+# main.yml
+
+# Workflow's name
+name: Build
+
+# Workflow's trigger
+on:
+  push:
+    branches:
+      - master
+
+# Workflow's jobs
+jobs:
+  # job's id
+  release:
+    # job's name
+    name: build and release electron app
+
+    # the type of machine to run the job on
+    runs-on: ${{ matrix.os }}
+
+    # create a build matrix for jobs
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-10.15]
+
+    # create steps
+    steps:
+      # step1: check out repository
+      - name: Check out git repository
+        uses: actions/checkout@v2
+
+      # step2: install node env
+      - name: Install Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+
+      - name: Install system deps
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils
+
+      # step3: yarn
+      - name: Yarn install
+        run: |
+          yarn
+          yarn global add xvfb-maybe
+
+      - name: Build  & release app
+        run: |
+          npm run release
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}

CHANGELOG.md

@@ -1,3 +1,23 @@
+# :tada: 2.3.0-beta.5 (2021-04-04)
+
+
+### :sparkles: Features
+
+* add local plugin support && npm registry/proxy support ([f0e1fa1](https://github.com/Molunerfinn/PicGo/commit/f0e1fa1))
+* 为Linux系统适配桌面图标栏（Tray） ([#603](https://github.com/Molunerfinn/PicGo/issues/603)) ([0fe3ade](https://github.com/Molunerfinn/PicGo/commit/0fe3ade))
+
+
+### :bug: Bug Fixes
+
+* default github placeholder ([51d80a6](https://github.com/Molunerfinn/PicGo/commit/51d80a6))
+
+
+### :package: Chore
+
+* change travis-ci -> GitHub Actions ([064f37d](https://github.com/Molunerfinn/PicGo/commit/064f37d))
+
+
+
 # :tada: 2.3.0-beta.4 (2020-12-19)
 
 

README.md

@@ -2,11 +2,11 @@
   <img src="https://raw.githubusercontent.com/Molunerfinn/test/master/picgo/New%20LOGO-150.png" alt="">
   <h1>PicGo</h1>
   <blockquote>图片上传+管理新体验 </blockquote>
-  <a href="https://github.com/feross/standard">
+  <a href="https://github.com/Molunerfinn/PicGo/actions">
     <img src="https://img.shields.io/badge/code%20style-standard-green.svg?style=flat-square" alt="">
   </a>
-  <a href="https://travis-ci.org/Molunerfinn/PicGo/builds">
-    <img src="https://img.shields.io/travis/Molunerfinn/PicGo.svg?style=flat-square" alt="">
+  <a href="https://github.com/Molunerfinn/PicGo/actions">
+    <img src="https://github.com/Molunerfinn/PicGo/workflows/Build/badge.svg" alt="">
   </a>
   <a href="https://github.com/Molunerfinn/PicGo/releases">
     <img src="https://img.shields.io/github/downloads/Molunerfinn/PicGo/total.svg?style=flat-square" alt="">

package.json

@@ -1,6 +1,6 @@
 {
   "name": "picgo",
-  "version": "2.3.0-beta.4",
+  "version": "2.3.0-beta.5",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service electron:serve",
@@ -42,7 +42,7 @@
     "keycode": "^2.2.0",
     "lodash-id": "^0.14.0",
     "lowdb": "^1.0.0",
-    "picgo": "^1.4.14",
+    "picgo": "^1.4.19",
     "qrcode.vue": "^1.7.0",
     "vue": "^2.6.10",
     "vue-gallery": "^2.0.1",

src/main/apis/app/system/index.ts

@@ -21,36 +21,158 @@ let menu: Menu | null
 let tray: Tray | null
 export function createContextMenu () {
   const picBeds = getPicBeds()
-  const submenu = picBeds.filter(item => item.visible).map(item => {
-    return {
-      label: item.name,
-      type: 'radio',
-      checked: db.get('picBed.current') === item.type,
-      click () {
-        picgo.saveConfig({
-          'picBed.current': item.type,
-          'picBed.uploader': item.type
-        })
-        if (windowManager.has(IWindowList.SETTING_WINDOW)) {
-          windowManager.get(IWindowList.SETTING_WINDOW)!.webContents.send('syncPicBed')
+  if (process.platform === 'darwin' || process.platform === 'win32') {
+    const submenu = picBeds.filter(item => item.visible).map(item => {
+      return {
+        label: item.name,
+        type: 'radio',
+        checked: db.get('picBed.current') === item.type,
+        click () {
+          picgo.saveConfig({
+            'picBed.current': item.type,
+            'picBed.uploader': item.type
+          })
+          if (windowManager.has(IWindowList.SETTING_WINDOW)) {
+            windowManager.get(IWindowList.SETTING_WINDOW)!.webContents.send('syncPicBed')
+          }
         }
       }
-    }
-  })
-  contextMenu = Menu.buildFromTemplate([
-    {
-      label: '关于',
-      click () {
-        dialog.showMessageBox({
-          title: 'PicGo',
-          message: 'PicGo',
-          detail: `Version: ${pkg.version}\nAuthor: Molunerfinn\nGithub: https://github.com/Molunerfinn/PicGo`
-        })
+    })
+    contextMenu = Menu.buildFromTemplate([
+      {
+        label: '关于',
+        click () {
+          dialog.showMessageBox({
+            title: 'PicGo',
+            message: 'PicGo',
+            detail: `Version: ${pkg.version}\nAuthor: Molunerfinn\nGithub: https://github.com/Molunerfinn/PicGo`
+          })
+        }
+      },
+      {
+        label: '打开详细窗口',
+        click () {
+          const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW)
+          settingWindow!.show()
+          settingWindow!.focus()
+          if (windowManager.has(IWindowList.MINI_WINDOW)) {
+            windowManager.get(IWindowList.MINI_WINDOW)!.hide()
+          }
+        }
+      },
+      {
+        label: '选择默认图床',
+        type: 'submenu',
+        // @ts-ignore
+        submenu
+      },
+      // @ts-ignore
+      {
+        label: '打开更新助手',
+        type: 'checkbox',
+        checked: db.get('settings.showUpdateTip'),
+        click () {
+          const value = db.get('settings.showUpdateTip')
+          db.set('settings.showUpdateTip', !value)
+        }
+      },
+      {
+        label: '重启应用',
+        click () {
+          app.relaunch()
+          app.exit(0)
+        }
+      },
+      // @ts-ignore
+      {
+        role: 'quit',
+        label: '退出'
       }
-    },
-    {
-      label: '打开详细窗口',
-      click () {
+    ])
+  } else if (process.platform === 'linux') {
+    // TODO 图床选择功能
+    // 由于在Linux难以像在Mac和Windows上那样在点击时构造ContextMenu，
+    // 暂时取消这个选单，避免引起和设置中启用的图床不一致
+
+    // TODO 重启应用功能
+    // 目前的实现无法正常工作
+
+    contextMenu = Menu.buildFromTemplate([
+      {
+        label: '打开详细窗口',
+        click () {
+          const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW)
+          settingWindow!.show()
+          settingWindow!.focus()
+          if (windowManager.has(IWindowList.MINI_WINDOW)) {
+            windowManager.get(IWindowList.MINI_WINDOW)!.hide()
+          }
+        }
+      },
+      // @ts-ignore
+      {
+        label: '打开更新助手',
+        type: 'checkbox',
+        checked: db.get('settings.showUpdateTip'),
+        click () {
+          const value = db.get('settings.showUpdateTip')
+          db.set('settings.showUpdateTip', !value)
+        }
+      },
+      {
+        label: '关于应用',
+        click () {
+          dialog.showMessageBox({
+            title: 'PicGo',
+            message: 'PicGo',
+            buttons: ['Ok'],
+            detail: `Version: ${pkg.version}\nAuthor: Molunerfinn\nGithub: https://github.com/Molunerfinn/PicGo`
+          })
+        }
+      },
+      // @ts-ignore
+      {
+        role: 'quit',
+        label: '退出'
+      }
+    ])
+  }
+}
+
+export function createTray () {
+  const menubarPic = process.platform === 'darwin' ? `${__static}/menubar.png` : `${__static}/menubar-nodarwin.png`
+  tray = new Tray(menubarPic)
+  // click事件在Mac和Windows上可以触发（在Ubuntu上无法触发，Unity不支持）
+  if (process.platform === 'darwin' || process.platform === 'win32') {
+    tray.on('right-click', () => {
+      if (windowManager.has(IWindowList.TRAY_WINDOW)) {
+        windowManager.get(IWindowList.TRAY_WINDOW)!.hide()
+      }
+      createContextMenu()
+      tray!.popUpContextMenu(contextMenu!)
+    })
+    tray.on('click', (event, bounds) => {
+      if (process.platform === 'darwin') {
+        toggleWindow(bounds)
+        setTimeout(() => {
+          let img = clipboard.readImage()
+          let obj: ImgInfo[] = []
+          if (!img.isEmpty()) {
+            // 从剪贴板来的图片默认转为png
+            // @ts-ignore
+            const imgUrl = 'data:image/png;base64,' + Buffer.from(img.toPNG(), 'binary').toString('base64')
+            obj.push({
+              width: img.getSize().width,
+              height: img.getSize().height,
+              imgUrl
+            })
+          }
+          windowManager.get(IWindowList.TRAY_WINDOW)!.webContents.send('clipboardFiles', obj)
+        }, 0)
+      } else {
+        if (windowManager.has(IWindowList.TRAY_WINDOW)) {
+          windowManager.get(IWindowList.TRAY_WINDOW)!.hide()
+        }
         const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW)
         settingWindow!.show()
         settingWindow!.focus()
@@ -58,116 +180,51 @@ export function createContextMenu () {
           windowManager.get(IWindowList.MINI_WINDOW)!.hide()
         }
       }
-    },
-    {
-      label: '选择默认图床',
-      type: 'submenu',
-      // @ts-ignore
-      submenu
-    },
-    // @ts-ignore
-    {
-      label: '打开更新助手',
-      type: 'checkbox',
-      checked: db.get('settings.showUpdateTip'),
-      click () {
-        const value = db.get('settings.showUpdateTip')
-        db.set('settings.showUpdateTip', !value)
-      }
-    },
-    {
-      label: '重启应用',
-      click () {
-        app.relaunch()
-        app.exit(0)
-      }
-    },
-    // @ts-ignore
-    {
-      role: 'quit',
-      label: '退出'
-    }
-  ])
-}
+    })
 
-export function createTray () {
-  const menubarPic = process.platform === 'darwin' ? `${__static}/menubar.png` : `${__static}/menubar-nodarwin.png`
-  tray = new Tray(menubarPic)
-  tray.on('right-click', () => {
-    if (windowManager.has(IWindowList.TRAY_WINDOW)) {
-      windowManager.get(IWindowList.TRAY_WINDOW)!.hide()
-    }
-    createContextMenu()
-    tray!.popUpContextMenu(contextMenu!)
-  })
-  tray.on('click', (event, bounds) => {
-    if (process.platform === 'darwin') {
-      toggleWindow(bounds)
-      setTimeout(() => {
-        let img = clipboard.readImage()
-        let obj: ImgInfo[] = []
-        if (!img.isEmpty()) {
-          // 从剪贴板来的图片默认转为png
-          // @ts-ignore
-          const imgUrl = 'data:image/png;base64,' + Buffer.from(img.toPNG(), 'binary').toString('base64')
-          obj.push({
-            width: img.getSize().width,
-            height: img.getSize().height,
-            imgUrl
+    tray.on('drag-enter', () => {
+      if (systemPreferences.isDarkMode()) {
+        tray!.setImage(`${__static}/upload-dark.png`)
+      } else {
+        tray!.setImage(`${__static}/upload.png`)
+      }
+    })
+
+    tray.on('drag-end', () => {
+      tray!.setImage(`${__static}/menubar.png`)
+    })
+
+    tray.on('drop-files', async (event: Event, files: string[]) => {
+      const pasteStyle = db.get('settings.pasteStyle') || 'markdown'
+      const trayWindow = windowManager.get(IWindowList.TRAY_WINDOW)!
+      const imgs = await uploader
+        .setWebContents(trayWindow.webContents)
+        .upload(files)
+      if (imgs !== false) {
+        const pasteText: string[] = []
+        for (let i = 0; i < imgs.length; i++) {
+          pasteText.push(pasteTemplate(pasteStyle, imgs[i]))
+          const notification = new Notification({
+            title: '上传成功',
+            body: imgs[i].imgUrl!,
+            icon: files[i]
           })
+          setTimeout(() => {
+            notification.show()
+          }, i * 100)
+          db.insert('uploaded', imgs[i])
         }
-        windowManager.get(IWindowList.TRAY_WINDOW)!.webContents.send('clipboardFiles', obj)
-      }, 0)
-    } else {
-      if (windowManager.has(IWindowList.TRAY_WINDOW)) {
-        windowManager.get(IWindowList.TRAY_WINDOW)!.hide()
+        handleCopyUrl(pasteText.join('\n'))
+        trayWindow.webContents.send('dragFiles', imgs)
       }
-      const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW)
-      settingWindow!.show()
-      settingWindow!.focus()
-      if (windowManager.has(IWindowList.MINI_WINDOW)) {
-        windowManager.get(IWindowList.MINI_WINDOW)!.hide()
-      }
-    }
-  })
-
-  tray.on('drag-enter', () => {
-    if (systemPreferences.isDarkMode()) {
-      tray!.setImage(`${__static}/upload-dark.png`)
-    } else {
-      tray!.setImage(`${__static}/upload.png`)
-    }
-  })
-
-  tray.on('drag-end', () => {
-    tray!.setImage(`${__static}/menubar.png`)
-  })
-
-  tray.on('drop-files', async (event: Event, files: string[]) => {
-    const pasteStyle = db.get('settings.pasteStyle') || 'markdown'
-    const trayWindow = windowManager.get(IWindowList.TRAY_WINDOW)!
-    const imgs = await uploader
-      .setWebContents(trayWindow.webContents)
-      .upload(files)
-    if (imgs !== false) {
-      const pasteText: string[] = []
-      for (let i = 0; i < imgs.length; i++) {
-        pasteText.push(pasteTemplate(pasteStyle, imgs[i]))
-        const notification = new Notification({
-          title: '上传成功',
-          body: imgs[i].imgUrl!,
-          icon: files[i]
-        })
-        setTimeout(() => {
-          notification.show()
-        }, i * 100)
-        db.insert('uploaded', imgs[i])
-      }
-      handleCopyUrl(pasteText.join('\n'))
-      trayWindow.webContents.send('dragFiles', imgs)
-    }
-  })
-  // toggleWindow()
+    })
+    // toggleWindow()
+  } else if (process.platform === 'linux') {
+  // click事件在Ubuntu上无法触发，Unity不支持（在Mac和Windows上可以触发）
+  // 需要使用 setContextMenu 设置菜单
+    createContextMenu()
+    tray!.setContextMenu(contextMenu)
+  }
 }
 
 export function createMenu () {

src/main/apis/app/uploader/index.ts

@@ -1,5 +1,4 @@
 import {
-  app,
   Notification,
   BrowserWindow,
   ipcMain,
@@ -11,9 +10,11 @@ import db from '#/datastore'
 import windowManager from 'apis/app/window/windowManager'
 import { IWindowList } from 'apis/app/window/constants'
 import util from 'util'
+import { IPicGo } from 'picgo/dist/src/types'
+import { showNotification } from '~/main/utils/common'
 
 const waitForShow = (webcontent: WebContents) => {
-  return new Promise((resolve, reject) => {
+  return new Promise<void>((resolve, reject) => {
     webcontent.on('did-finish-load', () => {
       resolve()
     })
@@ -37,6 +38,7 @@ const waitForRename = (window: BrowserWindow, id: number): Promise<string|null>
 
 class Uploader {
   private webContents: WebContents | null = null
+  private uploading: boolean = false
   constructor () {
     this.init()
   }
@@ -60,7 +62,7 @@ class Uploader {
       }
     })
     picgo.helper.beforeUploadPlugins.register('renameFn', {
-      handle: async ctx => {
+      handle: async (ctx: IPicGo) => {
         const rename = db.get('settings.rename')
         const autoRename = db.get('settings.autoRename')
         if (autoRename || rename) {
@@ -91,28 +93,44 @@ class Uploader {
   }
 
   upload (img?: IUploadOption): Promise<ImgInfo[]|false> {
-    picgo.upload(img)
-
+    if (this.uploading) {
+      showNotification({
+        title: '上传失败',
+        body: '前序上传还在继续，请稍后再试'
+      })
+      return Promise.resolve(false)
+    }
     return new Promise((resolve) => {
-      picgo.once('finished', ctx => {
-        if (ctx.output.every((item: ImgInfo) => item.imgUrl)) {
-          resolve(ctx.output)
-        } else {
+      try {
+        this.uploading = true
+        picgo.upload(img)
+        picgo.once('finished', ctx => {
+          this.uploading = false
+          if (ctx.output.every((item: ImgInfo) => item.imgUrl)) {
+            resolve(ctx.output)
+          } else {
+            resolve(false)
+          }
+          picgo.removeAllListeners('failed')
+        })
+        picgo.once('failed', (e: Error) => {
+          this.uploading = false
+          setTimeout(() => {
+            showNotification({
+              title: '上传失败',
+              body: util.format(e.stack),
+              clickToCopy: true
+            })
+          }, 500)
+          picgo.removeAllListeners('finished')
           resolve(false)
-        }
+        })
+      } catch (e) {
+        this.uploading = false
         picgo.removeAllListeners('failed')
-      })
-      picgo.once('failed', (e: Error) => {
-        setTimeout(() => {
-          const notification = new Notification({
-            title: '上传失败',
-            body: util.format(e.stack)
-          })
-          notification.show()
-        }, 500)
         picgo.removeAllListeners('finished')
-        resolve(false)
-      })
+        resolve([])
+      }
     })
   }
 }

src/main/apis/gui/index.ts

@@ -27,7 +27,7 @@ class GuiApi implements IGuiApi {
       return true
     }
     settingWindow.show()
-    return new Promise((resolve, reject) => {
+    return new Promise<void>((resolve, reject) => {
       setTimeout(() => {
         resolve()
       }, 1000) // TODO: a better way to wait page loaded.

src/main/events/picgoCoreIPC.ts

@@ -9,8 +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
@@ -56,109 +61,100 @@ const handleConfigWithFunction = (config: any[]) => {
   return config
 }
 
+const getPluginList = (): IPicGoPlugin[] => {
+  const pluginList = picgo.pluginLoader.getFullList()
+  const list = []
+  for (let i in pluginList) {
+    const plugin = picgo.pluginLoader.getPlugin(pluginList[i])!
+    const pluginPath = path.join(STORE_PATH, `/node_modules/${pluginList[i]}`)
+    const pluginPKG = requireFunc(path.join(pluginPath, 'package.json'))
+    const uploaderName = plugin.uploader || ''
+    const transformerName = plugin.transformer || ''
+    let menu: IGuiMenuItem[] = []
+    if (plugin.guiMenu) {
+      menu = plugin.guiMenu(picgo)
+    }
+    let gui = false
+    if (pluginPKG.keywords && pluginPKG.keywords.length > 0) {
+      if (pluginPKG.keywords.includes('picgo-gui-plugin')) {
+        gui = true
+      }
+    }
+    const obj: IPicGoPlugin = {
+      name: handleStreamlinePluginName(pluginList[i]),
+      fullName: pluginList[i],
+      author: pluginPKG.author.name || pluginPKG.author,
+      description: pluginPKG.description,
+      logo: 'file://' + path.join(pluginPath, 'logo.png').split(path.sep).join('/'),
+      version: pluginPKG.version,
+      gui,
+      config: {
+        plugin: {
+          fullName: pluginList[i],
+          name: handleStreamlinePluginName(pluginList[i]),
+          config: plugin.config ? handleConfigWithFunction(plugin.config(picgo)) : []
+        },
+        uploader: {
+          name: uploaderName,
+          config: handleConfigWithFunction(getConfig(uploaderName, IPicGoHelperType.uploader, picgo))
+        },
+        transformer: {
+          name: transformerName,
+          config: handleConfigWithFunction(getConfig(uploaderName, IPicGoHelperType.transformer, picgo))
+        }
+      },
+      enabled: picgo.getConfig(`picgoPlugins.${pluginList[i]}`),
+      homepage: pluginPKG.homepage ? pluginPKG.homepage : '',
+      guiMenu: menu,
+      ing: false
+    }
+    list.push(obj)
+  }
+  return list
+}
+
 const handleGetPluginList = () => {
   ipcMain.on('getPluginList', (event: IpcMainEvent) => {
-    const pluginList = picgo.pluginLoader.getFullList()
-    const list = []
-    for (let i in pluginList) {
-      const plugin = picgo.pluginLoader.getPlugin(pluginList[i])
-      const pluginPath = path.join(STORE_PATH, `/node_modules/${pluginList[i]}`)
-      const pluginPKG = requireFunc(path.join(pluginPath, 'package.json'))
-      const uploaderName = plugin.uploader || ''
-      const transformerName = plugin.transformer || ''
-      let menu = []
-      if (plugin.guiMenu) {
-        menu = plugin.guiMenu(picgo)
-      }
-      let gui = false
-      if (pluginPKG.keywords && pluginPKG.keywords.length > 0) {
-        if (pluginPKG.keywords.includes('picgo-gui-plugin')) {
-          gui = true
-        }
-      }
-      const obj: IPicGoPlugin = {
-        name: pluginList[i].replace(/picgo-plugin-/, ''),
-        author: pluginPKG.author.name || pluginPKG.author,
-        description: pluginPKG.description,
-        logo: 'file://' + path.join(pluginPath, 'logo.png').split(path.sep).join('/'),
-        version: pluginPKG.version,
-        gui,
-        config: {
-          plugin: {
-            name: pluginList[i].replace(/picgo-plugin-/, ''),
-            config: plugin.config ? handleConfigWithFunction(plugin.config(picgo)) : []
-          },
-          uploader: {
-            name: uploaderName,
-            config: handleConfigWithFunction(getConfig(uploaderName, IPicGoHelperType.uploader, picgo))
-          },
-          transformer: {
-            name: transformerName,
-            config: handleConfigWithFunction(getConfig(uploaderName, IPicGoHelperType.transformer, picgo))
-          }
-        },
-        enabled: picgo.getConfig(`picgoPlugins.${pluginList[i]}`),
-        homepage: pluginPKG.homepage ? pluginPKG.homepage : '',
-        guiMenu: menu,
-        ing: false
-      }
-      list.push(obj)
-    }
+    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].replace(/picgo-plugin-/, ''))
-      shortKeyHandler.registerPluginShortKey(notice.body[0])
-      picgo.removeAllListeners('installFailed')
-      dispose()
-    })
-    picgo.once('installFailed', () => {
-      picgo.removeAllListeners('installSuccess')
-      dispose()
-    })
-    await picgo.pluginHandler.install([msg])
-    picgo.cmd.program.removeAllListeners()
+    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()
   })
 }
 
 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].replace(/picgo-plugin-/, ''))
-      shortKeyHandler.unregisterPluginShortKey(notice.body[0])
-      picgo.removeAllListeners('uninstallFailed')
-      dispose()
-    })
-    picgo.once('uninstallFailed', () => {
-      picgo.removeAllListeners('uninstallSuccess')
-      dispose()
-    })
-    await picgo.pluginHandler.uninstall([msg])
-    picgo.cmd.program.removeAllListeners()
+    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()
   })
 }
 
 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].replace(/picgo-plugin-/, ''))
-      picgo.removeAllListeners('updateFailed')
-      dispose()
-    })
-    picgo.once('updateFailed', () => {
-      picgo.removeAllListeners('updateSuccess')
-      dispose()
-    })
-    await picgo.pluginHandler.update([msg])
-    picgo.cmd.program.removeAllListeners()
+    const res = await picgo.pluginHandler.update([msg])
+    if (res.success) {
+      event.sender.send('updateSuccess', res.body[0])
+    }
+    event.sender.send('hideLoading')
+    dispose()
   })
 }
 
@@ -189,15 +185,14 @@ const handleGetPicBedConfig = () => {
     } else {
       event.sender.send('getPicBedConfig', [], name)
     }
-    picgo.cmd.program.removeAllListeners()
   })
 }
 
 const handlePluginActions = () => {
   ipcMain.on('pluginActions', (event: IpcMainEvent, name: string, label: string) => {
-    const plugin = picgo.pluginLoader.getPlugin(`picgo-plugin-${name}`)
+    const plugin = picgo.pluginLoader.getPlugin(name)
     const guiApi = new GuiApi()
-    if (plugin.guiMenu && plugin.guiMenu(picgo).length > 0) {
+    if (plugin?.guiMenu?.(picgo)?.length) {
       const menu: GuiMenuItem[] = plugin.guiMenu(picgo)
       menu.forEach(item => {
         if (item.label === label) {
@@ -223,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()
@@ -233,5 +255,6 @@ export default {
     handlePluginActions()
     handleRemoveFiles()
     handlePicGoSaveData()
+    handleImportLocalPlugin()
   }
 }

src/main/lifeCycle/index.ts

@@ -56,9 +56,7 @@ class LifeCycle {
       }
       windowManager.create(IWindowList.TRAY_WINDOW)
       windowManager.create(IWindowList.SETTING_WINDOW)
-      if (process.platform === 'darwin' || process.platform === 'win32') {
-        createTray()
-      }
+      createTray()
       db.set('needReload', false)
       updateChecker()
       // 不需要阻塞

src/main/utils/common.ts

@@ -1,8 +1,33 @@
 import db from '#/datastore'
-import { clipboard } from 'electron'
+import { clipboard, Notification } from 'electron'
 
 export const handleCopyUrl = (str: string): void => {
   if (db.get('settings.autoCopy') !== false) {
     clipboard.writeText(str)
   }
 }
+
+/**
+ * show notification
+ * @param options
+ */
+export const showNotification = (options: IPrivateShowNotificationOption = {
+  title: '',
+  body: '',
+  clickToCopy: false
+}) => {
+  const notification = new Notification({
+    title: options.title,
+    body: options.body
+  })
+  const handleClick = () => {
+    if (options.clickToCopy) {
+      clipboard.writeText(options.body)
+    }
+  }
+  notification.once('click', handleClick)
+  notification.once('close', () => {
+    notification.removeListener('click', handleClick)
+  })
+  notification.show()
+}

src/renderer/layouts/Main.vue

@@ -271,7 +271,11 @@ export default class extends Vue {
   }
   closeWindow () {
     const window = BrowserWindow.getFocusedWindow()
-    window!.close()
+    if (process.platform === 'linux') {
+      window!.hide()
+    } else {
+      window!.close()
+    }
   }
   buildMenu () {
     const _this = this

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: '设置成功'

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
@@ -13,7 +19,7 @@
       </el-input>
     </el-row>
     <el-row :gutter="10" class="plugin-list" v-loading="loading">
-      <el-col :span="12" v-for="item in pluginList" :key="item.name">
+      <el-col :span="12" v-for="item in pluginList" :key="item.fullName">
         <div class="plugin-item" :class="{ 'darwin': os === 'darwin' }">
           <div class="cli-only-badge" v-if="!item.gui" title="CLI only">CLI</div>
           <img class="plugin-item__logo" :src="item.logo"
@@ -106,6 +112,7 @@ import {
   remote,
   IpcRendererEvent
 } from 'electron'
+import { handleStreamlinePluginName } from '~/universal/utils/common'
 const { Menu } = remote
 
 @Component({
@@ -125,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"'
@@ -157,15 +166,18 @@ 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.name)
+      this.pluginNameList = list.map(item => item.fullName)
       this.loading = false
     })
     ipcRenderer.on('installSuccess', (evt: IpcRendererEvent, plugin: string) => {
       this.loading = false
       this.pluginList.forEach(item => {
-        if (item.name === plugin) {
+        if (item.fullName === plugin) {
           item.ing = false
           item.hasInstall = true
         }
@@ -174,7 +186,7 @@ export default class extends Vue {
     ipcRenderer.on('updateSuccess', (evt: IpcRendererEvent, plugin: string) => {
       this.loading = false
       this.pluginList.forEach(item => {
-        if (item.name === plugin) {
+        if (item.fullName === plugin) {
           item.ing = false
           item.hasInstall = true
         }
@@ -186,7 +198,7 @@ export default class extends Vue {
     ipcRenderer.on('uninstallSuccess', (evt: IpcRendererEvent, plugin: string) => {
       this.loading = false
       this.pluginList = this.pluginList.filter(item => {
-        if (item.name === plugin) { // restore Uploader & Transformer after uninstalling
+        if (item.fullName === plugin) { // restore Uploader & Transformer after uninstalling
           if (item.config.transformer.name) {
             this.handleRestoreState('transformer', item.config.transformer.name)
           }
@@ -195,7 +207,7 @@ export default class extends Vue {
           }
           this.getPicBeds()
         }
-        return item.name !== plugin
+        return item.fullName !== plugin
       })
       this.pluginNameList = this.pluginNameList.filter(item => item !== plugin)
     })
@@ -210,7 +222,7 @@ export default class extends Vue {
       enabled: !plugin.enabled,
       click () {
         _this.letPicGoSaveData({
-          [`picgoPlugins.picgo-plugin-${plugin.name}`]: true
+          [`picgoPlugins.${plugin.fullName}`]: true
         })
         plugin.enabled = true
         _this.getPicBeds()
@@ -220,7 +232,7 @@ export default class extends Vue {
       enabled: plugin.enabled,
       click () {
         _this.letPicGoSaveData({
-          [`picgoPlugins.picgo-plugin-${plugin.name}`]: false
+          [`picgoPlugins.${plugin.fullName}`]: false
         })
         plugin.enabled = false
         _this.getPicBeds()
@@ -234,21 +246,21 @@ export default class extends Vue {
     }, {
       label: '卸载插件',
       click () {
-        _this.uninstallPlugin(plugin.name)
+        _this.uninstallPlugin(plugin.fullName)
       }
     }, {
       label: '更新插件',
       click () {
-        _this.updatePlugin(plugin.name)
+        _this.updatePlugin(plugin.fullName)
       }
     }]
     for (let i in plugin.config) {
       if (plugin.config[i].config.length > 0) {
         const obj = {
-          label: `配置${i} - ${plugin.config[i].name}`,
+          label: `配置${i} - ${plugin.config[i].fullName || plugin.config[i].name}`,
           click () {
             _this.currentType = i
-            _this.configName = plugin.config[i].name
+            _this.configName = plugin.config[i].fullName || plugin.config[i].name
             _this.dialogVisible = true
             _this.config = plugin.config[i].config
           }
@@ -280,7 +292,7 @@ export default class extends Vue {
         menu.push({
           label: i.label,
           click () {
-            ipcRenderer.send('pluginActions', plugin.name, i.label)
+            ipcRenderer.send('pluginActions', plugin.fullName, i.label)
           }
         })
       }
@@ -318,14 +330,16 @@ export default class extends Vue {
         item.ing = true
       }
     })
+    this.loading = true
     ipcRenderer.send('uninstallPlugin', val)
   }
   updatePlugin (val: string) {
     this.pluginList.forEach(item => {
-      if (item.name === val) {
+      if (item.fullName === val) {
         item.ing = true
       }
     })
+    this.loading = true
     ipcRenderer.send('updatePlugin', val)
   }
   reloadApp () {
@@ -364,7 +378,7 @@ export default class extends Vue {
       switch (this.currentType) {
         case 'plugin':
           this.letPicGoSaveData({
-            [`picgo-plugin-${this.configName}`]: result
+            [`${this.configName}`]: result
           })
           break
         case 'uploader':
@@ -407,7 +421,7 @@ export default class extends Vue {
       })
   }
   handleSearchResult (item: INPMSearchResultObject) {
-    const name = item.package.name.replace(/picgo-plugin-/, '')
+    const name = handleStreamlinePluginName(item.package.name)
     let gui = false
     if (item.package.keywords && item.package.keywords.length > 0) {
       if (item.package.keywords.includes('picgo-gui-plugin')) {
@@ -416,12 +430,13 @@ export default class extends Vue {
     }
     return {
       name: name,
+      fullName: item.package.name,
       author: item.package.author.name,
       description: item.package.description,
       logo: `https://cdn.jsdelivr.net/npm/${item.package.name}/logo.png`,
       config: {},
       homepage: item.package.links ? item.package.links.homepage : '',
-      hasInstall: this.pluginNameList.some(plugin => plugin === item.package.name.replace(/picgo-plugin-/, '')),
+      hasInstall: this.pluginNameList.some(plugin => plugin === item.package.name),
       version: item.package.version,
       gui,
       ing: false // installing or uninstalling
@@ -458,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>
@@ -492,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
@@ -499,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

src/renderer/pages/picbeds/GitHub.vue

@@ -25,7 +25,7 @@
             :rules="{
               required: true, message: '分支名不能为空', trigger: 'blur'
             }">
-            <el-input v-model="form.branch" @keyup.native.enter="confirm" placeholder="例如：master"></el-input>
+            <el-input v-model="form.branch" @keyup.native.enter="confirm" placeholder="例如：main"></el-input>
           </el-form-item>
           <el-form-item
             label="设定Token"

src/renderer/pages/picbeds/Others.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="others-view">
-    <el-row :gutter="16">
+    <el-row :gutter="16" class="setting-list">
       <el-col :span="16" :offset="4">
         <div class="view-title">
           {{ picBedName }}设置
@@ -92,6 +92,10 @@ export default class extends Vue {
 </script>
 <style lang='stylus'>
 #others-view
+  .setting-list
+    height 425px
+    overflow-y auto
+    overflow-x hidden
   .el-form
     label
       line-height 22px

src/universal/datastore/dbChecker.ts

@@ -17,7 +17,7 @@ function dbChecker () {
     if (!fs.existsSync(configFilePath)) {
       return
     }
-    let configFile: string = ''
+    let configFile: string = '{}'
     let optionsTpl = {
       title: '注意',
       body: ''

src/universal/datastore/index.ts

@@ -14,10 +14,9 @@ if (process.type !== 'renderer') {
   if (!fs.pathExistsSync(STORE_PATH)) {
     fs.mkdirpSync(STORE_PATH)
   }
+  dbChecker()
 }
 
-dbChecker()
-
 class DB {
   private db: Datastore.LowdbSync<Datastore.AdapterSync>
   constructor () {

src/universal/types/types.d.ts

@@ -123,6 +123,7 @@ interface IBounds {
 type ICtx = import('picgo')
 interface IPicGoPlugin {
   name: string
+  fullName: string
   author: string
   description: string
   logo: string
@@ -145,6 +146,7 @@ interface IPicGoPlugin {
 
 interface IPluginMenuConfig {
   name: string
+  fullName?: string
   config: any[]
 }
 
@@ -194,6 +196,14 @@ type IUploadOption = string[]
 interface IShowNotificationOption {
   title: string
   body: string
+  icon?: string | import('electron').NativeImage
+}
+
+interface IPrivateShowNotificationOption extends IShowNotificationOption{
+  /**
+   * click notification to copy the body
+   */
+  clickToCopy?: boolean
 }
 
 interface IShowMessageBoxOption {

src/universal/utils/common.ts

@@ -15,3 +15,18 @@ export const handleUrlEncode = (url: string): string => {
   }
   return url
 }
+
+/**
+ * streamline the full plugin name to a simple one
+ * for example:
+ * 1. picgo-plugin-xxx -> xxx
+ * 2. @xxx/picgo-plugin-yyy -> yyy
+ * @param name pluginFullName
+ */
+export const handleStreamlinePluginName = (name: string) => {
+  if (/^@[^/]+\/picgo-plugin-/.test(name)) {
+    return name.replace(/^@[^/]+\/picgo-plugin-/, '')
+  } else {
+    return name.replace(/picgo-plugin-/, '')
+  }
+}

vue.config.js

@@ -2,7 +2,11 @@ const path = require('path')
 function resolve (dir) {
   return path.join(__dirname, dir)
 }
-module.exports = {
+
+const config = {
+  configureWebpack: {
+    devtool: 'nosources-source-map'
+  },
   chainWebpack: config => {
     config.resolve.alias
       .set('@', resolve('src/renderer'))
@@ -74,3 +78,13 @@ module.exports = {
     }
   }
 }
+
+if (process.env.NODE_ENV === 'development') {
+  config.configureWebpack = {
+    devtool: 'eval-source-map'
+  }
+}
+
+module.exports = {
+  ...config
+}

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.14:
-  version "1.4.14"
-  resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.4.14.tgz#312a1814d35eb8e326587d5cd99316b09a2882cc"
-  integrity sha512-r2i/Ox85xG5oskI4nemhdCU0SC/pxUzJ9np53qGC9qfQ2WumTLN5Ro09pDwFctxtI4Pl0jO03LAQ7hzVSX4rfA==
+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"