🎉 Release: v2.3.0

ISSUES CLOSED: #731

.eslintrc.js

@@ -15,7 +15,9 @@ module.exports = {
   'plugins': ['@typescript-eslint'],
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'off' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    "indent": "off",
+    "@typescript-eslint/indent": ["error", 2]
   },
   parserOptions: {
     parser: '@typescript-eslint/parser'

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: ["https://paypal.me/Molunerfinn"]

.github/ISSUE_TEMPLATE.md

@@ -1,30 +1,34 @@
 <!--
 PicGo Issue 模板
 请依照该模板来提交，否则将会被关闭。
-**提问之前请注意你看过FAQ、配置手册以及那些被关闭的issues。否则同样的提问也会被关闭！**
+**提问之前请注意你看过 FAQ、配置手册以及那些被关闭的 issues。否则同样的提问也会被关闭！**
 -->
 
+**声明：我已经仔细看过 [文档](https://picgo.github.io/PicGo-Doc/)、[FAQ](https://github.com/Molunerfinn/PicGo/blob/dev/FAQ.md)、和搜索过已经关闭的 [issues](https://github.com/Molunerfinn/PicGo/issues?q=is%3Aissue+sort%3Aupdated-desc+is%3Aclosed) 后依然没有找到答案，所以才发了一个新的 issue。**
+
 ## 问题类型
 
-<!-- 你要提交的是Bug Report还是Feature Request？-->
+<!-- 你要提交的是 Bug Report 还是 Feature Request？-->
 
-## PicGo的相关信息
+## PicGo 的相关信息
 
-<!-- 版本、所在平台（Mac或者Windows） -->
+<!-- PicGo 的版本、所在平台（Mac 或者 Windows 或者 Linux） -->
 
 ## 问题重现
 
-<!-- 如果是Bug Report请填写本项 -->
+<!-- 如果是 Bug Report 请填写本项 -->
 <!-- 请附上相关截图 -->
+<!-- 请附上 PicGo 的相关报错日志（用文本的形式）否则无法判断原因-->
+<!-- 报错日志可以在 PicGo 设置 -> 设置日志文件 -> 点击打开 后找到 -->
 
 ## 功能请求
 
-<!-- 如果是Feature Request请填写本项 -->
+<!-- 如果是 Feature Request 请填写本项 -->
 <!-- 详细描述你所预想的功能或者是现有功能的改进。 -->
 
 ---
 
 <!-- 
-  最后，喜欢PicGo的话不妨给它点个star~
+  最后，喜欢 PicGo 的话不妨给它点个 star~
   如果可以的话，请我喝杯咖啡？首页有赞助二维码，谢谢你的支持！ 
  -->

.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 }}

.gitignore

@@ -16,3 +16,4 @@ docs/dist/
 .env.local
 .env.*.local
 dist_electron/
+test.js

.travis.deprecated.yml

@@ -22,9 +22,7 @@ addons:
     - icnsutils
     #- xvfb
 before_install:
-- mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v1.2.1/git-lfs-$([
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install git-lfs; fi
-  "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-1.2.1.tar.gz
-  | tar -xz -C /tmp/git-lfs --strip-components 1 && /tmp/git-lfs/git-lfs pull
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils; fi
 install:
 #- export DISPLAY=':99.0'
@@ -39,6 +37,8 @@ script:
 #- yarn run pack && xvfb-maybe node_modules/.bin/mocha test/e2e
 - npm run release
 # - yarn run build:docs
+before_script:
+- git lfs pull
 branches:
   only:
   - master

CHANGELOG.md

@@ -1,3 +1,214 @@
+# :tada: 2.3.0 (2021-09-11)
+
+
+### :sparkles: Features
+
+* add open devtool option ([75e3edc](https://github.com/Molunerfinn/PicGo/commit/75e3edc))
+
+
+### :bug: Bug Fixes
+
+* shift key function in gallery page ([5895889](https://github.com/Molunerfinn/PicGo/commit/5895889))
+* some bugs ([a676c08](https://github.com/Molunerfinn/PicGo/commit/a676c08)), closes [#722](https://github.com/Molunerfinn/PicGo/issues/722)
+* urlEncode bug when copy ([6c6f847](https://github.com/Molunerfinn/PicGo/commit/6c6f847)), closes [#731](https://github.com/Molunerfinn/PicGo/issues/731)
+
+
+### :pencil: Documentation
+
+* update FAQ ([58420c8](https://github.com/Molunerfinn/PicGo/commit/58420c8))
+
+
+
+# :tada: 2.3.0-beta.8 (2021-08-13)
+
+
+### :bug: Bug Fixes
+
+* settings bug ([20d3cf9](https://github.com/Molunerfinn/PicGo/commit/20d3cf9)), closes [#710](https://github.com/Molunerfinn/PicGo/issues/710)
+* upload clipboard images via http should return list ([ae69263](https://github.com/Molunerfinn/PicGo/commit/ae69263)), closes [#721](https://github.com/Molunerfinn/PicGo/issues/721)
+
+
+
+# :tada: 2.3.0-beta.7 (2021-08-01)
+
+
+### :sparkles: Features
+
+* add gallery db ([6ddd660](https://github.com/Molunerfinn/PicGo/commit/6ddd660))
+* add win32 support ([1657542](https://github.com/Molunerfinn/PicGo/commit/1657542)), closes [#632](https://github.com/Molunerfinn/PicGo/issues/632)
+* finish custom config path ([7030f7a](https://github.com/Molunerfinn/PicGo/commit/7030f7a)), closes [#255](https://github.com/Molunerfinn/PicGo/issues/255)
+
+
+### :bug: Bug Fixes
+
+* bug of gallery db for plugin ([96a63ea](https://github.com/Molunerfinn/PicGo/commit/96a63ea))
+* enable plugin should reload ([49e5f34](https://github.com/Molunerfinn/PicGo/commit/49e5f34)), closes [#659](https://github.com/Molunerfinn/PicGo/issues/659)
+* gallery db bug ([f1eb7f4](https://github.com/Molunerfinn/PicGo/commit/f1eb7f4))
+* multiple uploading in the same time will cause output conflict ([06b67e5](https://github.com/Molunerfinn/PicGo/commit/06b67e5)), closes [#666](https://github.com/Molunerfinn/PicGo/issues/666)
+* multiple uploading in the same time will cause rename failed ([12cecc2](https://github.com/Molunerfinn/PicGo/commit/12cecc2))
+* uploader error in linux ([ab762ef](https://github.com/Molunerfinn/PicGo/commit/ab762ef)), closes [#627](https://github.com/Molunerfinn/PicGo/issues/627)
+* use uploader first ([92022a6](https://github.com/Molunerfinn/PicGo/commit/92022a6))
+* windows ia32 && x64 build options ([bdf523a](https://github.com/Molunerfinn/PicGo/commit/bdf523a))
+
+
+
+# :tada: 2.3.0-beta.6 (2021-04-24)
+
+
+### :sparkles: Features
+
+* add baidu tongji for analytics ([f536391](https://github.com/Molunerfinn/PicGo/commit/f536391))
+* add logs for picgo-server ([2d9e9c0](https://github.com/Molunerfinn/PicGo/commit/2d9e9c0)), closes [#627](https://github.com/Molunerfinn/PicGo/issues/627)
+* add privacy policy ([992ff35](https://github.com/Molunerfinn/PicGo/commit/992ff35))
+
+
+### :bug: Bug Fixes
+
+* add plugin install failed notice ([b05139f](https://github.com/Molunerfinn/PicGo/commit/b05139f))
+* default picBed using picBed.uploader instead of picBed.current ([0a986c8](https://github.com/Molunerfinn/PicGo/commit/0a986c8))
+* dev error with install vue-devtools ([a657c51](https://github.com/Molunerfinn/PicGo/commit/a657c51)), closes [#653](https://github.com/Molunerfinn/PicGo/issues/653) [#658](https://github.com/Molunerfinn/PicGo/issues/658)
+* disable plugin need reload app ([a1b70b4](https://github.com/Molunerfinn/PicGo/commit/a1b70b4))
+* fix analytics value ([06d40ef](https://github.com/Molunerfinn/PicGo/commit/06d40ef))
+* windows cli uploading bug ([321e339](https://github.com/Molunerfinn/PicGo/commit/321e339)), closes [#657](https://github.com/Molunerfinn/PicGo/issues/657)
+
+
+### :package: Chore
+
+* add main process hot reload ([3fd6e4e](https://github.com/Molunerfinn/PicGo/commit/3fd6e4e))
+* fix eslint error notice in indent ([69e1dc8](https://github.com/Molunerfinn/PicGo/commit/69e1dc8))
+
+
+
+# :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)
+
+
+### :sparkles: Features
+
+* add global value for PicGo get GUI_VERSION & CORE_VERSION ([eab014d](https://github.com/Molunerfinn/PicGo/commit/eab014d))
+* **config:** auto configuration backup & fallback to avoid main process crash ([32b8b97](https://github.com/Molunerfinn/PicGo/commit/32b8b97)), closes [#568](https://github.com/Molunerfinn/PicGo/issues/568)
+
+
+### :bug: Bug Fixes
+
+* disabled plugin won't be shown in plugin page ([33fdb16](https://github.com/Molunerfinn/PicGo/commit/33fdb16))
+* shortKeyConfig maybe undefined ([7b5e5ef](https://github.com/Molunerfinn/PicGo/commit/7b5e5ef)), closes [#557](https://github.com/Molunerfinn/PicGo/issues/557)
+* url encode before uploading by url ([ce2b5cd](https://github.com/Molunerfinn/PicGo/commit/ce2b5cd)), closes [#581](https://github.com/Molunerfinn/PicGo/issues/581)
+
+
+### :pencil: Documentation
+
+* add flutter-picgo ([92ff282](https://github.com/Molunerfinn/PicGo/commit/92ff282))
+* add gitads ([2d42381](https://github.com/Molunerfinn/PicGo/commit/2d42381))
+* rm gitads ([bb90e17](https://github.com/Molunerfinn/PicGo/commit/bb90e17))
+* update discussions in doc ([e793599](https://github.com/Molunerfinn/PicGo/commit/e793599))
+* update install command by Homebrew ([#599](https://github.com/Molunerfinn/PicGo/issues/599)) ([bd2311b](https://github.com/Molunerfinn/PicGo/commit/bd2311b))
+* update README.md ([#555](https://github.com/Molunerfinn/PicGo/issues/555)) ([2151857](https://github.com/Molunerfinn/PicGo/commit/2151857))
+
+
+
+# :tada: 2.3.0-beta.3 (2020-07-12)
+
+
+### :bug: Bug Fixes
+
+* choose default picBed failure ([21d3942](https://github.com/Molunerfinn/PicGo/commit/21d3942)), closes [#537](https://github.com/Molunerfinn/PicGo/issues/537)
+* shortkey disabled failure ([4f0809e](https://github.com/Molunerfinn/PicGo/commit/4f0809e)), closes [#534](https://github.com/Molunerfinn/PicGo/issues/534)
+
+
+
+# :tada: 2.3.0-beta.2 (2020-07-12)
+
+
+### :sparkles: Features
+
+* add qrcode for picbeds' config ([7fabc47](https://github.com/Molunerfinn/PicGo/commit/7fabc47))
+
+
+### :bug: Bug Fixes
+
+* encoding the result of picgo-server ([db71139](https://github.com/Molunerfinn/PicGo/commit/db71139))
+* initialize db bugs ([5f87018](https://github.com/Molunerfinn/PicGo/commit/5f87018))
+
+
+### :pencil: Documentation
+
+* update readme ([1c5880a](https://github.com/Molunerfinn/PicGo/commit/1c5880a))
+
+
+
+# :tada: 2.3.0-beta.1 (2020-06-28)
+
+
+### :bug: Bug Fixes
+
+* auto-copy option && copy style ([b6e3adb](https://github.com/Molunerfinn/PicGo/commit/b6e3adb))
+* beta version update bug ([18ad542](https://github.com/Molunerfinn/PicGo/commit/18ad542))
+* paste url encoding bug ([59d3eba](https://github.com/Molunerfinn/PicGo/commit/59d3eba)), closes [#454](https://github.com/Molunerfinn/PicGo/issues/454)
+
+
+### :pencil: Documentation
+
+* update FAQ && ISSUE_TEMPLATE ([2c57a27](https://github.com/Molunerfinn/PicGo/commit/2c57a27))
+* update readme ([2adff1e](https://github.com/Molunerfinn/PicGo/commit/2adff1e))
+
+
+
+# :tada: 2.3.0-beta.0 (2020-04-30)
+
+
+### :sparkles: Features
+
+* add autoCopy option for users to use or not ([67e526f](https://github.com/Molunerfinn/PicGo/commit/67e526f))
+* add beta-version update support ([ad6acd8](https://github.com/Molunerfinn/PicGo/commit/ad6acd8))
+* add smms-v2 support ([3f3ea69](https://github.com/Molunerfinn/PicGo/commit/3f3ea69))
+* add uploading image from URL support ([a28c678](https://github.com/Molunerfinn/PicGo/commit/a28c678))
+* finish all-select && shift multi-select ([2aeca50](https://github.com/Molunerfinn/PicGo/commit/2aeca50)), closes [#342](https://github.com/Molunerfinn/PicGo/issues/342)
+
+
+### :bug: Bug Fixes
+
+* confused port number auto increasing when opening a new PicGo app ([cd70a1a](https://github.com/Molunerfinn/PicGo/commit/cd70a1a))
+* correct inputbox value && remove listener ([32334e9](https://github.com/Molunerfinn/PicGo/commit/32334e9))
+* give a hint when node.js is not installed ([7e86618](https://github.com/Molunerfinn/PicGo/commit/7e86618))
+* right-click menu upload fails with PicGo open ([96cdfea](https://github.com/Molunerfinn/PicGo/commit/96cdfea)), closes [#415](https://github.com/Molunerfinn/PicGo/issues/415)
+* some win10 upload clipboard image crash ([cc182b0](https://github.com/Molunerfinn/PicGo/commit/cc182b0))
+* travis-ci bug ([b357dfb](https://github.com/Molunerfinn/PicGo/commit/b357dfb))
+* url uploader bug ([96544f5](https://github.com/Molunerfinn/PicGo/commit/96544f5))
+
+
+### :pencil: Documentation
+
+* update choco install picgo ([f357557](https://github.com/Molunerfinn/PicGo/commit/f357557))
+* update docs ([fd7673e](https://github.com/Molunerfinn/PicGo/commit/fd7673e))
+* update readme ([fb014dd](https://github.com/Molunerfinn/PicGo/commit/fb014dd))
+
+
+### :package: Chore
+
+* update funding url ([024d9cf](https://github.com/Molunerfinn/PicGo/commit/024d9cf))
+
+
+
 ## :tada: 2.2.2 (2020-01-20)
 
 

FAQ.md

@@ -1,58 +1,63 @@
 ## 常见问题
 
-> 在使用PicGo期间你会遇到很多问题，不过很多问题其实之前就有人提问过，也被解决，所以你可以先看看[使用文档](https://github.com/Molunerfinn/PicGo/wiki/%E8%AF%A6%E7%BB%86%E7%AA%97%E5%8F%A3%E7%9A%84%E4%BD%BF%E7%94%A8#%E8%87%AA%E5%AE%9A%E4%B9%89%E5%BF%AB%E6%8D%B7%E9%94%AE)，这份FAQ，以及那些被关闭的[issues](https://github.com/Molunerfinn/PicGo/issues?q=is%3Aissue+is%3Aclosed)，应该能找到答案。
+> 在使用 PicGo 期间你会遇到很多问题，不过很多问题其实之前就有人提问过，也被解决，所以你可以先看看 [使用文档](https://picgo.github.io/PicGo-Doc/zh/guide/getting-started.html#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B)，这份 FAQ，以及那些被关闭的 [issues](https://github.com/Molunerfinn/PicGo/issues?q=is%3Aissue+is%3Aclosed)，应该能找到答案。
 
-## 1.七牛图床上传图片成功后无法显示或图片无`http://`前缀
+## 1. 七牛图床上传图片成功后，相册里无法显示或图片无`http://`前缀
 
 通常是你的七牛图床配置里的`设定访问网址`没有加上`http://`或者`https//`头。
 
 参考：[issue#79](https://github.com/Molunerfinn/PicGo/issues/79)
 
-## 2.能否支持图床远端同步删除
+## 2. 能否支持图床远端同步删除
 
-不能。有些图床（比如微博图床、SM.MS、Imgur等）不支持后台管理，为了架构统一不支持远端删除。
+不能。有些图床（比如微博图床、SM.MS、Imgur 等）不支持后台管理，为了架构统一不支持远端删除。
 
-## 3.能否支持上传视频文件
+## 3. 能否支持上传视频文件
 
-目前不能。2.0版本出来后将会支持插件系统，届时如果有人开发了相应的插件理论可以支持任意文件上传。
+目前不能。如果有人开发了相应的插件理论可以支持任意文件上传。
 
-## 4.微博图床上传之后无法显示预览图
+## 4. 微博图床上传之后无法显示预览图
 
 通常是挂了全局代理导致的。
 
 参考：[issue36](https://github.com/Molunerfinn/PicGo/issues/36)
 
-## 5.能否支持某某某图床
+## 5. 能否支持某某某图床
 
-截止v1.6，PicGo支持了如下图床：
+截止 v1.6，PicGo 支持了如下图床：
 
 - `微博图床` v1.0
 - `七牛图床` v1.0
-- `腾讯云COS v4\v5版本` v1.1 & v1.5.0
+- `腾讯云 COS v4\v5 版本` v1.1 & v1.5.0
 - `又拍云` v1.2.0
 - `GitHub` v1.5.0
 - `SM.MS` v1.5.1
-- `阿里云OSS` v1.6.0
+- `阿里云 OSS` v1.6.0
 - `Imgur` v1.6.0
 
-所以本体内将不会再支持其他图床。待2.0版本出来支持插件系统后可以由其他开发者开发相应的图床插件用以支持其他图床。
+所以本体内将不会再支持其他图床。需要其他图床支持可以参考目前已有的三方 [插件](https://github.com/PicGo/Awesome-PicGo)，如果还是没有你所需要的图床欢迎开发一个插件供大家使用。
 
-## 6.一个图床设置多个信息
+## 6. 一个图床设置多个信息
 
 不能。因为目前的架构只支持一个图床一份信息。
 
-## 7.v2.0版本有什么新功能
+## 7. GitHub 图床有时能上传，有时上传失败
 
-在不改变PicGo现有使用界面和使用习惯的基础上，将会重构整个底层`传输->转换->上传`的架构，使其能够支持插件系统，方便其他开发者基于PicGo的底层进行二次开发。
+1. GitHub 图床不支持上传同名文件，如果有同名文件上传，会报错。建议开启 `时间戳重命名` 避免同名文件。
+2. GitHub 服务器和国内 GFW 的问题会导致有时上传成功，有时上传失败，无解。想要稳定请使用付费云存储，如阿里云、腾讯云等，价格也不会贵。
 
-理论上有了插件系统之后，其他开发者能够支持如下功能：
+## 8. Mac 上无法打开 PicGo 的主窗口界面
 
-1. 能够实现上传前图片压缩
+PicGo 在 Mac 上是一个顶部栏应用，在 dock 栏是不会有图标的。要打开主窗口，请右键或者双指点按顶部栏 PicGo 图标，选择「打开详细窗口」即可打开主窗口。
-2. 能够通过图片url实现上传图片 -> 更深入地可以批量地实现图床的迁移
-3. 能够支持其他图床甚至是自己的图床
 
-等等。
+## 9. 上传失败，或者是服务器出错
 
-届时底层架构将会独立出来成为一个独立的npm包，能够直接在命令行里调用。
+1. PicGo 自带的图床都经过测试，上传出错一般都不是 PicGo 自身的原因。如果你用的是 GitHub 图床请参考上面的第 7 点。
+2. 检查 PicGo 的日志（报错日志可以在 PicGo 设置 -> 设置日志文件 -> 点击打开 后找到），看看 `[PicGo Error]` 的报错信息里有什么关键信息
+   1. 先自行搜索 error 里的报错信息，往往你能百度或者谷歌出问题原因，不必开 issue。
+   2. 如果有带有 `401` 、`403` 等 `40X` 状态码字样的，不用怀疑，就是你配置写错了，仔细检查配置，看看是否多了空格之类的。
+   3. 如果带有 `HttpError`、`RequestError` 、 `socket hang up` 等字样的说明这是网络问题，我无法帮你解决网络问题，请检查你自己的网络，是否有代理，DNS 设置是否正常等。
 
-目前开发进度可以参考[PicGo-Core](https://github.com/Molunerfinn/PicGo-Core)。
+## 10. macOS版本安装完之后没有主界面
+
+请找到PicGo在顶部栏的图标，然后右键（触摸板双指点按，或者鼠标右键），即可找到「打开详细窗口」的菜单。

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">
+  <a href="https://github.com/Molunerfinn/PicGo/actions">
-    <img src="https://img.shields.io/travis/Molunerfinn/PicGo.svg?style=flat-square" alt="">
+    <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="">
@@ -17,47 +17,67 @@
   <a href="https://github.com/PicGo/bump-version">
     <img src="https://img.shields.io/badge/picgo-convention-blue.svg?style=flat-square" alt="">
   </a>
+  <a href="https://gitter.im/picgo-all/PicGo?utm_source=share-link&utm_medium=link&utm_campaign=share-link">
+    <img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-66ae93.svg?style=flat-square" alt="">
+  </a>
 </div>
 
-## 应用说明
+## 应用概述
 
-**PicGo 在上传图片之后自动会将图片链接复制到你的剪贴板里，可选 5 种复制的链接格式。**
+**PicGo: 一个用于快速上传图片并获取图片 URL 链接的工具**
 
-PicGo 目前支持了
+PicGo 本体支持如下图床：
 
-- ~~`微博图床` v1.0~~ **微博图床从 2019 年 4 月开始进行防盗链，不建议继续使用**
 - `七牛图床` v1.0
-- `腾讯云 COS v4\v5版本` v1.1 & v1.5.0
+- `腾讯云 COS v4\v5 版本` v1.1 & v1.5.0
 - `又拍云` v1.2.0
 - `GitHub` v1.5.0
-- `SM.MS` v1.5.1
+- `SM.MS V2` v2.3.0-beta.0
 - `阿里云 OSS` v1.6.0
 - `Imgur` v1.6.0
 
 **本体不再增加默认的图床支持。你可以自行开发第三方图床插件。详见 [PicGo-Core](https://picgo.github.io/PicGo-Core-Doc/)**。
 
-第三方插件以及使用了 PicGo 底层的应用可以在 [Awesome-PicGo](https://github.com/PicGo/Awesome-PicGo) 找到。欢迎贡献！
+## 特色功能
 
-PicGo 支持 macOS、Windows 64位（>= v1.3.1），Linux（>= v1.6.0）。
+- 支持拖拽图片上传
+- 支持快捷键上传剪贴板里第一张图片
+- Windows 和 macOS 支持右键图片文件通过菜单上传 (v2.1.0+)
+- 上传图片后自动复制链接到剪贴板
+- 支持自定义复制到剪贴板的链接格式
+- 支持修改快捷键，默认快速上传快捷键：`command+shift+p`（macOS）| `control+shift+p`（Windows\Linux)
+- 支持插件系统，已有插件支持 Gitee、青云等第三方图床
+  - 更多第三方插件以及使用了 PicGo 底层的应用可以在 [Awesome-PicGo](https://github.com/PicGo/Awesome-PicGo) 找到。欢迎贡献！
+- 支持通过发送 HTTP 请求调用 PicGo 上传（v2.2.0+)
+- 更多功能等你自己去发现，同时也会不断开发新功能
+  - 开发进度可以查看 [Projects](https://github.com/Molunerfinn/PicGo/projects)，会同步更新开发进度
+  - 欢迎加入 [官方讨论区](https://github.com/Molunerfinn/PicGo/discussions) 与我交流
 
-支持快捷键`command+shift+p`（macOS）或者`control+shift+p`（Windows\Linux）用以支持快捷上传剪贴板里的图片（第一张）。
+**如果第一次使用，请参考应用 [使用文档](https://picgo.github.io/PicGo-Doc/zh/guide/getting-started.html)。遇到问题了还可以看看 [FAQ](https://github.com/Molunerfinn/PicGo/blob/dev/FAQ.md) 以及被关闭的 [issues](https://github.com/Molunerfinn/PicGo/issues?q=is%3Aissue+is%3Aclosed)。**
-PicGo 支持自定义快捷键，使用方法见[配置手册](https://picgo.github.io/PicGo-Doc/zh/guide/config.html)。
-
-开发进度可以查看 [Projects](https://github.com/Molunerfinn/PicGo/projects)，会同步更新开发进度。
-
-**如果第一次使用，请参考应用使用[快速上手](https://picgo.github.io/PicGo-Doc/zh/guide/getting-started.html)。遇到问题了还可以看看 [FAQ](https://github.com/Molunerfinn/PicGo/blob/dev/FAQ.md) 以及被关闭的 [issues](https://github.com/Molunerfinn/PicGo/issues?q=is%3Aissue+is%3Aclosed)。**
 
 ## 下载安装
 
-点击此处下载[应用](https://github.com/Molunerfinn/PicGo/releases)。
+点击此处下载 [应用](https://github.com/Molunerfinn/PicGo/releases)。
 
-macOS 用户请下载最新版本的 `dmg` 文件，Windows 用户请下载最新版本的 `exe` 文件，Linux用户请下载 `AppImage` 文件。
+### Windows
 
-**如果你是 Arch 类的 Linux 用户，可以直接通过 `aurman -S picgo-appimage` 来安装 PicGo。感谢 @houbaron 的贡献！**
+Windows 用户请下载最新版本的 `exe` 文件。
 
-**如果你是 macOS 用户，可以使用 `brew cask` 来安装 PicGo: `brew cask install picgo`。感谢 @womeimingzi11 的贡献！**
+**还可以使用 [Scoop](https://scoop.sh/) 来安装 PicGo: `scoop bucket add helbing https://github.com/helbing/scoop-bucket` & `scoop install picgo`。 感谢 @helbing 的贡献！**
 
-**如果你是 Windows 用户，还可以使用 [Scoop](https://scoop.sh/) 来安装 PicGo: `scoop bucket add helbing https://github.com/helbing/scoop-bucket` & `scoop install picgo`。 感谢 @helbing 的贡献！**
+**还可以使用 [Chocolatey](https://chocolatey.org/) 来安装 PicGo: `choco install picgo`。 感谢 @iYato 的贡献！**
+
+### macOS
+
+macOS 用户请下载最新版本的 `dmg` 文件。
+
+**还可以使用 [Homebrew](https://brew.sh/) 来安装 PicGo: `brew install picgo --cask`。感谢 @womeimingzi11 的贡献！**
+
+### Linux
+
+Linux 用户请下载 `AppImage` 文件。
+
+**如果你是 Arch 类的 Linux 用户，可以直接通过 `yay -S picgo-appimage` 来安装 PicGo （若是没有则先安装 yay ，是 aur 仓库助手）。感谢 @houbaron 的贡献！**
 
 ## 应用截图
 
@@ -73,9 +93,9 @@ macOS 用户请下载最新版本的 `dmg` 文件，Windows 用户请下载最
 
 > 如果想学习 Electron-vue 的开发，可以查看我写的系列教程——[Electron-vue 开发实战](https://molunerfinn.com/tags/Electron-vue/)
 
-1. 你需要有 Node、Git环境，了解 npm 的相关知识。
+1. 你需要有 Node、Git 环境，了解 npm 的相关知识。
-2. `git clone https://github.com/Molunerfinn/PicGo.git` 并进入项目
+2. `git clone https://github.com/Molunerfinn/PicGo.git` 并进入项目。
-3. `npm install` 下载依赖
+3. `yarn` 下载依赖。注意如果你没有 `yarn`，请去 [官网](https://classic.yarnpkg.com/en/docs/install) 下载安装后再使用。 **用 `npm install` 将导致未知错误！**
 4. Mac 需要有 Xcode 环境，Windows 需要有 VS 环境。
 
 ### 开发模式
@@ -84,26 +104,29 @@ macOS 用户请下载最新版本的 `dmg` 文件，Windows 用户请下载最
 
 ```bash
 ctrl+c # 退出开发模式
-npm run dev # 重新进入开发模式
+npm run electron:serve # 重新进入开发模式
 ```
 
+**注：Windows 开发模式运行之后会在底部任务栏的右下角应用区出现 PicGo 的应用图标。**
+
 ### 生产模式
 
 如果你需要自行构建，可以 `npm run electron:build` 开始进行构建。构建成功后，会在 `dist_electron` 目录里出现构建成功的相应安装文件。
 
-**注意**：如果你的网络环境不太好，可能会出现 `electron-builder` 下载 `electron` 二进制文件失败的情况。这个时候需要在 `npm run build` 之前指定一下 `electron` 的源为国内源：
+**注意**：如果你的网络环境不太好，可能会出现 `electron-builder` 下载 `electron` 二进制文件失败的情况。这个时候需要在 `npm run electron:build` 之前指定一下 `electron` 的源为国内源：
 
 ```bash
 export ELECTRON_MIRROR="https://npm.taobao.org/mirrors/electron/"
 # 在 Windows 上，则可以使用 set ELECTRON_MIRROR=https://npm.taobao.org/mirrors/electron/ （无需引号）
-npm run build
+npm run electron:build
 ```
 
 只需第一次构建的时候指定一下国内源即可。后续构建不需要特地指定。二进制文件下载在 `~/.electron/` 目录下。如果想要更新 `electron` 构建版本，可以删除 `~/.electron/` 目录，然后重新运行上一步，让 `electron-builder `去下载最新的 `electron` 二进制文件。
 
 ## 其他相关
 
-- [vs-picgo](https://github.com/Spades-S/vs-picgo)：PicGo 的 VS Code 版。
+- [vs-picgo](https://github.com/PicGo/vs-picgo)：PicGo 的 VS Code 版。
+- [flutter-picgo](https://github.com/PicGo/flutter-picgo)：PicGo 的手机版（支持 Android 和 iOS ）。
 
 ## 赞助
 
@@ -121,4 +144,4 @@ npm run build
 
 [MIT](http://opensource.org/licenses/MIT)
 
-Copyright (c) 2017 - 2019 Molunerfinn
+Copyright (c) 2017 - 2019 Molunerfinn

appveyor.yml

@@ -26,6 +26,7 @@ install:
 
 build_script:
   #- yarn test
-  - npm run release
+  - yarn build --win --ia32
+  - yarn release
 
 test: off

package.json

@@ -1,10 +1,10 @@
 {
   "name": "picgo",
-  "version": "2.2.2",
+  "version": "2.3.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
+    "dev": "vue-cli-service electron:serve",
-    "build": "vue-cli-service build",
+    "build": "vue-cli-service electron:build",
     "lint": "vue-cli-service lint",
     "electron:build": "vue-cli-service electron:build",
     "electron:serve": "vue-cli-service electron:serve",
@@ -34,6 +34,7 @@
     ]
   },
   "dependencies": {
+    "@picgo/store": "^1.0.3",
     "axios": "^0.19.0",
     "core-js": "^3.3.2",
     "element-ui": "^2.13.0",
@@ -42,7 +43,9 @@
     "keycode": "^2.2.0",
     "lodash-id": "^0.14.0",
     "lowdb": "^1.0.0",
-    "picgo": "^1.4.4",
+    "picgo": "^1.4.24",
+    "qrcode.vue": "^1.7.0",
+    "uuidv4": "^6.2.11",
     "vue": "^2.6.10",
     "vue-gallery": "^2.0.1",
     "vue-lazyload": "^1.2.6",
@@ -67,6 +70,7 @@
     "conventional-changelog": "^3.1.18",
     "cz-customizable": "^6.2.0",
     "electron": "^6.0.0",
+    "electron-devtools-installer": "^3.2.0",
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.0.0",
     "husky": "^3.1.0",

public/windows10.ps1

@@ -27,6 +27,7 @@ function main {
     $stream.Dispose() | out-null
 
     $imagePath
+    Exit 1
 }
 
 try {

public/wsl.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+# grab the paths
+scriptPath=$(echo $0 | awk '{ print substr( $0, 1, length($0)-6 ) }')"windows10.ps1"
+imagePath=$(echo $1 | awk '{ print substr( $0, 1, length($0)-18 ) }')
+imageName=$(echo $1 | awk '{ print substr( $0, length($0)-17, length($0) ) }')
+
+# run the powershell script
+res=$(powershell.exe -noprofile -noninteractive -nologo -sta -executionpolicy unrestricted -file $(wslpath -w $scriptPath) $(wslpath -w $imagePath)"\\"$imageName)
+
+# note that there is a return symbol in powershell result
+noImage=$(echo "no image\r")
+
+# check whether image exists
+if [ "$res" = "$noImage" ] ;then
+    echo "no image"
+else
+    echo $(wslpath -u $res)
+fi

src/background.ts

@@ -1,158 +1,6 @@
-import {
+import { bootstrap } from '~/main/lifeCycle'
-  app,
-  globalShortcut,
-  protocol
-} from 'electron'
-import {
-  createProtocol,
-  installVueDevtools
-} from 'vue-cli-plugin-electron-builder/lib'
-import db from '#/datastore'
-import { IWindowList } from '~/main/apis/window/constants'
-import windowManager from '~/main/apis/window/windowManager'
-import {
-  uploadChoosedFiles,
-  uploadClipboardFiles
-} from '~/main/apis/uploader/api'
-import beforeOpen from '~/main/utils/beforeOpen'
-import updateChecker from '~/main/utils/updateChecker'
-import ipcList from '~/main/apis/eventCenter/ipcList'
-import busEventList from '~/main/apis/eventCenter/busEventList'
-import fixPath from 'fix-path'
-import { getUploadFiles } from '~/main/utils/handleArgv'
-import bus from '~/main/utils/eventBus'
-import {
-  updateShortKeyFromVersion212
-} from '~/main/migrate'
-import shortKeyHandler from '~/main/apis/shortKey/shortKeyHandler'
-import server from '~/main/server/index'
-import {
-  createTray
-} from '~/main/apis/app'
 
-const isDevelopment = process.env.NODE_ENV !== 'production'
+bootstrap.launchApp()
-protocol.registerSchemesAsPrivileged([{ scheme: 'picgo', privileges: { secure: true, standard: true } }])
-
-beforeOpen()
-
-// fix the $PATH in macOS
-fixPath()
-
-ipcList.listen()
-busEventList.listen()
-
-const gotTheLock = app.requestSingleInstanceLock()
-
-if (!gotTheLock) {
-  app.quit()
-} else {
-  app.on('second-instance', (event, commandLine, workingDirectory) => {
-    let files = getUploadFiles(commandLine, workingDirectory)
-    if (files === null || files.length > 0) { // 如果有文件列表作为参数，说明是命令行启动
-      if (files === null) {
-        uploadClipboardFiles()
-      } else {
-        const win = windowManager.getAvailableWindow()
-        uploadChoosedFiles(win.webContents, files)
-      }
-    } else {
-      if (windowManager.has(IWindowList.SETTING_WINDOW)) {
-        const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW)!
-        if (settingWindow.isMinimized()) {
-          settingWindow.restore()
-        }
-        settingWindow.focus()
-      }
-    }
-  })
-}
-
-if (process.platform === 'win32') {
-  app.setAppUserModelId('com.molunerfinn.picgo')
-}
-
-if (process.env.XDG_CURRENT_DESKTOP && process.env.XDG_CURRENT_DESKTOP.includes('Unity')) {
-  process.env.XDG_CURRENT_DESKTOP = 'Unity'
-}
-
-app.on('ready', async () => {
-  createProtocol('picgo')
-  if (isDevelopment && !process.env.IS_TEST) {
-    // Install Vue Devtools
-    try {
-      await installVueDevtools()
-    } catch (e) {
-      console.error('Vue Devtools failed to install:', e.toString())
-    }
-  }
-  windowManager.create(IWindowList.TRAY_WINDOW)
-  windowManager.create(IWindowList.SETTING_WINDOW)
-  if (process.platform === 'darwin' || process.platform === 'win32') {
-    createTray()
-  }
-  db.set('needReload', false)
-  updateChecker()
-  // 不需要阻塞
-  process.nextTick(() => {
-    updateShortKeyFromVersion212(db, db.get('settings.shortKey'))
-    shortKeyHandler.init()
-  })
-  server.startup()
-  if (process.env.NODE_ENV !== 'development') {
-    let files = getUploadFiles()
-    if (files === null || files.length > 0) { // 如果有文件列表作为参数，说明是命令行启动
-      if (files === null) {
-        uploadClipboardFiles()
-      } else {
-        const win = windowManager.getAvailableWindow()
-        uploadChoosedFiles(win.webContents, files)
-      }
-    }
-  }
-})
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  createProtocol('picgo')
-  if (!windowManager.has(IWindowList.TRAY_WINDOW)) {
-    windowManager.create(IWindowList.TRAY_WINDOW)
-  }
-  if (!windowManager.has(IWindowList.SETTING_WINDOW)) {
-    windowManager.create(IWindowList.SETTING_WINDOW)
-  }
-})
-
-app.on('will-quit', () => {
-  globalShortcut.unregisterAll()
-  bus.removeAllListeners()
-  server.shutdown()
-})
-
-app.setLoginItemSettings({
-  openAtLogin: db.get('settings.autoStart') || false
-})
-
-// Exit cleanly on request from parent process in development mode.
-if (isDevelopment) {
-  if (process.platform === 'win32') {
-    process.on('message', data => {
-      if (data === 'graceful-exit') {
-        app.quit()
-        server.shutdown()
-      }
-    })
-  } else {
-    process.on('SIGTERM', () => {
-      app.quit()
-      server.shutdown()
-    })
-  }
-}
 
 /**
  * Auto Updater

src/main.ts

@@ -1,13 +1,15 @@
 import Vue from 'vue'
 import App from './renderer/App.vue'
 import router from './renderer/router'
-import db from '#/datastore/index'
 import ElementUI from 'element-ui'
 import { webFrame } from 'electron'
 import 'element-ui/lib/theme-chalk/index.css'
 import VueLazyLoad from 'vue-lazyload'
 import axios from 'axios'
 import mainMixin from './renderer/utils/mainMixin'
+import bus from '@/utils/bus'
+import { initTalkingData } from './renderer/utils/analytics'
+import db from './renderer/utils/db'
 
 webFrame.setVisualZoomLevelLimits(1, 1)
 webFrame.setLayoutZoomLevelLimits(0, 0)
@@ -15,7 +17,6 @@ webFrame.setLayoutZoomLevelLimits(0, 0)
 Vue.config.productionTip = false
 Vue.prototype.$builtInPicBed = [
   'smms',
-  'weibo',
   'imgur',
   'qiniu',
   'tcyun',
@@ -23,8 +24,9 @@ Vue.prototype.$builtInPicBed = [
   'aliyun',
   'github'
 ]
-Vue.prototype.$db = db
+Vue.prototype.$$db = db
 Vue.prototype.$http = axios
+Vue.prototype.$bus = bus
 
 Vue.use(ElementUI)
 Vue.use(VueLazyLoad)
@@ -34,3 +36,5 @@ new Vue({
   router,
   render: h => h(App)
 }).$mount('#app')
+
+initTalkingData()

src/main/apis/README.md

@@ -0,0 +1,13 @@
+# apis folder
+
+## core
+
+The lowest level APIs that are not dependent on each other. The upper APIs depend on them.
+
+## app
+
+Provide key API interfaces for PicGo application, including uploader, window management, shortcut key system, etc
+
+## gui
+
+GuiApi for PicGo plugins.

src/main/apis/app/index.ts

@@ -1,206 +0,0 @@
-import {
-  app,
-  Menu,
-  Tray,
-  dialog,
-  clipboard,
-  systemPreferences,
-  Notification
-} from 'electron'
-import uploader from '~/main/apis/uploader'
-import getPicBeds from '~/main/utils/getPicBeds'
-import db from '#/datastore'
-import windowManager from '~/main/apis/window/windowManager'
-import { IWindowList } from '~/main/apis/window/constants'
-import picgo from '~/main/apis/picgo'
-import pasteTemplate from '#/utils/pasteTemplate'
-import pkg from 'root/package.json'
-let contextMenu: Menu | null
-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
-        })
-        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`
-        })
-      }
-    },
-    {
-      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: '退出'
-    }
-  ])
-}
-
-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
-          })
-        }
-        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()
-      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) {
-      for (let i = 0; i < imgs.length; i++) {
-        clipboard.writeText(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])
-      }
-      trayWindow.webContents.send('dragFiles', imgs)
-    }
-  })
-  // toggleWindow()
-}
-
-export function createMenu () {
-  if (process.env.NODE_ENV !== 'development') {
-    const template = [{
-      label: 'Edit',
-      submenu: [
-        { label: 'Undo', accelerator: 'CmdOrCtrl+Z', selector: 'undo:' },
-        { label: 'Redo', accelerator: 'Shift+CmdOrCtrl+Z', selector: 'redo:' },
-        { type: 'separator' },
-        { label: 'Cut', accelerator: 'CmdOrCtrl+X', selector: 'cut:' },
-        { label: 'Copy', accelerator: 'CmdOrCtrl+C', selector: 'copy:' },
-        { label: 'Paste', accelerator: 'CmdOrCtrl+V', selector: 'paste:' },
-        { label: 'Select All', accelerator: 'CmdOrCtrl+A', selector: 'selectAll:' },
-        {
-          label: 'Quit',
-          accelerator: 'CmdOrCtrl+Q',
-          click () {
-            app.quit()
-          }
-        }
-      ]
-    }]
-    // @ts-ignore
-    menu = Menu.buildFromTemplate(template)
-    Menu.setApplicationMenu(menu)
-  }
-}
-
-const toggleWindow = (bounds: IBounds) => {
-  const trayWindow = windowManager.get(IWindowList.TRAY_WINDOW)!
-  if (trayWindow.isVisible()) {
-    trayWindow.hide()
-  } else {
-    trayWindow.setPosition(bounds.x - 98 + 11, bounds.y, false)
-    trayWindow.webContents.send('updateFiles')
-    trayWindow.show()
-    trayWindow.focus()
-  }
-}

src/main/apis/app/shortKey/shortKeyHandler.ts

@@ -1,21 +1,18 @@
-import bus from '../../utils/eventBus'
+import bus from '@core/bus'
-import PicGoCore from '~/universal/types/picgo'
-import path from 'path'
 import {
-  app,
+  globalShortcut
-  globalShortcut,
-  BrowserWindow
 } from 'electron'
-import logger from '../../utils/logger'
+import logger from '@core/picgo/logger'
-import GuiApi from '../gui'
+import GuiApi from '../../gui'
-import db from '#/datastore'
+import db from '~/main/apis/core/datastore'
+import { TOGGLE_SHORTKEY_MODIFIED_MODE } from '#/events/constants'
 import shortKeyService from './shortKeyService'
-import picgo from '../picgo'
+import picgo from '@core/picgo'
 
 class ShortKeyHandler {
   private isInModifiedMode: boolean = false
   constructor () {
-    bus.on('toggleShortKeyModifiedMode', flag => {
+    bus.on(TOGGLE_SHORTKEY_MODIFIED_MODE, flag => {
       this.isInModifiedMode = flag
     })
   }
@@ -27,14 +24,18 @@ class ShortKeyHandler {
     const commands = db.get('settings.shortKey') as IShortKeyConfigs
     Object.keys(commands)
       .filter(item => item.includes('picgo:'))
-      .map(command => {
+      .forEach(command => {
         const config = commands[command]
-        globalShortcut.register(config.key, () => {
+        // if disabled, don't register #534
-          this.handler(command)
+        if (config.enable) {
-        })
+          globalShortcut.register(config.key, () => {
+            this.handler(command)
+          })
+        }
       })
   }
   private initPluginsShortKey () {
+    // get enabled plugin
     const pluginList = picgo.pluginLoader.getList()
     for (let item of pluginList) {
       const plugin = picgo.pluginLoader.getPlugin(item)
@@ -49,7 +50,10 @@ class ShortKeyHandler {
           const command = `${item}:${cmd.name}`
           if (db.has(`settings.shortKey[${command}]`)) {
             const commandConfig = db.get(`settings.shortKey.${command}`) as IShortKeyConfig
-            this.registerShortKey(commandConfig, command, cmd.handle, false)
+            // if disabled, don't register #534
+            if (commandConfig.enable) {
+              this.registerShortKey(commandConfig, command, cmd.handle, false)
+            }
           } else {
             this.registerShortKey(cmd, command, cmd.handle, true)
           }
@@ -68,6 +72,8 @@ class ShortKeyHandler {
     } else {
       logger.warn(`${command} do not provide a key to bind`)
     }
+    // if the configfile already had this command
+    // then writeFlag -> false
     if (writeFlag) {
       picgo.saveConfig({
         [`settings.shortKey.${command}`]: {
@@ -124,8 +130,7 @@ class ShortKeyHandler {
     } else if (command.includes('picgo-plugin-')) {
       const handler = shortKeyService.getShortKeyHandler(command)
       if (handler) {
-        const guiApi = new GuiApi()
+        return handler(picgo, GuiApi.getInstance())
-        return handler(picgo, guiApi)
       }
     } else {
       logger.warn(`can not find command: ${command}`)

src/main/apis/app/shortKey/shortKeyService.ts

@@ -1,4 +1,4 @@
-import logger from '../../utils/logger'
+import logger from '@core/picgo/logger'
 class ShortKeyService {
   private commandList: Map<string, IShortKeyHandler> = new Map()
   registerCommand (command: string, handler: IShortKeyHandler) {

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

@@ -0,0 +1,276 @@
+import {
+  app,
+  Menu,
+  Tray,
+  dialog,
+  clipboard,
+  systemPreferences,
+  Notification
+} from 'electron'
+import uploader from 'apis/app/uploader'
+import getPicBeds from '~/main/utils/getPicBeds'
+import db, { GalleryDB } from '~/main/apis/core/datastore'
+import windowManager from 'apis/app/window/windowManager'
+import { IWindowList } from 'apis/app/window/constants'
+import picgo from '@core/picgo'
+import pasteTemplate from '#/utils/pasteTemplate'
+import pkg from 'root/package.json'
+import { handleCopyUrl } from '~/main/utils/common'
+import { privacyManager } from '~/main/utils/privacyManager'
+let contextMenu: Menu | null
+let menu: Menu | null
+let tray: Tray | null
+export function createContextMenu () {
+  const picBeds = getPicBeds()
+  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`
+          })
+        }
+      },
+      {
+        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 () {
+          privacyManager.show(false)
+        }
+      },
+      {
+        label: '重启应用',
+        click () {
+          app.relaunch()
+          app.exit(0)
+        }
+      },
+      // @ts-ignore
+      {
+        role: 'quit',
+        label: '退出'
+      }
+    ])
+  } 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()
+        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`)
+    })
+
+    // drop-files only be supported in macOS
+    // so the tray window must be available
+    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], db.get('settings.customLink')))
+          const notification = new Notification({
+            title: '上传成功',
+            body: imgs[i].imgUrl!,
+            icon: files[i]
+          })
+          setTimeout(() => {
+            notification.show()
+          }, i * 100)
+          await GalleryDB.getInstance().insert(imgs[i])
+        }
+        handleCopyUrl(pasteText.join('\n'))
+        trayWindow.webContents.send('dragFiles', imgs)
+      }
+    })
+    // toggleWindow()
+  } else if (process.platform === 'linux') {
+  // click事件在Ubuntu上无法触发，Unity不支持（在Mac和Windows上可以触发）
+  // 需要使用 setContextMenu 设置菜单
+    createContextMenu()
+    tray!.setContextMenu(contextMenu)
+  }
+}
+
+export function createMenu () {
+  if (process.env.NODE_ENV !== 'development') {
+    const template = [{
+      label: 'Edit',
+      submenu: [
+        { label: 'Undo', accelerator: 'CmdOrCtrl+Z', selector: 'undo:' },
+        { label: 'Redo', accelerator: 'Shift+CmdOrCtrl+Z', selector: 'redo:' },
+        { type: 'separator' },
+        { label: 'Cut', accelerator: 'CmdOrCtrl+X', selector: 'cut:' },
+        { label: 'Copy', accelerator: 'CmdOrCtrl+C', selector: 'copy:' },
+        { label: 'Paste', accelerator: 'CmdOrCtrl+V', selector: 'paste:' },
+        { label: 'Select All', accelerator: 'CmdOrCtrl+A', selector: 'selectAll:' },
+        {
+          label: 'Quit',
+          accelerator: 'CmdOrCtrl+Q',
+          click () {
+            app.quit()
+          }
+        }
+      ]
+    }]
+    // @ts-ignore
+    menu = Menu.buildFromTemplate(template)
+    Menu.setApplicationMenu(menu)
+  }
+}
+
+const toggleWindow = (bounds: IBounds) => {
+  const trayWindow = windowManager.get(IWindowList.TRAY_WINDOW)!
+  if (trayWindow.isVisible()) {
+    trayWindow.hide()
+  } else {
+    trayWindow.setPosition(bounds.x - 98 + 11, bounds.y, false)
+    trayWindow.webContents.send('updateFiles')
+    trayWindow.show()
+    trayWindow.focus()
+  }
+}

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

@@ -1,34 +1,36 @@
 import {
-  clipboard,
   Notification,
   WebContents
 } from 'electron'
-import windowManager from '~/main/apis/window/windowManager'
+import windowManager from 'apis/app/window/windowManager'
-import { IWindowList } from '~/main/apis/window/constants'
+import { IWindowList } from 'apis/app/window/constants'
-import uploader from './'
+import uploader from '.'
 import pasteTemplate from '#/utils/pasteTemplate'
-import db from '#/datastore'
+import db, { GalleryDB } from '~/main/apis/core/datastore'
+import { handleCopyUrl } from '~/main/utils/common'
+import { handleUrlEncode } from '#/utils/common'
 export const uploadClipboardFiles = async (): Promise<string> => {
   const win = windowManager.getAvailableWindow()
   let img = await uploader.setWebContents(win!.webContents).upload()
   if (img !== false) {
     if (img.length > 0) {
-      const trayWindow = windowManager.get(IWindowList.TRAY_WINDOW)!
+      const trayWindow = windowManager.get(IWindowList.TRAY_WINDOW)
       const pasteStyle = db.get('settings.pasteStyle') || 'markdown'
-      clipboard.writeText(pasteTemplate(pasteStyle, img[0]))
+      handleCopyUrl(pasteTemplate(pasteStyle, img[0], db.get('settings.customLink')))
       const notification = new Notification({
         title: '上传成功',
         body: img[0].imgUrl!,
         icon: img[0].imgUrl
       })
       notification.show()
-      db.insert('uploaded', img[0])
+      await GalleryDB.getInstance().insert(img[0])
-      trayWindow.webContents.send('clipboardFiles', [])
+      // trayWindow just be created in mac/windows, not in linux
-      trayWindow.webContents.send('uploadFiles', img)
+      trayWindow?.webContents?.send('clipboardFiles', [])
+      trayWindow?.webContents?.send('uploadFiles', img)
       if (windowManager.has(IWindowList.SETTING_WINDOW)) {
         windowManager.get(IWindowList.SETTING_WINDOW)!.webContents.send('updateGallery')
       }
-      return img[0].imgUrl as string
+      return handleUrlEncode(img[0].imgUrl as string)
     } else {
       const notification = new Notification({
         title: '上传不成功',
@@ -48,9 +50,9 @@ export const uploadChoosedFiles = async (webContents: WebContents, files: IFileW
   const result = []
   if (imgs !== false) {
     const pasteStyle = db.get('settings.pasteStyle') || 'markdown'
-    let pasteText = ''
+    const pasteText: string[] = []
     for (let i = 0; i < imgs.length; i++) {
-      pasteText += pasteTemplate(pasteStyle, imgs[i]) + '\r\n'
+      pasteText.push(pasteTemplate(pasteStyle, imgs[i], db.get('settings.customLink')))
       const notification = new Notification({
         title: '上传成功',
         body: imgs[i].imgUrl!,
@@ -59,11 +61,12 @@ export const uploadChoosedFiles = async (webContents: WebContents, files: IFileW
       setTimeout(() => {
         notification.show()
       }, i * 100)
-      db.insert('uploaded', imgs[i])
+      await GalleryDB.getInstance().insert(imgs[i])
-      result.push(imgs[i].imgUrl!)
+      result.push(handleUrlEncode(imgs[i].imgUrl!))
     }
-    clipboard.writeText(pasteText)
+    handleCopyUrl(pasteText.join('\n'))
-    windowManager.get(IWindowList.TRAY_WINDOW)!.webContents.send('uploadFiles', imgs)
+    // trayWindow just be created in mac/windows, not in linux
+    windowManager.get(IWindowList.TRAY_WINDOW)?.webContents?.send('uploadFiles', imgs)
     if (windowManager.has(IWindowList.SETTING_WINDOW)) {
       windowManager.get(IWindowList.SETTING_WINDOW)!.webContents.send('updateGallery')
     }

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

@@ -0,0 +1,142 @@
+import {
+  Notification,
+  BrowserWindow,
+  ipcMain,
+  WebContents
+} from 'electron'
+import dayjs from 'dayjs'
+import picgo from '@core/picgo'
+import db from '~/main/apis/core/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, calcDurationRange } from '~/main/utils/common'
+import { TALKING_DATA_EVENT } from '~/universal/events/constants'
+import logger from '@core/picgo/logger'
+
+const waitForShow = (webcontent: WebContents) => {
+  return new Promise<void>((resolve, reject) => {
+    webcontent.on('did-finish-load', () => {
+      resolve()
+    })
+  })
+}
+
+const waitForRename = (window: BrowserWindow, id: number): Promise<string|null> => {
+  return new Promise((resolve, reject) => {
+    const windowId = window.id
+    ipcMain.once(`rename${id}`, (evt: Event, newName: string) => {
+      resolve(newName)
+      window.close()
+    })
+    window.on('close', () => {
+      resolve(null)
+      ipcMain.removeAllListeners(`rename${id}`)
+      windowManager.deleteById(windowId)
+    })
+  })
+}
+
+const handleTalkingData = (webContents: WebContents, options: IAnalyticsData) => {
+  const data: ITalkingDataOptions = {
+    EventId: 'upload',
+    Label: options.type,
+    MapKv: {
+      by: options.fromClipboard ? 'clipboard' : 'files', // 上传剪贴板图片还是选择的文文件
+      count: options.count, // 上传的数量
+      duration: calcDurationRange(options.duration || 0), // 上传耗时
+      type: options.type
+    }
+  }
+  webContents.send(TALKING_DATA_EVENT, data)
+}
+
+class Uploader {
+  private webContents: WebContents | null = null
+  // private uploading: boolean = false
+  constructor () {
+    this.init()
+  }
+
+  init () {
+    picgo.on('notification', message => {
+      const notification = new Notification(message)
+      notification.show()
+    })
+
+    picgo.on('uploadProgress', progress => {
+      this.webContents?.send('uploadProgress', progress)
+    })
+    picgo.on('beforeTransform', ctx => {
+      if (db.get('settings.uploadNotification')) {
+        const notification = new Notification({
+          title: '上传进度',
+          body: '正在上传'
+        })
+        notification.show()
+      }
+    })
+    picgo.helper.beforeUploadPlugins.register('renameFn', {
+      handle: async (ctx: IPicGo) => {
+        const rename = db.get('settings.rename')
+        const autoRename = db.get('settings.autoRename')
+        if (autoRename || rename) {
+          await Promise.all(ctx.output.map(async (item, index) => {
+            let name: undefined | string | null
+            let fileName: string | undefined
+            if (autoRename) {
+              fileName = dayjs().add(index, 'ms').format('YYYYMMDDHHmmSSS') + item.extname
+            } else {
+              fileName = item.fileName
+            }
+            if (rename) {
+              const window = windowManager.create(IWindowList.RENAME_WINDOW)!
+              await waitForShow(window.webContents)
+              window.webContents.send('rename', fileName, window.webContents.id)
+              name = await waitForRename(window, window.webContents.id)
+            }
+            item.fileName = name || fileName
+          }))
+        }
+      }
+    })
+  }
+
+  setWebContents (webContents: WebContents) {
+    this.webContents = webContents
+    return this
+  }
+
+  async upload (img?: IUploadOption): Promise<ImgInfo[]|false> {
+    try {
+      const startTime = Date.now()
+      const output = await picgo.upload(img)
+      if (Array.isArray(output) && output.some((item: ImgInfo) => item.imgUrl)) {
+        if (this.webContents) {
+          handleTalkingData(this.webContents, {
+            fromClipboard: !img,
+            type: db.get('picBed.uploader') || db.get('picBed.current') || 'smms',
+            count: img ? img.length : 1,
+            duration: Date.now() - startTime
+          } as IAnalyticsData)
+        }
+        return output.filter(item => item.imgUrl)
+      } else {
+        return false
+      }
+    } catch (e) {
+      logger.error(e)
+      setTimeout(() => {
+        showNotification({
+          title: '上传失败',
+          body: util.format(e.stack),
+          clickToCopy: true
+        })
+      }, 500)
+      return false
+    }
+  }
+}
+
+export default new Uploader()

src/main/apis/app/window/constants.ts

@@ -12,8 +12,8 @@ export const TRAY_WINDOW_URL = isDevelopment
   : `picgo://./index.html`
 
 export const SETTING_WINDOW_URL = isDevelopment
-  ? `${(process.env.WEBPACK_DEV_SERVER_URL as string)}#setting/upload`
+  ? `${(process.env.WEBPACK_DEV_SERVER_URL as string)}#main-page/upload`
-  : `picgo://./index.html#setting/upload`
+  : `picgo://./index.html#main-page/upload`
 
 export const MINI_WINDOW_URL = isDevelopment
   ? `${(process.env.WEBPACK_DEV_SERVER_URL as string)}#mini-page`
@@ -22,6 +22,3 @@ export const MINI_WINDOW_URL = isDevelopment
 export const RENAME_WINDOW_URL = process.env.NODE_ENV === 'development'
   ? `${(process.env.WEBPACK_DEV_SERVER_URL as string)}#rename-page`
   : `picgo://./index.html#rename-page`
-
-export const DELETE_WINDOW_EVENT = 'DELETE_WINDOW_EVENT'
-export const CREATE_WINDOW_EVENT = 'CREATE_WINDOW_EVENT'

src/main/apis/app/window/windowList.ts

@@ -1,18 +1,16 @@
 import {
   IWindowList,
-  DELETE_WINDOW_EVENT,
-  CREATE_WINDOW_EVENT,
   SETTING_WINDOW_URL,
   TRAY_WINDOW_URL,
   MINI_WINDOW_URL,
   RENAME_WINDOW_URL
 } from './constants'
 import { IWindowListItem } from '#/types/electron'
-import bus from '~/main/utils/eventBus'
+import bus from '@core/bus'
-import db from '#/datastore'
+import { CREATE_APP_MENU } from '@core/bus/constants'
-import { getWindowId } from '~/main/apis/bus'
+import db from '~/main/apis/core/datastore'
-import { BrowserWindow, app } from 'electron'
+import { TOGGLE_SHORTKEY_MODIFIED_MODE } from '#/events/constants'
-import { CREATE_APP_MENU } from '~/main/apis/bus/constants'
+import { app } from 'electron'
 
 const windowList = new Map<IWindowList, IWindowListItem>()
 
@@ -37,14 +35,9 @@ windowList.set(IWindowList.TRAY_WINDOW, {
     }
   },
   callback (window) {
-    const id = window!.id
+    window.loadURL(TRAY_WINDOW_URL)
-    window!.loadURL(TRAY_WINDOW_URL)
+    window.on('blur', () => {
-    window!.on('closed', () => {
+      window.hide()
-      bus.emit(DELETE_WINDOW_EVENT, id)
-    })
-
-    window!.on('blur', () => {
-      window!.hide()
     })
   }
 })
@@ -81,12 +74,10 @@ windowList.set(IWindowList.SETTING_WINDOW, {
     }
     return options
   },
-  callback (window) {
+  callback (window, windowManager) {
-    const id = window!.id
+    window.loadURL(SETTING_WINDOW_URL)
-    window!.loadURL(SETTING_WINDOW_URL)
+    window.on('closed', () => {
-    window!.on('closed', () => {
+      bus.emit(TOGGLE_SHORTKEY_MODIFIED_MODE, false)
-      bus.emit('toggleShortKeyModifiedMode', false)
-      bus.emit(DELETE_WINDOW_EVENT, id)
       if (process.platform === 'linux') {
         process.nextTick(() => {
           app.quit()
@@ -94,7 +85,7 @@ windowList.set(IWindowList.SETTING_WINDOW, {
       }
     })
     bus.emit(CREATE_APP_MENU)
-    bus.emit(CREATE_WINDOW_EVENT, IWindowList.MINI_WINDOW)
+    windowManager.create(IWindowList.MINI_WINDOW)
   }
 })
 
@@ -125,11 +116,7 @@ windowList.set(IWindowList.MINI_WINDOW, {
     return obj
   },
   callback (window) {
-    const id = window!.id
+    window.loadURL(MINI_WINDOW_URL)
-    window!.loadURL(MINI_WINDOW_URL)
-    window!.on('closed', () => {
-      bus.emit(DELETE_WINDOW_EVENT, id)
-    })
   }
 })
 
@@ -158,10 +145,9 @@ windowList.set(IWindowList.RENAME_WINDOW, {
     }
     return options
   },
-  async callback (window) {
+  async callback (window, windowManager) {
-    window!.loadURL(RENAME_WINDOW_URL)
+    window.loadURL(RENAME_WINDOW_URL)
-    const currentWindowId = await getWindowId()
+    const currentWindow = windowManager.getAvailableWindow()
-    const currentWindow = BrowserWindow.fromId(currentWindowId)
     if (currentWindow && currentWindow.isVisible()) {
     // bounds: { x: 821, y: 75, width: 800, height: 450 }
       const bounds = currentWindow.getBounds()
@@ -173,7 +159,7 @@ windowList.set(IWindowList.RENAME_WINDOW, {
       } else { // if is the miniWindow
         positionY = bounds.y + bounds.height / 2
       }
-      window!.setPosition(positionX, positionY, false)
+      window.setPosition(positionX, positionY, false)
     }
   }
 })

src/main/apis/app/window/windowManager.ts

@@ -4,26 +4,20 @@ import {
 import { IWindowManager, IWindowListItem } from '#/types/electron'
 import windowList from './windowList'
 import {
-  IWindowList,
+  IWindowList
-  DELETE_WINDOW_EVENT,
-  CREATE_WINDOW_EVENT
 } from './constants'
-import bus from '~/main/utils/eventBus'
 
 class WindowManager implements IWindowManager {
   private windowMap: Map<IWindowList | string, BrowserWindow> = new Map()
   private windowIdMap: Map<number, IWindowList | string> = new Map()
-  constructor () {
+  create (name: IWindowList) {
-    bus.on(DELETE_WINDOW_EVENT, this.deleteById)
-    bus.on(CREATE_WINDOW_EVENT, this.create)
-  }
-  create = (name: IWindowList) => {
     const windowConfig: IWindowListItem = windowList.get(name)!
     if (windowConfig.isValid) {
       if (!windowConfig.multiple) {
-        if (this.windowMap.has(name)) return this.windowMap.get(name)!
+        if (this.has(name)) return this.windowMap.get(name)!
       }
       const window = new BrowserWindow(windowConfig.options())
+      const id = window.id
       if (windowConfig.multiple) {
         this.windowMap.set(`${name}_${window.id}`, window)
         this.windowIdMap.set(window.id, `${name}_${window.id}`)
@@ -31,14 +25,17 @@ class WindowManager implements IWindowManager {
         this.windowMap.set(name, window)
         this.windowIdMap.set(window.id, name)
       }
-      windowConfig.callback(window)
+      windowConfig.callback(window, this)
+      window.on('close', () => {
+        this.deleteById(id)
+      })
       return window
     } else {
       return null
     }
   }
   get (name: IWindowList) {
-    if (this.windowMap.has(name)) {
+    if (this.has(name)) {
       return this.windowMap.get(name)!
     } else {
       const window = this.create(name)
@@ -48,13 +45,14 @@ class WindowManager implements IWindowManager {
   has (name: IWindowList) {
     return this.windowMap.has(name)
   }
-  delete = (name: IWindowList) => {
+  // useless
-    const window = this.windowMap.get(name)
+  // delete (name: IWindowList) {
-    if (window) {
+  //   const window = this.windowMap.get(name)
-      this.windowIdMap.delete(window.id)
+  //   if (window) {
-      this.windowMap.delete(name)
+  //     this.windowIdMap.delete(window.id)
-    }
+  //     this.windowMap.delete(name)
-  }
+  //   }
+  // }
   deleteById = (id: number) => {
     const name = this.windowIdMap.get(id)
     if (name) {

src/main/apis/core/bus/apis.ts

@@ -1,4 +1,4 @@
-import bus from '../../utils/eventBus'
+import bus from '.'
 import {
   UPLOAD_WITH_FILES,
   UPLOAD_WITH_FILES_RESPONSE,

src/main/apis/core/datastore/dbChecker.ts

@@ -0,0 +1,137 @@
+import fs from 'fs-extra'
+import path from 'path'
+import { remote, app } from 'electron'
+import dayjs from 'dayjs'
+import { getLogger } from '@core/utils/localLogger'
+const APP = process.type === 'renderer' ? remote.app : app
+const STORE_PATH = APP.getPath('userData')
+const configFilePath = path.join(STORE_PATH, 'data.json')
+const configFileBackupPath = path.join(STORE_PATH, 'data.bak.json')
+export const defaultConfigPath = configFilePath
+let _configFilePath = ''
+let hasCheckPath = false
+
+const errorMsg = {
+  broken: 'PicGo 配置文件损坏，已经恢复为默认配置',
+  brokenButBackup: 'PicGo 配置文件损坏，已经恢复为备份配置'
+}
+
+/** ensure notification list */
+if (!global.notificationList) global.notificationList = []
+
+function dbChecker () {
+  if (process.type !== 'renderer') {
+    // db save bak
+    try {
+      const { dbPath, dbBackupPath } = getGalleryDBPath()
+      if (fs.existsSync(dbPath)) {
+        fs.copyFileSync(dbPath, dbBackupPath)
+      }
+    } catch (e) {
+      console.error(e)
+    }
+
+    const configFilePath = dbPathChecker()
+    if (!fs.existsSync(configFilePath)) {
+      return
+    }
+    let configFile: string = '{}'
+    let optionsTpl = {
+      title: '注意',
+      body: ''
+    }
+    // config save bak
+    try {
+      configFile = fs.readFileSync(configFilePath, { encoding: 'utf-8' })
+      JSON.parse(configFile)
+    } catch (e) {
+      fs.unlinkSync(configFilePath)
+      if (fs.existsSync(configFileBackupPath)) {
+        try {
+          configFile = fs.readFileSync(configFileBackupPath, { encoding: 'utf-8' })
+          JSON.parse(configFile)
+          fs.writeFileSync(configFilePath, configFile, { encoding: 'utf-8' })
+          const stats = fs.statSync(configFileBackupPath)
+          optionsTpl.body = `${errorMsg.brokenButBackup}\n备份文件版本：${dayjs(stats.mtime).format('YYYY-MM-DD HH:mm:ss')}`
+          global.notificationList?.push(optionsTpl)
+          return
+        } catch (e) {
+          optionsTpl.body = errorMsg.broken
+          global.notificationList?.push(optionsTpl)
+          return
+        }
+      }
+      optionsTpl.body = errorMsg.broken
+      global.notificationList?.push(optionsTpl)
+      return
+    }
+    fs.writeFileSync(configFileBackupPath, configFile, { encoding: 'utf-8' })
+  }
+}
+
+/**
+ * Get config path
+ */
+function dbPathChecker (): string {
+  if (_configFilePath) {
+    return _configFilePath
+  }
+  // defaultConfigPath
+  _configFilePath = defaultConfigPath
+  // if defaultConfig path is not exit
+  // do not parse the content of config
+  if (!fs.existsSync(defaultConfigPath)) {
+    return _configFilePath
+  }
+  try {
+    const configString = fs.readFileSync(defaultConfigPath, { encoding: 'utf-8' })
+    const config = JSON.parse(configString)
+    const userConfigPath: string = config.configPath || ''
+    if (userConfigPath) {
+      if (fs.existsSync(userConfigPath) && userConfigPath.endsWith('.json')) {
+        _configFilePath = userConfigPath
+        return _configFilePath
+      }
+    }
+    return _configFilePath
+  } catch (e) {
+    const picgoLogPath = path.join(defaultConfigPath, 'picgo.log')
+    const logger = getLogger(picgoLogPath)
+    if (!hasCheckPath) {
+      let optionsTpl = {
+        title: '注意',
+        body: '自定义文件解析出错，请检查路径内容是否正确'
+      }
+      global.notificationList?.push(optionsTpl)
+      hasCheckPath = true
+    }
+    logger('error', e)
+    console.error(e)
+    _configFilePath = defaultConfigPath
+    return _configFilePath
+  }
+}
+
+function dbPathDir () {
+  return path.dirname(dbPathChecker())
+}
+
+function getGalleryDBPath (): {
+  dbPath: string
+  dbBackupPath: string
+} {
+  const configPath = dbPathChecker()
+  const dbPath = path.join(path.dirname(configPath), 'picgo.db')
+  const dbBackupPath = path.join(path.dirname(dbPath), 'picgo.bak.db')
+  return {
+    dbPath,
+    dbBackupPath
+  }
+}
+
+export {
+  dbChecker,
+  dbPathChecker,
+  dbPathDir,
+  getGalleryDBPath
+}

src/main/apis/core/datastore/index.ts

@@ -2,34 +2,34 @@ import Datastore from 'lowdb'
 // @ts-ignore
 import LodashId from 'lodash-id'
 import FileSync from 'lowdb/adapters/FileSync'
-import path from 'path'
 import fs from 'fs-extra'
-import { remote, app } from 'electron'
+import { dbPathChecker, dbPathDir, getGalleryDBPath } from './dbChecker'
+import { DBStore } from '@picgo/store'
 
-const APP = process.type === 'renderer' ? remote.app : app
+const STORE_PATH = dbPathDir()
-const STORE_PATH = APP.getPath('userData')
 
-if (process.type !== 'renderer') {
+if (!fs.pathExistsSync(STORE_PATH)) {
-  if (!fs.pathExistsSync(STORE_PATH)) {
+  fs.mkdirpSync(STORE_PATH)
-    fs.mkdirpSync(STORE_PATH)
-  }
 }
+const CONFIG_PATH: string = dbPathChecker()
+const DB_PATH: string = getGalleryDBPath().dbPath
 
-class DB {
+// TODO: use JSONStore with @picgo/store
+class ConfigStore {
   private db: Datastore.LowdbSync<Datastore.AdapterSync>
   constructor () {
-    const adapter = new FileSync(path.join(STORE_PATH, '/data.json'))
+    const adapter = new FileSync(CONFIG_PATH)
 
     this.db = Datastore(adapter)
     this.db._.mixin(LodashId)
 
-    if (!this.db.has('uploaded').value()) {
-      this.db.set('uploaded', []).write()
-    }
-
     if (!this.db.has('picBed').value()) {
       this.db.set('picBed', {
-        current: 'weibo'
+        current: 'smms', // deprecated
+        uploader: 'smms',
+        smms: {
+          token: ''
+        }
       }).write()
     }
 
@@ -69,6 +69,27 @@ class DB {
     // @ts-ignore
     return this.read().get(key).removeById(id).write()
   }
+  getConfigPath () {
+    return CONFIG_PATH
+  }
 }
 
-export default new DB()
+export default new ConfigStore()
+
+// v2.3.0 add gallery db
+class GalleryDB {
+  private static instance: DBStore
+  private constructor () {
+    console.log('init gallery db')
+  }
+  public static getInstance (): DBStore {
+    if (!GalleryDB.instance) {
+      GalleryDB.instance = new DBStore(DB_PATH, 'gallery')
+    }
+    return GalleryDB.instance
+  }
+}
+
+export {
+  GalleryDB
+}

src/main/apis/core/picgo/index.ts

@@ -1,14 +1,13 @@
 import PicGoCore from '~/universal/types/picgo'
-import {
+import { dbChecker, dbPathChecker } from 'apis/core/datastore/dbChecker'
-  app
+import pkg from 'root/package.json'
-} from 'electron'
-import path from 'path'
 // eslint-disable-next-line
 const requireFunc = typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require
 const PicGo = requireFunc('picgo') as typeof PicGoCore
-const STORE_PATH = app.getPath('userData')
 
-const CONFIG_PATH = path.join(STORE_PATH, '/data.json')
+const CONFIG_PATH = dbPathChecker()
+
+dbChecker()
 
 const picgo = new PicGo(CONFIG_PATH)
 picgo.saveConfig({
@@ -16,4 +15,7 @@ picgo.saveConfig({
   PICGO_ENV: 'GUI'
 })
 
-export default picgo as PicGoCore
+global.PICGO_GUI_VERSION = pkg.version
+picgo.GUI_VERSION = global.PICGO_GUI_VERSION
+
+export default picgo! as PicGoCore

src/main/apis/core/picgo/logger.ts

@@ -0,0 +1,5 @@
+import picgo from '.'
+
+const logger = picgo.log
+
+export default logger

src/main/apis/core/utils/localLogger.ts

@@ -0,0 +1,32 @@
+import fs from 'fs-extra'
+import dayjs from 'dayjs'
+import util from 'util'
+
+/**
+ * for local log before picgo inited
+ */
+const getLogger = (logPath: string) => {
+  if (!fs.existsSync(logPath)) {
+    fs.ensureFileSync(logPath)
+  }
+  return (type: string, ...msg: any[]) => {
+    let log = `${dayjs().format('YYYY-MM-DD HH:mm:ss')} [PicGo ${type.toUpperCase()}] `
+    msg.forEach((item: ILogArgvTypeWithError) => {
+      if (typeof item === 'object' && type === 'error') {
+        log += `\n------Error Stack Begin------\n${util.format(item.stack)}\n-------Error Stack End------- `
+      } else {
+        if (typeof item === 'object') {
+          item = JSON.stringify(item)
+        }
+        log += `${item} `
+      }
+    })
+    log += '\n'
+    // A synchronized approach to avoid log msg sequence errors
+    fs.appendFileSync(logPath, log)
+  }
+}
+
+export {
+  getLogger
+}

src/main/apis/eventCenter/picgoCoreIPC.ts

@@ -1,225 +0,0 @@
-import path from 'path'
-import GuiApi from '../gui'
-import {
-  dialog,
-  shell,
-  IpcMainEvent,
-  ipcMain,
-  app
-} from 'electron'
-import PicGoCore from '~/universal/types/picgo'
-import { IPicGoHelperType } from '#/types/enum'
-import shortKeyHandler from '../shortKey/shortKeyHandler'
-import picgo from '~/main/apis/picgo'
-
-// eslint-disable-next-line
-const requireFunc = typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require
-// const PluginHandler = requireFunc('picgo/dist/lib/PluginHandler').default
-const STORE_PATH = app.getPath('userData')
-// const CONFIG_PATH = path.join(STORE_PATH, '/data.json')
-
-type PicGoNotice = {
-  title: string,
-  body: string[]
-}
-
-interface GuiMenuItem {
-  label: string
-  handle: (arg0: PicGoCore, arg1: GuiApi) => Promise<void>
-}
-
-// get uploader or transformer config
-const getConfig = (name: string, type: IPicGoHelperType, ctx: PicGoCore) => {
-  let config: any[] = []
-  if (name === '') {
-    return config
-  } else {
-    const handler = ctx.helper[type].get(name)
-    if (handler) {
-      if (handler.config) {
-        config = handler.config(ctx)
-      }
-    }
-    return config
-  }
-}
-
-const handleConfigWithFunction = (config: any[]) => {
-  for (let i in config) {
-    if (typeof config[i].default === 'function') {
-      config[i].default = config[i].default()
-    }
-    if (typeof config[i].choices === 'function') {
-      config[i].choices = config[i].choices()
-    }
-  }
-  return config
-}
-
-const handleGetPluginList = () => {
-  ipcMain.on('getPluginList', (event: IpcMainEvent) => {
-    const pluginList = picgo.pluginLoader.getList()
-    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)
-    }
-    event.sender.send('pluginList', list)
-    picgo.cmd.program.removeAllListeners()
-  })
-}
-
-const handlePluginInstall = () => {
-  ipcMain.on('installPlugin', async (event: IpcMainEvent, msg: string) => {
-    picgo.once('installSuccess', (notice: PicGoNotice) => {
-      event.sender.send('installSuccess', notice.body[0].replace(/picgo-plugin-/, ''))
-      shortKeyHandler.registerPluginShortKey(notice.body[0])
-      picgo.removeAllListeners('installFailed')
-    })
-    picgo.once('installFailed', () => {
-      handleNPMError()
-      picgo.removeAllListeners('installSuccess')
-    })
-    await picgo.pluginHandler.install([msg])
-    picgo.cmd.program.removeAllListeners()
-  })
-}
-
-const handlePluginUninstall = () => {
-  ipcMain.on('uninstallPlugin', async (event: IpcMainEvent, msg: string) => {
-    picgo.once('uninstallSuccess', (notice: PicGoNotice) => {
-      event.sender.send('uninstallSuccess', notice.body[0].replace(/picgo-plugin-/, ''))
-      shortKeyHandler.unregisterPluginShortKey(notice.body[0])
-      picgo.removeAllListeners('uninstallFailed')
-    })
-    picgo.once('uninstallFailed', () => {
-      handleNPMError()
-      picgo.removeAllListeners('uninstallSuccess')
-    })
-    await picgo.pluginHandler.uninstall([msg])
-    picgo.cmd.program.removeAllListeners()
-  })
-}
-
-const handlePluginUpdate = () => {
-  ipcMain.on('updatePlugin', async (event: IpcMainEvent, msg: string) => {
-    picgo.once('updateSuccess', (notice: { body: string[], title: string }) => {
-      event.sender.send('updateSuccess', notice.body[0].replace(/picgo-plugin-/, ''))
-      picgo.removeAllListeners('updateFailed')
-    })
-    picgo.once('updateFailed', () => {
-      handleNPMError()
-      picgo.removeAllListeners('updateSuccess')
-    })
-    await picgo.pluginHandler.update([msg])
-    picgo.cmd.program.removeAllListeners()
-  })
-}
-
-const handleNPMError = () => {
-  dialog.showMessageBox({
-    title: '发生错误',
-    message: '请安装Node.js并重启PicGo再继续操作',
-    buttons: ['Yes']
-  }).then((res) => {
-    if (res.response === 0) {
-      shell.openExternal('https://nodejs.org/')
-    }
-  })
-}
-
-const handleGetPicBedConfig = () => {
-  ipcMain.on('getPicBedConfig', (event: IpcMainEvent, type: string) => {
-    const name = picgo.helper.uploader.get(type).name || type
-    if (picgo.helper.uploader.get(type).config) {
-      const config = handleConfigWithFunction(picgo.helper.uploader.get(type).config(picgo))
-      event.sender.send('getPicBedConfig', config, name)
-    } 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 guiApi = new GuiApi()
-    if (plugin.guiMenu && plugin.guiMenu(picgo).length > 0) {
-      const menu: GuiMenuItem[] = plugin.guiMenu(picgo)
-      menu.forEach(item => {
-        if (item.label === label) {
-          item.handle(picgo, guiApi)
-        }
-      })
-    }
-  })
-}
-
-const handleRemoveFiles = () => {
-  ipcMain.on('removeFiles', (event: IpcMainEvent, files: ImgInfo[]) => {
-    const guiApi = new GuiApi()
-    setTimeout(() => {
-      picgo.emit('remove', files, guiApi)
-    }, 500)
-  })
-}
-
-const handlePicGoSaveData = () => {
-  ipcMain.on('picgoSaveData', (event: IpcMainEvent, data: IObj) => {
-    picgo.saveConfig(data)
-  })
-}
-
-export default {
-  listen () {
-    handleGetPluginList()
-    handlePluginInstall()
-    handlePluginUninstall()
-    handlePluginUpdate()
-    handleGetPicBedConfig()
-    handlePluginActions()
-    handleRemoveFiles()
-    handlePicGoSaveData()
-  }
-}

src/main/apis/gui/index.ts

@@ -1,21 +1,39 @@
 import {
   dialog,
   BrowserWindow,
-  clipboard,
   Notification,
   ipcMain
 } from 'electron'
-import db from '#/datastore'
+import path from 'path'
-import uploader from '../uploader'
+import db, { GalleryDB } from 'apis/core/datastore'
+import { dbPathChecker, defaultConfigPath, getGalleryDBPath } from 'apis/core/datastore/dbChecker'
+import uploader from 'apis/app/uploader'
 import pasteTemplate from '#/utils/pasteTemplate'
+import { handleCopyUrl } from '~/main/utils/common'
 import {
   getWindowId,
   getSettingWindowId
-} from '~/main/apis/bus'
+} from '@core/bus/apis'
+import {
+  SHOW_INPUT_BOX
+} from '~/universal/events/constants'
+import { DBStore } from '@picgo/store'
+type PromiseResType<T> = T extends Promise<infer R> ? R : T
 
+// Cross-process support may be required in the future
 class GuiApi implements IGuiApi {
+  private static instance: GuiApi
   private windowId: number = -1
   private settingWindowId: number = -1
+  private constructor () {
+    console.log('init guiapi')
+  }
+  public static getInstance (): GuiApi {
+    if (!GuiApi.instance) {
+      GuiApi.instance = new GuiApi()
+    }
+    return GuiApi.instance
+  }
   private async showSettingWindow () {
     this.settingWindowId = await getSettingWindowId()
     const settingWindow = BrowserWindow.fromId(this.settingWindowId)
@@ -23,7 +41,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.
@@ -40,9 +58,9 @@ class GuiApi implements IGuiApi {
   }) {
     await this.showSettingWindow()
     this.getWebcontentsByWindowId(this.settingWindowId)
-      .send('showInputBox', options)
+      .send(SHOW_INPUT_BOX, options)
     return new Promise<string>((resolve, reject) => {
-      ipcMain.once('showInputBox', (event: Event, value: string) => {
+      ipcMain.once(SHOW_INPUT_BOX, (event: Event, value: string) => {
         resolve(value)
       })
     })
@@ -63,9 +81,9 @@ class GuiApi implements IGuiApi {
     const imgs = await uploader.setWebContents(webContents).upload(input)
     if (imgs !== false) {
       const pasteStyle = db.get('settings.pasteStyle') || 'markdown'
-      let pasteText = ''
+      const pasteText: string[] = []
       for (let i = 0; i < imgs.length; i++) {
-        pasteText += pasteTemplate(pasteStyle, imgs[i]) + '\r\n'
+        pasteText.push(pasteTemplate(pasteStyle, imgs[i], db.get('settings.customLink')))
         const notification = new Notification({
           title: '上传成功',
           body: imgs[i].imgUrl as string,
@@ -74,9 +92,9 @@ class GuiApi implements IGuiApi {
         setTimeout(() => {
           notification.show()
         }, i * 100)
-        db.insert('uploaded', imgs[i])
+        await GalleryDB.getInstance().insert(imgs[i])
       }
-      clipboard.writeText(pasteText)
+      handleCopyUrl(pasteText.join('\n'))
       webContents.send('uploadFiles', imgs)
       webContents.send('updateGallery')
       return imgs
@@ -114,6 +132,48 @@ class GuiApi implements IGuiApi {
       })
     })
   }
+
+  /**
+   * get picgo config/data path
+   */
+  async getConfigPath () {
+    const currentConfigPath = dbPathChecker()
+    const galleryDBPath = getGalleryDBPath().dbPath
+    return {
+      defaultConfigPath,
+      currentConfigPath,
+      galleryDBPath
+    }
+  }
+
+  get galleryDB (): DBStore {
+    return new Proxy<DBStore>(GalleryDB.getInstance(), {
+      get (target, prop: keyof DBStore) {
+        if (prop === 'removeById') {
+          return new Proxy(GalleryDB.getInstance().removeById, {
+            apply (target, ctx, args) {
+              return new Promise((resolve) => {
+                const guiApi = GuiApi.getInstance()
+                guiApi.showMessageBox({
+                  title: '警告',
+                  message: '有插件正在试图删除一些相册图片，是否继续',
+                  type: 'info',
+                  buttons: ['Yes', 'No']
+                }).then(res => {
+                  if (res.result === 0) {
+                    resolve(Reflect.apply(target, ctx, args))
+                  } else {
+                    resolve(undefined)
+                  }
+                })
+              })
+            }
+          })
+        }
+        return Reflect.get(target, prop)
+      }
+    })
+  }
 }
 
 export default GuiApi

src/main/apis/uploader/index.ts

@@ -1,117 +0,0 @@
-import {
-  app,
-  Notification,
-  BrowserWindow,
-  ipcMain,
-  WebContents
-} from 'electron'
-import dayjs from 'dayjs'
-import picgo from '~/main/apis/picgo'
-import db from '#/datastore'
-import windowManager from '~/main/apis/window/windowManager'
-import { IWindowList } from '~/main/apis/window/constants'
-
-const waitForShow = (webcontent: WebContents) => {
-  return new Promise((resolve, reject) => {
-    webcontent.on('did-finish-load', () => {
-      resolve()
-    })
-  })
-}
-
-const waitForRename = (window: BrowserWindow, id: number): Promise<string|null> => {
-  return new Promise((resolve, reject) => {
-    const windowId = window.id
-    ipcMain.once(`rename${id}`, (evt: Event, newName: string) => {
-      resolve(newName)
-      window.close()
-    })
-    window.on('close', () => {
-      resolve(null)
-      ipcMain.removeAllListeners(`rename${id}`)
-      windowManager.deleteById(windowId)
-    })
-  })
-}
-
-class Uploader {
-  private webContents: WebContents | null = null
-  constructor () {
-    this.init()
-  }
-
-  init () {
-    picgo.on('notification', message => {
-      const notification = new Notification(message)
-      notification.show()
-    })
-
-    picgo.on('uploadProgress', progress => {
-      this.webContents?.send('uploadProgress', progress)
-    })
-    picgo.on('beforeTransform', ctx => {
-      if (db.get('settings.uploadNotification')) {
-        const notification = new Notification({
-          title: '上传进度',
-          body: '正在上传'
-        })
-        notification.show()
-      }
-    })
-    picgo.helper.beforeUploadPlugins.register('renameFn', {
-      handle: async ctx => {
-        const rename = db.get('settings.rename')
-        const autoRename = db.get('settings.autoRename')
-        await Promise.all(ctx.output.map(async (item, index) => {
-          let name: undefined | string | null
-          let fileName: string | undefined
-          if (autoRename) {
-            fileName = dayjs().add(index, 'second').format('YYYYMMDDHHmmss') + item.extname
-          } else {
-            fileName = item.fileName
-          }
-          if (rename) {
-            const window = windowManager.create(IWindowList.RENAME_WINDOW)!
-            await waitForShow(window.webContents)
-            window.webContents.send('rename', fileName, window.webContents.id)
-            name = await waitForRename(window, window.webContents.id)
-          }
-          item.fileName = name || fileName
-        }))
-      }
-    })
-  }
-
-  setWebContents (webContents: WebContents) {
-    this.webContents = webContents
-    return this
-  }
-
-  upload (img?: IUploadOption): Promise<ImgInfo[]|false> {
-    picgo.upload(img)
-
-    return new Promise((resolve) => {
-      picgo.once('finished', ctx => {
-        if (ctx.output.every((item: ImgInfo) => item.imgUrl)) {
-          resolve(ctx.output)
-        } else {
-          resolve(false)
-        }
-        picgo.removeAllListeners('failed')
-      })
-      picgo.once('failed', ctx => {
-        setTimeout(() => {
-          const notification = new Notification({
-            title: '上传失败',
-            body: '请检查配置和上传的文件是否符合要求'
-          })
-          notification.show()
-        }, 500)
-        picgo.removeAllListeners('finished')
-        resolve(false)
-      })
-    })
-  }
-}
-
-export default new Uploader()

src/main/events/busEventList.ts

@@ -1,13 +1,13 @@
-import bus from '~/main/utils/eventBus'
+import bus from '@core/bus'
 import {
   uploadClipboardFiles,
   uploadChoosedFiles
-} from '~/main/apis/uploader/api'
+} from 'apis/app/uploader/apis'
 import {
   createMenu
-} from '~/main/apis/app'
+} from 'apis/app/system'
-import { IWindowList } from '~/main/apis/window/constants'
+import { IWindowList } from 'apis/app/window/constants'
-import windowManager from '~/main/apis/window/windowManager'
+import windowManager from 'apis/app/window/windowManager'
 import {
   UPLOAD_WITH_FILES,
   UPLOAD_WITH_FILES_RESPONSE,
@@ -18,7 +18,7 @@ import {
   GET_SETTING_WINDOW_ID,
   GET_SETTING_WINDOW_ID_RESPONSE,
   CREATE_APP_MENU
-} from '~/main/apis/bus/constants'
+} from '@core/bus/constants'
 function initEventCenter () {
   const eventList: any = {
     'picgo:upload': uploadClipboardFiles,

src/main/events/ipcList.ts

@@ -1,24 +1,28 @@
 import {
   app,
   ipcMain,
-  clipboard,
   Notification,
   IpcMainEvent
 } from 'electron'
-import windowManager from '~/main/apis/window/windowManager'
+import windowManager from 'apis/app/window/windowManager'
-import { IWindowList } from '~/main/apis/window/constants'
+import { IWindowList } from 'apis/app/window/constants'
-import uploader from '~/main/apis/uploader'
+import uploader from 'apis/app/uploader'
 import pasteTemplate from '#/utils/pasteTemplate'
-import db from '#/datastore'
+import db, { GalleryDB } from '~/main/apis/core/datastore'
 import server from '~/main/server'
 import getPicBeds from '~/main/utils/getPicBeds'
-import shortKeyHandler from '~/main/apis/shortKey/shortKeyHandler'
+import shortKeyHandler from 'apis/app/shortKey/shortKeyHandler'
-import bus from '~/main/utils/eventBus'
+import bus from '@core/bus'
+import {
+  TOGGLE_SHORTKEY_MODIFIED_MODE,
+  OPEN_DEVTOOLS
+} from '#/events/constants'
 import {
   uploadClipboardFiles,
   uploadChoosedFiles
-} from '~/main/apis/uploader/api'
+} from '~/main/apis/app/uploader/apis'
 import picgoCoreIPC from './picgoCoreIPC'
+import { handleCopyUrl } from '~/main/utils/common'
 
 export default {
   listen () {
@@ -29,7 +33,7 @@ export default {
       const img = await uploader.setWebContents(trayWindow.webContents).upload()
       if (img !== false) {
         const pasteStyle = db.get('settings.pasteStyle') || 'markdown'
-        clipboard.writeText(pasteTemplate(pasteStyle, img[0]))
+        handleCopyUrl(pasteTemplate(pasteStyle, img[0], db.get('settings.customLink')))
         const notification = new Notification({
           title: '上传成功',
           body: img[0].imgUrl!,
@@ -37,7 +41,7 @@ export default {
           icon: img[0].imgUrl
         })
         notification.show()
-        db.insert('uploaded', img[0])
+        await GalleryDB.getInstance().insert(img[0])
         trayWindow.webContents.send('clipboardFiles', [])
         if (windowManager.has(IWindowList.SETTING_WINDOW)) {
           windowManager.get(IWindowList.SETTING_WINDOW)!.webContents.send('updateGallery')
@@ -131,13 +135,16 @@ export default {
       evt.returnValue = picBeds
     })
 
-    ipcMain.on('toggleShortKeyModifiedMode', (evt: IpcMainEvent, val: boolean) => {
+    ipcMain.on(TOGGLE_SHORTKEY_MODIFIED_MODE, (evt: IpcMainEvent, val: boolean) => {
-      bus.emit('toggleShortKeyModifiedMode', val)
+      bus.emit(TOGGLE_SHORTKEY_MODIFIED_MODE, val)
     })
 
     ipcMain.on('updateServer', () => {
       server.restart()
     })
+    ipcMain.on(OPEN_DEVTOOLS, (event: IpcMainEvent) => {
+      event.sender.openDevTools()
+    })
   },
   dispose () {}
 }

src/main/events/picgoCoreIPC.ts

@@ -0,0 +1,346 @@
+import path from 'path'
+import GuiApi from 'apis/gui'
+import {
+  dialog,
+  shell,
+  IpcMainEvent,
+  ipcMain
+} from 'electron'
+import PicGoCore from '~/universal/types/picgo'
+import { IPicGoHelperType } from '#/types/enum'
+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'
+import { dbPathChecker } from 'apis/core/datastore/dbChecker'
+import {
+  PICGO_SAVE_CONFIG,
+  PICGO_GET_CONFIG,
+  PICGO_GET_DB,
+  PICGO_INSERT_DB,
+  PICGO_INSERT_MANY_DB,
+  PICGO_UPDATE_BY_ID_DB,
+  PICGO_GET_BY_ID_DB,
+  PICGO_REMOVE_BY_ID_DB,
+  PICGO_OPEN_FILE
+} from '#/events/constants'
+
+import { GalleryDB } from 'apis/core/datastore'
+import { IObject, IFilter } from '@picgo/store/dist/types'
+
+// eslint-disable-next-line
+const requireFunc = typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require
+// const PluginHandler = requireFunc('picgo/dist/lib/PluginHandler').default
+const STORE_PATH = path.dirname(dbPathChecker())
+// const CONFIG_PATH = path.join(STORE_PATH, '/data.json')
+
+type PicGoNotice = {
+  title: string,
+  body: string[]
+}
+
+interface GuiMenuItem {
+  label: string
+  handle: (arg0: PicGoCore, arg1: GuiApi) => Promise<void>
+}
+
+// get uploader or transformer config
+const getConfig = (name: string, type: IPicGoHelperType, ctx: PicGoCore) => {
+  let config: any[] = []
+  if (name === '') {
+    return config
+  } else {
+    const handler = ctx.helper[type].get(name)
+    if (handler) {
+      if (handler.config) {
+        config = handler.config(ctx)
+      }
+    }
+    return config
+  }
+}
+
+const handleConfigWithFunction = (config: any[]) => {
+  for (let i in config) {
+    if (typeof config[i].default === 'function') {
+      config[i].default = config[i].default()
+    }
+    if (typeof config[i].choices === 'function') {
+      config[i].choices = config[i].choices()
+    }
+  }
+  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 list = getPluginList()
+    event.sender.send('pluginList', list)
+  })
+}
+
+const handlePluginInstall = () => {
+  ipcMain.on('installPlugin', async (event: IpcMainEvent, fullName: string) => {
+    const dispose = handleNPMError()
+    const res = await picgo.pluginHandler.install([fullName])
+    event.sender.send('installPlugin', {
+      success: res.success,
+      body: fullName,
+      errMsg: res.success ? '' : res.body
+    })
+    if (res.success) {
+      shortKeyHandler.registerPluginShortKey(res.body[0])
+    } else {
+      showNotification({
+        title: '插件安装失败',
+        body: res.body as string
+      })
+    }
+    event.sender.send('hideLoading')
+    dispose()
+  })
+}
+
+const handlePluginUninstall = () => {
+  ipcMain.on('uninstallPlugin', async (event: IpcMainEvent, msg: string) => {
+    const dispose = handleNPMError()
+    const res = await picgo.pluginHandler.uninstall([msg])
+    if (res.success) {
+      event.sender.send('uninstallSuccess', res.body[0])
+      shortKeyHandler.unregisterPluginShortKey(res.body[0])
+    } else {
+      showNotification({
+        title: '插件卸载失败',
+        body: res.body as string
+      })
+    }
+    event.sender.send('hideLoading')
+    dispose()
+  })
+}
+
+const handlePluginUpdate = () => {
+  ipcMain.on('updatePlugin', async (event: IpcMainEvent, msg: string) => {
+    const dispose = handleNPMError()
+    const res = await picgo.pluginHandler.update([msg])
+    if (res.success) {
+      event.sender.send('updateSuccess', res.body[0])
+    } else {
+      showNotification({
+        title: '插件更新失败',
+        body: res.body as string
+      })
+    }
+    event.sender.send('hideLoading')
+    dispose()
+  })
+}
+
+const handleNPMError = (): IDispose => {
+  const handler = (msg: string) => {
+    if (msg === 'NPM is not installed') {
+      dialog.showMessageBox({
+        title: '发生错误',
+        message: '请安装Node.js并重启PicGo再继续操作',
+        buttons: ['Yes']
+      }).then((res) => {
+        if (res.response === 0) {
+          shell.openExternal('https://nodejs.org/')
+        }
+      })
+    }
+  }
+  picgo.once('failed', handler)
+  return () => picgo.off('failed', handler)
+}
+
+const handleGetPicBedConfig = () => {
+  ipcMain.on('getPicBedConfig', (event: IpcMainEvent, type: string) => {
+    const name = picgo.helper.uploader.get(type)?.name || type
+    if (picgo.helper.uploader.get(type)?.config) {
+      const config = handleConfigWithFunction(picgo.helper.uploader.get(type)!.config(picgo))
+      event.sender.send('getPicBedConfig', config, name)
+    } else {
+      event.sender.send('getPicBedConfig', [], name)
+    }
+  })
+}
+
+const handlePluginActions = () => {
+  ipcMain.on('pluginActions', (event: IpcMainEvent, name: string, label: string) => {
+    const plugin = picgo.pluginLoader.getPlugin(name)
+    if (plugin?.guiMenu?.(picgo)?.length) {
+      const menu: GuiMenuItem[] = plugin.guiMenu(picgo)
+      menu.forEach(item => {
+        if (item.label === label) {
+          item.handle(picgo, GuiApi.getInstance())
+        }
+      })
+    }
+  })
+}
+
+const handleRemoveFiles = () => {
+  ipcMain.on('removeFiles', (event: IpcMainEvent, files: ImgInfo[]) => {
+    setTimeout(() => {
+      picgo.emit('remove', files, GuiApi.getInstance())
+    }, 500)
+  })
+}
+
+const handlePicGoSaveConfig = () => {
+  ipcMain.on(PICGO_SAVE_CONFIG, (event: IpcMainEvent, data: IObj) => {
+    picgo.saveConfig(data)
+  })
+}
+
+const handlePicGoGetConfig = () => {
+  ipcMain.on(PICGO_GET_CONFIG, (event: IpcMainEvent, key: string | undefined, callbackId: string) => {
+    const result = picgo.getConfig(key)
+    event.sender.send(PICGO_GET_CONFIG, result, callbackId)
+  })
+}
+
+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')
+    })
+  })
+}
+
+const handlePicGoGalleryDB = () => {
+  ipcMain.on(PICGO_GET_DB, async (event: IpcMainEvent, filter: IFilter, callbackId: string) => {
+    const dbStore = GalleryDB.getInstance()
+    const res = await dbStore.get(filter)
+    event.sender.send(PICGO_GET_DB, res, callbackId)
+  })
+
+  ipcMain.on(PICGO_INSERT_DB, async (event: IpcMainEvent, value: IObject, callbackId: string) => {
+    const dbStore = GalleryDB.getInstance()
+    const res = await dbStore.insert(value)
+    event.sender.send(PICGO_INSERT_DB, res, callbackId)
+  })
+
+  ipcMain.on(PICGO_INSERT_MANY_DB, async (event: IpcMainEvent, value: IObject[], callbackId: string) => {
+    const dbStore = GalleryDB.getInstance()
+    const res = await dbStore.insertMany(value)
+    event.sender.send(PICGO_INSERT_MANY_DB, res, callbackId)
+  })
+
+  ipcMain.on(PICGO_UPDATE_BY_ID_DB, async (event: IpcMainEvent, id: string, value: IObject[], callbackId: string) => {
+    const dbStore = GalleryDB.getInstance()
+    const res = await dbStore.updateById(id, value)
+    event.sender.send(PICGO_UPDATE_BY_ID_DB, res, callbackId)
+  })
+
+  ipcMain.on(PICGO_GET_BY_ID_DB, async (event: IpcMainEvent, id: string, callbackId: string) => {
+    const dbStore = GalleryDB.getInstance()
+    const res = await dbStore.getById(id)
+    event.sender.send(PICGO_GET_BY_ID_DB, res, callbackId)
+  })
+
+  ipcMain.on(PICGO_REMOVE_BY_ID_DB, async (event: IpcMainEvent, id: string, callbackId: string) => {
+    const dbStore = GalleryDB.getInstance()
+    const res = await dbStore.removeById(id)
+    event.sender.send(PICGO_REMOVE_BY_ID_DB, res, callbackId)
+  })
+}
+
+const handleOpenFile = () => {
+  ipcMain.on(PICGO_OPEN_FILE, (event: IpcMainEvent, fileName: string) => {
+    const abFilePath = path.join(STORE_PATH, fileName)
+    shell.openItem(abFilePath)
+  })
+}
+
+export default {
+  listen () {
+    handleGetPluginList()
+    handlePluginInstall()
+    handlePluginUninstall()
+    handlePluginUpdate()
+    handleGetPicBedConfig()
+    handlePluginActions()
+    handleRemoveFiles()
+    handlePicGoSaveConfig()
+    handlePicGoGetConfig()
+    handlePicGoGalleryDB()
+    handleImportLocalPlugin()
+    handleOpenFile()
+  }
+}

src/main/lifeCycle/errorHandler.ts

@@ -0,0 +1,33 @@
+import fse from 'fs-extra'
+import path from 'path'
+import dayjs from 'dayjs'
+import util from 'util'
+import { dbPathDir } from 'apis/core/datastore/dbChecker'
+const STORE_PATH = dbPathDir()
+const LOG_PATH = path.join(STORE_PATH, '/picgo.log')
+
+// since the error may occur in picgo-core
+// so we can't use the log from picgo
+export const loggerWriter = (error: Error) => {
+  let log = `${dayjs().format('YYYY-MM-DD HH:mm:ss')} [PicGo ERROR] startup error`
+  if (error?.stack) {
+    log += `\n------Error Stack Begin------\n${util.format(error.stack)}\n-------Error Stack End-------\n`
+  } else {
+    const msg = JSON.stringify(error)
+    log += `${msg}\n`
+  }
+  fse.appendFileSync(LOG_PATH, log)
+}
+
+const handleProcessError = (error: Error) => {
+  console.error(error)
+  loggerWriter(error)
+}
+
+process.on('uncaughtException', error => {
+  handleProcessError(error)
+})
+
+process.on('unhandledRejection', (error: any) => {
+  handleProcessError(error)
+})

src/main/lifeCycle/index.ts

@@ -0,0 +1,191 @@
+import './errorHandler'
+import {
+  app,
+  globalShortcut,
+  protocol,
+  Notification
+} from 'electron'
+import {
+  createProtocol
+} from 'vue-cli-plugin-electron-builder/lib'
+import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer'
+import beforeOpen from '~/main/utils/beforeOpen'
+import fixPath from 'fix-path'
+import ipcList from '~/main/events/ipcList'
+import busEventList from '~/main/events/busEventList'
+import { IWindowList } from 'apis/app/window/constants'
+import windowManager from 'apis/app/window/windowManager'
+import {
+  updateShortKeyFromVersion212,
+  migrateGalleryFromVersion230
+} from '~/main/migrate'
+import {
+  uploadChoosedFiles,
+  uploadClipboardFiles
+} from 'apis/app/uploader/apis'
+import {
+  createTray
+} from 'apis/app/system'
+import server from '~/main/server/index'
+import updateChecker from '~/main/utils/updateChecker'
+import shortKeyHandler from 'apis/app/shortKey/shortKeyHandler'
+import { getUploadFiles } from '~/main/utils/handleArgv'
+import db, { GalleryDB } from '~/main/apis/core/datastore'
+import bus from '@core/bus'
+import { privacyManager } from '~/main/utils/privacyManager'
+import logger from 'apis/core/picgo/logger'
+import picgo from 'apis/core/picgo'
+
+const isDevelopment = process.env.NODE_ENV !== 'production'
+
+const handleStartUpFiles = (argv: string[], cwd: string) => {
+  const files = getUploadFiles(argv, cwd, logger)
+  if (files === null || files.length > 0) { // 如果有文件列表作为参数，说明是命令行启动
+    if (files === null) {
+      logger.info('cli -> uploading file from clipboard')
+      uploadClipboardFiles()
+    } else {
+      logger.info('cli -> uploading files from cli', ...files.map(item => item.path))
+      const win = windowManager.getAvailableWindow()
+      uploadChoosedFiles(win.webContents, files)
+    }
+    return true
+  } else {
+    return false
+  }
+}
+
+class LifeCycle {
+  private async beforeReady () {
+    protocol.registerSchemesAsPrivileged([{ scheme: 'picgo', privileges: { secure: true, standard: true } }])
+    // fix the $PATH in macOS
+    fixPath()
+    beforeOpen()
+    ipcList.listen()
+    busEventList.listen()
+    updateShortKeyFromVersion212(db, db.get('settings.shortKey'))
+    await migrateGalleryFromVersion230(db, GalleryDB.getInstance(), picgo)
+  }
+  private onReady () {
+    const readyFunction = async () => {
+      console.log('on ready')
+      createProtocol('picgo')
+      if (isDevelopment && !process.env.IS_TEST) {
+        // Install Vue Devtools
+        try {
+          await installExtension(VUEJS_DEVTOOLS)
+        } catch (e) {
+          console.error('Vue Devtools failed to install:', e.toString())
+        }
+      }
+      const res = await privacyManager.init()
+      if (!res) {
+        return app.quit()
+      }
+      windowManager.create(IWindowList.TRAY_WINDOW)
+      windowManager.create(IWindowList.SETTING_WINDOW)
+      createTray()
+      db.set('needReload', false)
+      updateChecker()
+      // 不需要阻塞
+      process.nextTick(() => {
+        shortKeyHandler.init()
+      })
+      server.startup()
+      if (process.env.NODE_ENV !== 'development') {
+        handleStartUpFiles(process.argv, process.cwd())
+      }
+
+      if (global.notificationList && global.notificationList?.length > 0) {
+        while (global.notificationList?.length) {
+          const option = global.notificationList.pop()
+          const notice = new Notification(option!)
+          notice.show()
+        }
+      }
+    }
+    if (!app.isReady()) {
+      app.on('ready', readyFunction)
+    } else {
+      readyFunction()
+    }
+  }
+  private onRunning () {
+    app.on('second-instance', (event, commandLine, workingDirectory) => {
+      logger.info('detect second instance')
+      const result = handleStartUpFiles(commandLine, workingDirectory)
+      if (!result) {
+        if (windowManager.has(IWindowList.SETTING_WINDOW)) {
+          const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW)!
+          if (settingWindow.isMinimized()) {
+            settingWindow.restore()
+          }
+          settingWindow.focus()
+        }
+      }
+    })
+    app.on('activate', () => {
+      createProtocol('picgo')
+      if (!windowManager.has(IWindowList.TRAY_WINDOW)) {
+        windowManager.create(IWindowList.TRAY_WINDOW)
+      }
+      if (!windowManager.has(IWindowList.SETTING_WINDOW)) {
+        windowManager.create(IWindowList.SETTING_WINDOW)
+      }
+    })
+    app.setLoginItemSettings({
+      openAtLogin: db.get('settings.autoStart') || false
+    })
+    if (process.platform === 'win32') {
+      app.setAppUserModelId('com.molunerfinn.picgo')
+    }
+
+    if (process.env.XDG_CURRENT_DESKTOP && process.env.XDG_CURRENT_DESKTOP.includes('Unity')) {
+      process.env.XDG_CURRENT_DESKTOP = 'Unity'
+    }
+  }
+  private onQuit () {
+    app.on('window-all-closed', () => {
+      if (process.platform !== 'darwin') {
+        app.quit()
+      }
+    })
+
+    app.on('will-quit', () => {
+      globalShortcut.unregisterAll()
+      bus.removeAllListeners()
+      server.shutdown()
+    })
+    // Exit cleanly on request from parent process in development mode.
+    if (isDevelopment) {
+      if (process.platform === 'win32') {
+        process.on('message', data => {
+          if (data === 'graceful-exit') {
+            app.quit()
+          }
+        })
+      } else {
+        process.on('SIGTERM', () => {
+          app.quit()
+        })
+      }
+    }
+  }
+  async launchApp () {
+    const gotTheLock = app.requestSingleInstanceLock()
+    if (!gotTheLock) {
+      app.quit()
+    } else {
+      await this.beforeReady()
+      this.onReady()
+      this.onRunning()
+      this.onQuit()
+    }
+  }
+}
+
+const bootstrap = new LifeCycle()
+
+export {
+  bootstrap
+}

src/main/migrate/index.ts

@@ -1,9 +1,22 @@
-import DB from '#/datastore'
+import { DBStore } from '@picgo/store'
+import ConfigStore from '~/main/apis/core/datastore'
+import path from 'path'
+import fse from 'fs-extra'
+import PicGoCore from '#/types/picgo'
 // from v2.1.2
-const updateShortKeyFromVersion212 = (db: typeof DB, shortKeyConfig: IShortKeyConfigs | IOldShortKeyConfigs) => {
+const updateShortKeyFromVersion212 = (db: typeof ConfigStore, shortKeyConfig: IShortKeyConfigs | IOldShortKeyConfigs) => {
-  let needUpgrade = false
+  // #557 极端情况可能会出现配置不存在，需要重新写入
+  if (shortKeyConfig === undefined) {
+    const defaultShortKeyConfig = {
+      enable: true,
+      key: 'CommandOrControl+Shift+P',
+      name: 'upload',
+      label: '快捷上传'
+    }
+    db.set('settings.shortKey[picgo:upload]', defaultShortKeyConfig)
+    return true
+  }
   if (shortKeyConfig.upload) {
-    needUpgrade = true
     // @ts-ignore
     shortKeyConfig['picgo:upload'] = {
       enable: true,
@@ -11,16 +24,31 @@ const updateShortKeyFromVersion212 = (db: typeof DB, shortKeyConfig: IShortKeyCo
       name: 'upload',
       label: '快捷上传'
     }
+    // @ts-ignore
     delete shortKeyConfig.upload
-  }
-  if (needUpgrade) {
     db.set('settings.shortKey', shortKeyConfig)
-    return shortKeyConfig
+    return true
-  } else {
+  }
-    return false
+  return false
+}
+
+const migrateGalleryFromVersion230 = async (configDB: typeof ConfigStore, galleryDB: DBStore, picgo: PicGoCore) => {
+  const originGallery: ImgInfo[] = configDB.get('uploaded')
+  const configPath = configDB.getConfigPath()
+  const configBakPath = path.join(path.dirname(configPath), 'config.bak.json')
+  // migrate gallery from config to gallery db
+  if (originGallery && Array.isArray(originGallery) && originGallery?.length > 0) {
+    if (fse.existsSync(configBakPath)) {
+      fse.copyFileSync(configPath, configBakPath)
+    }
+    await galleryDB.insertMany(originGallery)
+    picgo.saveConfig({
+      uploaded: []
+    })
   }
 }
 
 export {
-  updateShortKeyFromVersion212
+  updateShortKeyFromVersion212,
+  migrateGalleryFromVersion230
 }

src/main/server/index.ts

@@ -1,16 +1,18 @@
 import http from 'http'
 import routers from './routerManager'
 import {
-  handleResponse
+  handleResponse,
+  ensureHTTPLink
 } from './utils'
-import picgo from '~/main/apis/picgo'
+import picgo from '@core/picgo'
-import logger from '~/main/utils/logger'
+import logger from '@core/picgo/logger'
+import axios from 'axios'
 
 class Server {
   private httpServer: http.Server
   private config: IServerConfig
   constructor () {
-    let config = picgo.getConfig('settings.server')
+    let config = picgo.getConfig<IServerConfig>('settings.server')
     const result = this.checkIfConfigIsValid(config)
     if (result) {
       this.config = config
@@ -37,6 +39,7 @@ class Server {
   private handleRequest = (request: http.IncomingMessage, response: http.ServerResponse) => {
     if (request.method === 'POST') {
       if (!routers.getHandler(request.url!)) {
+        logger.warn(`[PicGo Server] don't support [${request.url}] url`)
         handleResponse({
           response,
           statusCode: 404,
@@ -55,6 +58,7 @@ class Server {
           try {
             postObj = (body === '') ? {} : JSON.parse(body)
           } catch (err) {
+            logger.error(`[PicGo Server]`, err)
             return handleResponse({
               response,
               body: {
@@ -63,6 +67,7 @@ class Server {
               }
             })
           }
+          logger.info(`[PicGo Server] get the request`, body)
           const handler = routers.getHandler(request.url!)
           handler!({
             ...postObj,
@@ -71,31 +76,43 @@ class Server {
         })
       }
     } else {
+      logger.warn(`[PicGo Server] don't support [${request.method}] method`)
       response.statusCode = 404
       response.end()
     }
   }
-  private listen = (port: number) => {
+  // port as string is a bug
+  private listen = (port: number | string) => {
     logger.info(`[PicGo Server] is listening at ${port}`)
-    this.httpServer.listen(port, this.config.host).on('error', (err: ErrnoException) => {
+    if (typeof port === 'string') {
+      port = parseInt(port, 10)
+    }
+    this.httpServer.listen(port, this.config.host).on('error', async (err: ErrnoException) => {
       if (err.errno === 'EADDRINUSE') {
-        logger.warn(`[PicGo Server] ${port} is busy, trying with port ${port + 1}`)
+        try {
-        this.config.port += 1
+          // make sure the system has a PicGo Server instance
-        picgo.saveConfig({
+          await axios.post(ensureHTTPLink(`${this.config.host}:${port}/heartbeat`))
-          'settings.server': this.config
+          this.shutdown(true)
-        })
+        } catch (e) {
-        this.listen(this.config.port)
+          logger.warn(`[PicGo Server] ${port} is busy, trying with port ${(port as number) + 1}`)
+          // fix a bug: not write an increase number to config file
+          // to solve the auto number problem
+          this.listen((port as number) + 1)
+        }
       }
     })
   }
   startup () {
+    console.log('startup', this.config.enable)
     if (this.config.enable) {
       this.listen(this.config.port)
     }
   }
-  shutdown () {
+  shutdown (hasStarted?: boolean) {
     this.httpServer.close()
-    logger.info('[PicGo Server] shutdown')
+    if (!hasStarted) {
+      logger.info('[PicGo Server] shutdown')
+    }
   }
   restart () {
     this.config = picgo.getConfig('settings.server')

src/main/server/routerManager.ts

@@ -1,14 +1,18 @@
 import router from './router'
-import {
-  uploadWithClipboardFiles,
-  uploadWithFiles
-} from '~/main/apis/bus/index'
 import {
   handleResponse
 } from './utils'
-import logger from '../utils/logger'
+import logger from '@core/picgo/logger'
+import windowManager from 'apis/app/window/windowManager'
+import { uploadChoosedFiles, uploadClipboardFiles } from 'apis/app/uploader/apis'
+import path from 'path'
+import { dbPathDir } from 'apis/core/datastore/dbChecker'
+const STORE_PATH = dbPathDir()
+const LOG_PATH = path.join(STORE_PATH, 'picgo.log')
 
-router.get('/upload', async ({
+const errorMessage = `upload error. see ${LOG_PATH} for more detail.`
+
+router.post('/upload', async ({
   response,
   list = []
 } : {
@@ -18,39 +22,50 @@ router.get('/upload', async ({
   try {
     if (list.length === 0) {
       // upload with clipboard
-      const res = await uploadWithClipboardFiles()
+      logger.info('[PicGo Server] upload clipboard file')
-      if (res.success) {
+      const res = await uploadClipboardFiles()
+      if (res) {
         handleResponse({
           response,
           body: {
             success: true,
-            result: res.result
+            result: [res]
           }
         })
       } else {
         handleResponse({
-          response
+          response,
+          body: {
+            success: false,
+            message: errorMessage
+          }
         })
       }
     } else {
+      logger.info('[PicGo Server] upload files in list')
       //  upload with files
       const pathList = list.map(item => {
         return {
           path: item
         }
       })
-      const res = await uploadWithFiles(pathList)
+      const win = windowManager.getAvailableWindow()
-      if (res.success) {
+      const res = await uploadChoosedFiles(win.webContents, pathList)
+      if (res.length) {
         handleResponse({
           response,
           body: {
             success: true,
-            result: res.result
+            result: res
           }
         })
       } else {
         handleResponse({
-          response
+          response,
+          body: {
+            success: false,
+            message: errorMessage
+          }
         })
       }
     }
@@ -60,10 +75,24 @@ router.get('/upload', async ({
       response,
       body: {
         success: false,
-        message: err
+        message: errorMessage
       }
     })
   }
 })
 
+router.post('/heartbeat', async ({
+  response
+} : {
+  response: IHttpResponse,
+}) => {
+  handleResponse({
+    response,
+    body: {
+      success: true,
+      result: 'alive'
+    }
+  })
+})
+
 export default router

src/main/server/utils.ts

@@ -1,3 +1,5 @@
+import logger from '@core/picgo/logger'
+
 export const handleResponse = ({
   response,
   statusCode = 200,
@@ -13,7 +15,16 @@ export const handleResponse = ({
   header?: IObj,
   body?: any
 }) => {
+  if (body?.success === false) {
+    logger.warn('[PicGo Server] upload failed, see picgo.log for more detail ↑')
+  }
   response.writeHead(statusCode, header)
   response.write(JSON.stringify(body))
   response.end()
 }
+
+export const ensureHTTPLink = (url: string): string => {
+  return url.startsWith('http')
+    ? url
+    : `http://${url}`
+}

src/main/utils/beforeOpen.ts

@@ -1,10 +1,10 @@
 import fs from 'fs-extra'
 import path from 'path'
 import os from 'os'
-import { remote, app } from 'electron'
+import { dbPathChecker } from 'apis/core/datastore/dbChecker'
 
-const APP = process.type === 'renderer' ? remote.app : app
+const configPath = dbPathChecker()
-const STORE_PATH = APP.getPath('userData')
+const CONFIG_DIR = path.dirname(configPath)
 
 function beforeOpen () {
   if (process.platform === 'darwin') {
@@ -34,7 +34,7 @@ function resolveMacWorkFlow () {
  */
 function resolveClipboardImageGenerator () {
   let clipboardFiles = getClipboardFiles()
-  if (!fs.pathExistsSync(path.join(STORE_PATH, 'windows10.ps1'))) {
+  if (!fs.pathExistsSync(path.join(CONFIG_DIR, 'windows10.ps1'))) {
     clipboardFiles.forEach(item => {
       fs.copyFileSync(item.origin, item.dest)
     })
@@ -45,10 +45,15 @@ function resolveClipboardImageGenerator () {
   }
 
   function diffFilesAndUpdate (filePath1: string, filePath2: string) {
-    let file1 = fs.readFileSync(filePath1)
+    try {
-    let file2 = fs.readFileSync(filePath2)
+      let file1 = fs.existsSync(filePath1) && fs.readFileSync(filePath1)
+      let file2 = fs.existsSync(filePath1) && fs.readFileSync(filePath2)
 
-    if (!file1.equals(file2)) {
+      if (!file1 || !file2 || !file1.equals(file2)) {
+        fs.copyFileSync(filePath1, filePath2)
+      }
+    } catch (e) {
+      console.error(e)
       fs.copyFileSync(filePath1, filePath2)
     }
   }
@@ -58,13 +63,14 @@ function resolveClipboardImageGenerator () {
       '/linux.sh',
       '/mac.applescript',
       '/windows.ps1',
-      '/windows10.ps1'
+      '/windows10.ps1',
+      '/wsl.sh'
     ]
 
     return files.map(item => {
       return {
         origin: path.join(__static, item),
-        dest: path.join(STORE_PATH, item)
+        dest: path.join(CONFIG_DIR, item)
       }
     })
   }

src/main/utils/common.ts

@@ -0,0 +1,71 @@
+import db from '~/main/apis/core/datastore'
+import { clipboard, Notification, dialog } 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,
+    icon: options.icon || undefined
+  })
+  const handleClick = () => {
+    if (options.clickToCopy) {
+      clipboard.writeText(options.body)
+    }
+  }
+  notification.once('click', handleClick)
+  notification.once('close', () => {
+    notification.removeListener('click', handleClick)
+  })
+  notification.show()
+}
+
+export const showMessageBox = (options: any) => {
+  return new Promise<IShowMessageBoxResult>(async (resolve, reject) => {
+    dialog.showMessageBox(
+      options
+    ).then((res) => {
+      resolve({
+        result: res.response,
+        checkboxChecked: res.checkboxChecked
+      })
+    })
+  })
+}
+
+export const calcDurationRange = (duration: number) => {
+  if (duration < 1000) {
+    return 500
+  } else if (duration < 1500) {
+    return 1000
+  } else if (duration < 3000) {
+    return 2000
+  } else if (duration < 5000) {
+    return 3000
+  } else if (duration < 7000) {
+    return 5000
+  } else if (duration < 10000) {
+    return 8000
+  } else if (duration < 12000) {
+    return 10000
+  } else if (duration < 20000) {
+    return 15000
+  } else if (duration < 30000) {
+    return 20000
+  }
+  // max range
+  return 100000
+}

src/main/utils/getPicBeds.ts

@@ -1,13 +1,13 @@
-import picgo from '../apis/picgo'
+import picgo from '@core/picgo'
 
 const getPicBeds = () => {
   const picBedTypes = picgo.helper.uploader.getIdList()
-  const picBedFromDB = picgo.getConfig('picBed.list') || []
+  const picBedFromDB = picgo.getConfig<IPicBedType[]>('picBed.list') || []
   const picBeds = picBedTypes.map((item: string) => {
     const visible = picBedFromDB.find((i: IPicBedType) => i.type === item) // object or undefined
     return {
       type: item,
-      name: picgo.helper.uploader.get(item).name || item,
+      name: picgo.helper.uploader.get(item)!.name || item,
       visible: visible ? visible.visible : true
     }
   }) as IPicBedType[]

src/main/utils/handleArgv.ts

@@ -1,35 +1,55 @@
 import path from 'path'
 import fs from 'fs-extra'
-type ClipboardFileObject = {
+import Logger from 'picgo/dist/src/lib/Logger'
+interface IResultFileObject {
   path: string
 }
-type Result = ClipboardFileObject[]
+type Result = IResultFileObject[]
-const getUploadFiles = (argv = process.argv, cwd = process.cwd()) => {
+
-  let files = argv.slice(1)
+interface IHandleArgvResult {
-  if (files.length > 0 && files[0] === 'upload') {
+  success: boolean
-    if (files.length === 1) {
+  fileList?: string[]
+}
+
+const handleArgv = (argv: string[]): IHandleArgvResult => {
+  const uploadIndex = argv.indexOf('upload')
+  if (uploadIndex !== -1) {
+    const fileList = argv.slice(1 + uploadIndex)
+    return {
+      success: true,
+      fileList
+    }
+  }
+  return {
+    success: false
+  }
+}
+
+const getUploadFiles = (argv = process.argv, cwd = process.cwd(), logger: Logger) => {
+  const { success, fileList } = handleArgv(argv)
+  if (!success) {
+    return []
+  } else {
+    if (fileList?.length === 0) {
       return null // for uploading images in clipboard
-    } else if (files.length > 1) {
+    } else if ((fileList?.length || 0) > 0) {
-      files = argv.slice(1)
+      const result = fileList!.map(item => {
-      let result: Result = []
+        if (path.isAbsolute(item)) {
-      if (files.length > 0) {
+          return {
-        result = files.map(item => {
+            path: item
-          if (path.isAbsolute(item)) {
+          }
+        } else {
+          let tempPath = path.join(cwd, item)
+          if (fs.existsSync(tempPath)) {
             return {
-              path: item
+              path: tempPath
             }
           } else {
-            let tempPath = path.join(cwd, item)
+            logger.warn(`cli -> can't get file: ${tempPath}, invalid path`)
-            if (fs.existsSync(tempPath)) {
+            return null
-              return {
-                path: tempPath
-              }
-            } else {
-              return null
-            }
           }
-        }).filter(item => item !== null) as Result
+        }
-      }
+      }).filter(item => item !== null) as Result
       return result
     }
   }

src/main/utils/logger.ts

@@ -1,76 +0,0 @@
-import chalk from 'chalk'
-import dayjs from 'dayjs'
-import fs from 'fs-extra'
-import path from 'path'
-import util from 'util'
-import db from '#/datastore'
-import { app } from 'electron'
-import { IChalkType } from '#/types/enum'
-const baseDir = app.getPath('userData')
-
-class Logger {
-  private level = {
-    success: IChalkType.success,
-    info: IChalkType.info,
-    warn: IChalkType.warn,
-    error: IChalkType.error
-  }
-  protected handleLog (type: ILogType, msg: ILoggerType): ILoggerType {
-    // if configPath is invalid then this.ctx.config === undefined
-    // if not then check config.silent
-    const log = chalk[this.level[type]](`[PicGo ${type.toUpperCase()}]:`)
-    console.log(log, msg)
-    process.nextTick(() => {
-      this.handleWriteLog(type, msg)
-    })
-    return msg
-  }
-
-  protected handleWriteLog (type: string, msg: ILoggerType): void {
-    try {
-      const logLevel = db.get('settings.logLevel')
-      const logPath = db.get('settings.logPath') || path.join(baseDir, './picgo.log')
-      if (this.checkLogLevel(type, logLevel)) {
-        const picgoLog = fs.createWriteStream(logPath, { flags: 'a', encoding: 'utf8' })
-        let log = `${dayjs().format('YYYY-MM-DD HH:mm:ss')} [PicGo ${type.toUpperCase()}] ${msg}`
-        const logger = new console.Console(picgoLog)
-        if (typeof msg === 'object' && type === 'error') {
-          log += `\n------Error Stack Begin------\n${util.format(msg.stack)}\n-------Error Stack End-------`
-        }
-        logger.log(log)
-        picgoLog.destroy()
-      }
-    } catch (e) {
-      console.log(e)
-    }
-  }
-
-  protected checkLogLevel (type: string, level: undefined | string | string[]): boolean {
-    if (level === undefined || level === 'all') {
-      return true
-    }
-    if (Array.isArray(level)) {
-      return level.some((item: string) => (item === type || item === 'all'))
-    } else {
-      return type === level
-    }
-  }
-
-  success (msg: ILoggerType): ILoggerType {
-    return this.handleLog('success', msg)
-  }
-
-  info (msg: ILoggerType): ILoggerType {
-    return this.handleLog('info', msg)
-  }
-
-  error (msg: ILoggerType): ILoggerType {
-    return this.handleLog('error', msg)
-  }
-
-  warn (msg: ILoggerType): ILoggerType {
-    return this.handleLog('warn', msg)
-  }
-}
-
-export default new Logger()

src/main/utils/privacyManager.ts

@@ -0,0 +1,61 @@
+import db from '~/main/apis/core/datastore'
+import { ipcMain } from 'electron'
+import { showMessageBox } from '~/main/utils/common'
+import { SHOW_PRIVACY_MESSAGE } from '~/universal/events/constants'
+
+class PrivacyManager {
+  async init () {
+    ipcMain.on(SHOW_PRIVACY_MESSAGE, () => {
+      this.show(false)
+    })
+    if (db.get('settings.privacyEnsure') !== true) {
+      const res = await this.show(true)
+      // cancel
+      if (res.result === 1) {
+        return false
+      } else {
+        db.set('settings.privacyEnsure', true)
+        return true
+      }
+    }
+    return true
+  }
+
+  async show (showCancel = true) {
+    const res = await showMessageBox({
+      type: 'info',
+      buttons: showCancel ? ['Yes', 'No'] : ['Yes'],
+      title: '隐私协议',
+      message: `
+      本软件尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更优质的服务，本软件会按照本隐私权政策的规定使用和收集您的一些行为信息。您在同意本软件服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本软件服务使用协议不可分割的一部分，如果不同意将无法使用。本协议会定期更新。
+
+      1.适用范围
+
+      a)在您使用本软件时，本软件会记录的您对本软件的一些操作行为信息，包括但不限于您使用本软件进行文件上传的耗时、类型、数量等信息。
+
+      2.信息的使用
+
+      a)在获得您的使用数据之后，本软件会将其上传至数据分析服务器，以便分析数据后，提供给您更好的服务。
+
+      3.信息披露
+
+      a)本软件不会将您的信息披露给不受信任的第三方。
+
+      b)根据法律的有关规定，或者行政或司法机构的要求，向第三方或者行政、司法机构披露；
+
+      c)如您出现违反中国有关法律、法规或者相关规则的情况，需要向第三方披露；
+
+      4.信息安全
+
+      a)本软件不会收集您的个人信息、密钥信息等隐私信息，所收集的信息仅仅作为改善软件、优化体验、了解软件日活等用途。
+      `
+    })
+    return res
+  }
+}
+
+const privacyManager = new PrivacyManager()
+
+export {
+  privacyManager
+}

src/main/utils/updateChecker.ts

@@ -1,7 +1,8 @@
 import { dialog, shell } from 'electron'
-import db from '#/datastore'
+import db from '~/main/apis/core/datastore'
 import axios from 'axios'
 import pkg from 'root/package.json'
+import { lt } from 'semver'
 const version = pkg.version
 const releaseUrl = 'https://api.github.com/repos/Molunerfinn/PicGo/releases/latest'
 const releaseUrlBackup = 'https://cdn.jsdelivr.net/gh/Molunerfinn/PicGo@latest/package.json'
@@ -51,18 +52,17 @@ const checkVersion = async () => {
 
 // if true -> update else return false
 const compareVersion2Update = (current: string, latest: string) => {
-  const currentVersion = current.split('.').map(item => parseInt(item))
+  try {
-  const latestVersion = latest.split('.').map(item => parseInt(item))
+    if (latest.includes('beta')) {
-
+      const isCheckBetaUpdate = db.get('settings.checkBetaUpdate') !== false
-  for (let i = 0; i < 3; i++) {
+      if (!isCheckBetaUpdate) {
-    if (currentVersion[i] < latestVersion[i]) {
+        return false
-      return true
+      }
-    }
-    if (currentVersion[i] > latestVersion[i]) {
-      return false
     }
+    return lt(current, latest)
+  } catch (e) {
+    return false
   }
-  return false
 }
 
 export default checkVersion

src/renderer/components/ChoosePicBed.vue

@@ -8,30 +8,27 @@
     </el-switch>
   </div>
 </template>
-<script>
+<script lang="ts">
-export default {
+import { Component, Vue, Prop } from 'vue-property-decorator'
-  name: 'choose-pic-bed',
+@Component({
-  props: {
+  name: 'choose-pic-bed'
-    type: String,
+})
-    label: String
+export default class extends Vue {
-  },
+  value = false
-  data () {
+  @Prop() type!: string
-    return {
+  @Prop() label!: string
-      value: false
+  async created () {
-    }
+    const current = await this.getConfig<string>('picBed.current')
-  },
+    if (this.type === current) {
-  created () {
-    if (this.type === this.$db.get('picBed.current')) {
       this.value = true
     }
-  },
+  }
-  methods: {
+  choosePicBed (val: string) {
-    choosePicBed (val) {
+    this.saveConfig({
-      this.letPicGoSaveData({
+      'picBed.current': this.type,
-        'picBed.current': this.type
+      'picBed.uploader': this.type
-      })
+    })
-      this.$emit('update:choosed', this.type)
+    this.$emit('update:choosed', this.type)
-    }
   }
 }
 </script>

src/renderer/components/ConfigForm.vue

@@ -72,7 +72,7 @@ import { cloneDeep, union } from 'lodash'
 })
 export default class extends Vue {
   @Prop() private config!: any[]
-  @Prop() readonly type!: string
+  @Prop() readonly type!: 'uploader' | 'transformer' | 'plugin'
   @Prop() readonly id!: string
   configList = []
   ruleForm = {}
@@ -81,8 +81,41 @@ export default class extends Vue {
     immediate: true
   })
   handleConfigChange (val: any) {
+    this.handleConfig(val)
+  }
+  async validate () {
+    return new Promise((resolve, reject) => {
+      // @ts-ignore
+      this.$refs.form.validate((valid: boolean) => {
+        if (valid) {
+          resolve(this.ruleForm)
+        } else {
+          resolve(false)
+          return false
+        }
+      })
+    })
+  }
+
+  getConfigType () {
+    switch (this.type) {
+      case 'plugin': {
+        return this.id
+      }
+      case 'uploader': {
+        return `picBed.${this.id}`
+      }
+      case 'transformer': {
+        return `transformer.${this.id}`
+      }
+      default:
+        return `unknown`
+    }
+  }
+
+  async handleConfig (val: any) {
     this.ruleForm = Object.assign({}, {})
-    const config = this.$db.get(`picBed.${this.id}`)
+    const config = await this.getConfig<IPicGoPluginConfig>(this.getConfigType())
     if (val.length > 0) {
       this.configList = cloneDeep(val).map((item: any) => {
         let defaultValue = item.default !== undefined
@@ -102,19 +135,6 @@ export default class extends Vue {
       })
     }
   }
-  async validate () {
-    return new Promise((resolve, reject) => {
-      // @ts-ignore
-      this.$refs.form.validate((valid: boolean) => {
-        if (valid) {
-          resolve(this.ruleForm)
-        } else {
-          resolve(false)
-          return false
-        }
-      })
-    })
-  }
 }
 </script>
 <style lang='stylus'>

src/renderer/components/InputBoxDialog.vue

@@ -0,0 +1,64 @@
+<template>
+  <el-dialog
+    :title="inputBoxOptions.title || '输入框'"
+    :visible.sync="showInputBoxVisible"
+    :modal-append-to-body="false"
+  >
+    <el-input
+      v-model="inputBoxValue"
+      :placeholder="inputBoxOptions.placeholder"></el-input>
+    <span slot="footer">
+      <el-button @click="handleInputBoxCancel" round>取消</el-button>
+      <el-button type="primary" @click="handleInputBoxConfirm" round>确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+import { remote, ipcRenderer, IpcRendererEvent } from 'electron'
+import {
+  SHOW_INPUT_BOX,
+  SHOW_INPUT_BOX_RESPONSE
+} from '~/universal/events/constants'
+@Component({
+  name: 'input-box-dialog'
+})
+export default class extends Vue {
+  inputBoxValue = ''
+  showInputBoxVisible = false
+  inputBoxOptions = {
+    title: '',
+    placeholder: ''
+  }
+  created () {
+    ipcRenderer.on(SHOW_INPUT_BOX, this.ipcEventHandler)
+    this.$bus.$on(SHOW_INPUT_BOX, this.initInputBoxValue)
+  }
+  ipcEventHandler (evt: IpcRendererEvent, options: IShowInputBoxOption) {
+    this.initInputBoxValue(options)
+  }
+  initInputBoxValue (options: IShowInputBoxOption) {
+    this.inputBoxValue = options.value || ''
+    this.inputBoxOptions.title = options.title || ''
+    this.inputBoxOptions.placeholder = options.placeholder || ''
+    this.showInputBoxVisible = true
+  }
+  handleInputBoxCancel () {
+    // TODO: RPCServer
+    this.showInputBoxVisible = false
+    ipcRenderer.send(SHOW_INPUT_BOX, '')
+    this.$bus.$emit(SHOW_INPUT_BOX_RESPONSE, '')
+  }
+  handleInputBoxConfirm () {
+    this.showInputBoxVisible = false
+    ipcRenderer.send(SHOW_INPUT_BOX, this.inputBoxValue)
+    this.$bus.$emit(SHOW_INPUT_BOX_RESPONSE, this.inputBoxValue)
+  }
+  beforeDestroy () {
+    ipcRenderer.removeListener(SHOW_INPUT_BOX, this.ipcEventHandler)
+    this.$bus.$off(SHOW_INPUT_BOX)
+  }
+}
+</script>
+<style lang='stylus'>
+</style>

src/renderer/layouts/Main.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="setting-page">
+  <div id="main-page">
     <div class="fake-title-bar" :class="{ 'darwin': os === 'darwin' }">
       <div class="fake-title-bar__title">
         PicGo - {{ version }}
@@ -17,6 +17,7 @@
           :default-active="defaultActive"
           @select="handleSelect"
           :unique-opened="true"
+          @open="handleGetPicPeds"
           >
           <el-menu-item index="upload">
             <i class="el-icon-upload"></i>
@@ -92,57 +93,76 @@
       </el-row>
     </el-dialog>
     <el-dialog
-      title="自定义链接格式"
+      class="qrcode-dialog"
-      :visible.sync="customLinkVisible"
+      top="3vh"
+      width="60%"
+      title="图床配置二维码"
+      :visible.sync="qrcodeVisible"
+      :modal-append-to-body="false"
+      lock-scroll
     >
       <el-form
-        label-position="top"
+        label-position="left"
-        :model="customLink"
+        label-width="70px"
-        ref="customLink"
+        size="mini"
-        :rules="rules"
       >
         <el-form-item
-          label="用占位符$url来表示url的位置"
+          label="选择图床"
-          prop="value"
         >
-          <el-input
+          <el-select
-            class="align-center"
+            v-model="choosedPicBedForQRCode"
-            v-model="customLink.value"
+            multiple
-            :autofocus="true"
+            collapse-tags
-          ></el-input>
+          >
+            <el-option
+              v-for="item in picBed"
+              :key="item.type"
+              :label="item.name"
+              :value="item.type"
+            ></el-option>
+          </el-select>
+          <el-button
+            v-show="choosedPicBedForQRCode.length > 0"
+            type="primary"
+            round
+            class="copy-picbed-config"
+            @click="handleCopyPicBedConfig"
+          >
+            复制图床配置
+          </el-button>
         </el-form-item>
       </el-form>
-      <div>
+      <div class="qrcode-container">
-        如[]($url)
+        <qrcode-vue
+          v-show="choosedPicBedForQRCode.length > 0"
+          :size="280"
+          :value="picBedConfigString"
+        />
       </div>
-      <span slot="footer">
-        <el-button @click="cancelCustomLink">取消</el-button>
-        <el-button type="primary" @click="confirmCustomLink">确定</el-button>
-      </span>
-    </el-dialog>
-    <el-dialog
-      :title="inputBoxOptions.title || '输入框'"
-      :visible.sync="showInputBoxVisible"
-      :modal-append-to-body="false"
-      @close="handleInputBoxClose"
-    >
-      <el-input
-        v-model="inputBoxValue"
-        :placeholder="inputBoxOptions.placeholder"></el-input>
-      <span slot="footer">
-        <el-button @click="showInputBoxVisible = false" round>取消</el-button>
-        <el-button type="primary" @click="showInputBoxVisible = false" round>确定</el-button>
-      </span>
     </el-dialog>
+    <input-box-dialog />
   </div>
 </template>
 <script lang="ts">
-import { Component, Vue } from 'vue-property-decorator'
+import { Component, Vue, Watch } from 'vue-property-decorator'
+import QrcodeVue from 'qrcode.vue'
+import pick from 'lodash/pick'
 import pkg from 'root/package.json'
 import keyDetect from '@/utils/key-binding'
-import { remote, ipcRenderer, IpcRendererEvent } from 'electron'
+import {
-import db from '#/datastore'
+  remote,
+  ipcRenderer,
+  IpcRendererEvent,
+  clipboard
+} from 'electron'
+// import db from '#/datastore'
 import mixin from '@/utils/mixin'
+import InputBoxDialog from '@/components/InputBoxDialog.vue'
+import {
+  SHOW_PRIVACY_MESSAGE,
+  OPEN_DEVTOOLS
+} from '~/universal/events/constants'
+import { IConfig } from 'picgo/dist/src/types/index'
 const { Menu, dialog, BrowserWindow } = remote
 const customLinkRule = (rule: string, value: string, callback: (arg0?: Error) => void) => {
   if (!/\$url/.test(value)) {
@@ -152,8 +172,12 @@ const customLinkRule = (rule: string, value: string, callback: (arg0?: Error) =>
   }
 }
 @Component({
-  name: 'setting-page',
+  name: 'main-page',
-  mixins: [mixin]
+  mixins: [mixin],
+  components: {
+    InputBoxDialog,
+    QrcodeVue
+  }
 })
 export default class extends Vue {
   version = process.env.NODE_ENV === 'production' ? pkg.version : 'Dev'
@@ -162,38 +186,33 @@ export default class extends Vue {
   visible = false
   keyBindingVisible = false
   customLinkVisible = false
-  customLink = {
-    value: db.get('customLink') || '$url'
-  }
-  rules = {
-    value: [
-      { validator: customLinkRule, trigger: 'blur' }
-    ]
-  }
   os = ''
-  shortKey: IShortKeyMap = {
-    upload: db.get('shortKey.upload')
-  }
   picBed: IPicBedType[] = []
-  // for showInputBox
+  qrcodeVisible = false
-  showInputBoxVisible = false
+  picBedConfigString = ''
-  inputBoxValue = ''
+  choosedPicBedForQRCode: string[] = []
-  inputBoxOptions = {
-    title: '',
-    placeholder: ''
-  }
   created () {
     this.os = process.platform
     this.buildMenu()
-    ipcRenderer.send('getPicBeds')
     ipcRenderer.on('getPicBeds', this.getPicBeds)
-    ipcRenderer.on('showInputBox', (evt: IpcRendererEvent, options: IShowInputBoxOption) => {
+    this.handleGetPicPeds()
-      this.inputBoxValue = ''
-      this.inputBoxOptions.title = options.title || ''
-      this.inputBoxOptions.placeholder = options.placeholder || ''
-      this.showInputBoxVisible = true
-    })
   }
+
+  @Watch('choosedPicBedForQRCode')
+  choosedPicBedForQRCodeChange (val: string[], oldVal: string[]) {
+    if (val.length > 0) {
+      this.$nextTick(async () => {
+        const picBedConfig = await this.getConfig('picBed')
+        const config = pick(picBedConfig, ...this.choosedPicBedForQRCode)
+        this.picBedConfigString = JSON.stringify(config)
+      })
+    }
+  }
+
+  handleGetPicPeds = () => {
+    ipcRenderer.send('getPicBeds')
+  }
+
   handleSelect (index: string) {
     const type = index.match(/picbeds-/)
     if (type === null) {
@@ -222,7 +241,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
@@ -242,6 +265,24 @@ export default class extends Vue {
         click () {
           _this.visible = true
         }
+      },
+      {
+        label: '生成图床配置二维码',
+        click () {
+          _this.qrcodeVisible = true
+        }
+      },
+      {
+        label: '隐私协议',
+        click () {
+          ipcRenderer.send(SHOW_PRIVACY_MESSAGE)
+        }
+      },
+      {
+        label: '打开调试器',
+        click () {
+          ipcRenderer.send(OPEN_DEVTOOLS)
+        }
       }
     ]
     this.menu = Menu.buildFromTemplate(template)
@@ -250,38 +291,16 @@ export default class extends Vue {
     // this.menu!.popup(remote.getCurrentWindow())
     this.menu!.popup()
   }
-  keyDetect (type: string, event: KeyboardEvent) {
-    this.shortKey[type] = keyDetect(event).join('+')
-  }
-  cancelKeyBinding () {
-    this.keyBindingVisible = false
-    this.shortKey = db.get('shortKey')
-  }
-  cancelCustomLink () {
-    this.customLinkVisible = false
-    this.customLink.value = db.get('customLink') || '$url'
-  }
-  confirmCustomLink () {
-    // @ts-ignore
-    this.$refs.customLink.validate((valid: boolean) => {
-      if (valid) {
-        db.set('customLink', this.customLink.value)
-        this.customLinkVisible = false
-        ipcRenderer.send('updateCustomLink')
-      } else {
-        return false
-      }
-    })
-  }
   openMiniWindow () {
     ipcRenderer.send('openMiniWindow')
   }
+  handleCopyPicBedConfig () {
+    clipboard.writeText(this.picBedConfigString)
+    this.$message.success('图床配置复制成功')
+  }
   getPicBeds (event: IpcRendererEvent, picBeds: IPicBedType[]) {
     this.picBed = picBeds
   }
-  handleInputBoxClose () {
-    ipcRenderer.send('showInputBox', this.inputBoxValue)
-  }
   beforeRouteEnter (to: any, from: any, next: any) {
     next((vm: this) => {
       vm.defaultActive = to.name
@@ -289,7 +308,6 @@ export default class extends Vue {
   }
   beforeDestroy () {
     ipcRenderer.removeListener('getPicBeds', this.getPicBeds)
-    ipcRenderer.removeAllListeners('showInputBox')
   }
 }
 </script>
@@ -308,7 +326,17 @@ $darwinBg = transparentify(#172426, #000, 0.7)
   font-size 20px
   text-align center
   margin 10px auto
-#setting-page
+#main-page
+  .qrcode-dialog
+    .qrcode-container
+      display flex
+      justify-content center
+    .el-dialog__body
+      padding-top 10px
+    .copy-picbed-config
+      margin-left 10px
+    .el-input__inner
+      border-radius 14px
   .fake-title-bar
     -webkit-app-region drag
     height h = 22px

src/renderer/pages/Gallery.vue

@@ -48,14 +48,19 @@
                 <i slot="suffix" class="el-input__icon el-icon-close" v-if="searchText" @click="cleanSearch" style="cursor: pointer"></i>
               </el-input>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="4">
               <div class="item-base copy round" :class="{ active: isMultiple(choosedList)}" @click="multiCopy">
-                <i class="el-icon-document"></i> 批量复制
+                复制
               </div>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="4">
               <div class="item-base delete round" :class="{ active: isMultiple(choosedList)}" @click="multiRemove">
-                <i class="el-icon-delete"></i> 批量删除
+                删除
+              </div>
+            </el-col>
+            <el-col :span="4">
+              <div class="item-base all-pick round" :class="{ active: filterList.length > 0}" @click="toggleSelectAll">
+                {{ isAllSelected ? '取消' : '全选' }}
               </div>
             </el-col>
           </el-row>
@@ -66,12 +71,12 @@
       <el-col :span="20" :offset="2">
         <el-row :gutter="16">
           <gallerys
-            :images="images"
+            :images="filterList"
             :index="idx"
             @close="handleClose"
             :options="options"
           ></gallerys>
-          <el-col :span="6" v-for="(item, index) in images" :key="item.id" class="gallery-list__img">
+          <el-col :span="6" v-for="(item, index) in filterList" :key="item.id" class="gallery-list__img">
             <div
               class="gallery-list__item"
               @click="zoomImage(index)"
@@ -82,7 +87,7 @@
               <i class="el-icon-document" @click="copy(item)"></i>
               <i class="el-icon-edit-outline" @click="openDialog(item)"></i>
               <i class="el-icon-delete" @click="remove(item.id)"></i>
-              <el-checkbox v-model="choosedList[item.id]" class="pull-right" @change=" handleBarActive = true"></el-checkbox>
+              <el-checkbox v-model="choosedList[item.id]" class="pull-right" @change="(val) => handleChooseImage(val, index)"></el-checkbox>
             </div>
           </el-col>
         </el-row>
@@ -106,7 +111,9 @@
 // @ts-ignore
 import gallerys from 'vue-gallery'
 import pasteStyle from '#/utils/pasteTemplate'
-import { Component, Vue } from 'vue-property-decorator'
+import { IPasteStyle } from '#/types/enum'
+import { Component, Vue, Watch } from 'vue-property-decorator'
+import { IResult } from '@picgo/store/dist/types'
 import {
   ipcRenderer,
   clipboard,
@@ -128,11 +135,13 @@ export default class extends Vue {
   }
   dialogVisible = false
   imgInfo = {
-    id: null,
+    id: '',
     imgUrl: ''
   }
   choosedList: IObjT<boolean> = {}
   choosedPicBed: string[] = []
+  lastChoosed: number = -1
+  isShiftKeyPress: boolean = false
   searchText = ''
   handleBarActive = false
   pasteStyle = ''
@@ -144,61 +153,101 @@ export default class extends Vue {
     Custom: 'Custom'
   }
   picBed: IPicBedType[] = []
-  beforeRouteEnter (to: any, from: any, next: any) {
+  @Watch('$route')
-    next((vm: any) => {
+  handleRouteUpdate (to: any, from: any) {
-      vm.getGallery()
+    console.log(to, from)
-      vm.getPasteStyle()
+    if (from.name === 'gallery') {
-      vm.getPicBeds()
+      this.clearChoosedList()
-    })
+    }
+    if (to.name === 'gallery') {
+      this.updateGallery()
+    }
   }
-  created () {
+  async created () {
     ipcRenderer.on('updateGallery', (event: IpcRendererEvent) => {
-      this.$nextTick(() => {
+      this.$nextTick(async () => {
-        this.filterList = this.getGallery()
+        this.updateGallery()
       })
     })
     ipcRenderer.send('getPicBeds')
     ipcRenderer.on('getPicBeds', this.getPicBeds)
+    this.updateGallery()
+  }
+  mounted () {
+    document.addEventListener('keydown', this.handleDetectShiftKey)
+    document.addEventListener('keyup', this.handleDetectShiftKey)
+  }
+  handleDetectShiftKey (event: KeyboardEvent) {
+    if (event.key === 'Shift') {
+      if (event.type === 'keydown') {
+        this.isShiftKeyPress = true
+      } else if (event.type === 'keyup') {
+        this.isShiftKeyPress = false
+      }
+    }
   }
   get filterList () {
     return this.getGallery()
   }
-  set filterList (val) {
+  get isAllSelected () {
-    this.images = val
+    const values = Object.values(this.choosedList)
+    if (values.length === 0) {
+      return false
+    } else {
+      return this.filterList.every(item => {
+        return this.choosedList[item.id!]
+      })
+    }
   }
   getPicBeds (event: IpcRendererEvent, picBeds: IPicBedType[]) {
     this.picBed = picBeds
   }
-  getGallery () {
+  getGallery (): ImgInfo[] {
-    if (this.choosedPicBed.length > 0) {
+    if (this.searchText || this.choosedPicBed.length > 0) {
-      let arr: ImgInfo[] = []
+      return this.images
-      this.choosedPicBed.forEach(item => {
+        .filter(item => {
-        let obj: IObj = {
+          let isInChoosedPicBed = true
-          type: item
+          let isIncludesSearchText = true
-        }
+          if (this.choosedPicBed.length > 0) {
-        if (this.searchText) {
+            isInChoosedPicBed = this.choosedPicBed.some(type => type === item.type)
-          obj.fileName = this.searchText
+          }
-        }
+          if (this.searchText) {
-        // @ts-ignore
+            isIncludesSearchText = item.fileName?.includes(this.searchText) || false
-        arr = arr.concat(this.$db.read().get('uploaded').filter(obj => {
+          }
-          return obj.fileName.indexOf(this.searchText) !== -1 && obj.type === item
+          return isIncludesSearchText && isInChoosedPicBed
-        }).reverse().value())
+        })
-      })
-      this.images = arr
     } else {
-      if (this.searchText) {
+      return this.images
-        let data = this.$db.read().get('uploaded')
-        // @ts-ignore
-          .filter(item => {
-            return item.fileName.indexOf(this.searchText) !== -1
-          }).reverse().value()
-        this.images = data
-      } else {
-        // @ts-ignore
-        this.images = this.$db.read().get('uploaded').slice().reverse().value()
-      }
     }
-    return this.images
+  }
+  async updateGallery () {
+    this.images = (await this.$$db.get({ orderBy: 'desc' })).data
+  }
+
+  @Watch('filterList')
+  handleFilterListChange () {
+    this.clearChoosedList()
+  }
+  handleChooseImage (val: boolean, index: number) {
+    if (val === true) {
+      this.handleBarActive = true
+      if (this.lastChoosed !== -1 && this.isShiftKeyPress) {
+        let min = Math.min(this.lastChoosed, index)
+        let max = Math.max(this.lastChoosed, index)
+        for (let i = min + 1; i < max; i++) {
+          const id = this.filterList[i].id!
+          this.$set(this.choosedList, id, true)
+        }
+      }
+      this.lastChoosed = index
+    }
+  }
+  clearChoosedList () {
+    this.isShiftKeyPress = false
+    Object.keys(this.choosedList).forEach(key => {
+      this.choosedList[key] = false
+    })
+    this.lastChoosed = -1
   }
   zoomImage (index: number) {
     this.idx = index
@@ -217,9 +266,10 @@ export default class extends Vue {
     this.idx = null
     this.changeZIndexForGallery(false)
   }
-  copy (item: ImgInfo) {
+  async copy (item: ImgInfo) {
-    const style = this.$db.get('settings.pasteStyle') || 'markdown'
+    const style = await this.getConfig<IPasteStyle>('settings.pasteStyle') || IPasteStyle.MARKDOWN
-    const copyLink = pasteStyle(style, item)
+    const customLink = await this.getConfig<string>('settings.customLink')
+    const copyLink = pasteStyle(style, item, customLink)
     const obj = {
       title: '复制链接成功',
       body: copyLink,
@@ -236,9 +286,9 @@ export default class extends Vue {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning'
-    }).then(() => {
+    }).then(async () => {
-      const file = this.$db.getById('uploaded', id)
+      const file = await this.$$db.getById(id)
-      this.$db.removeById('uploaded', id)
+      await this.$$db.removeById(id)
       ipcRenderer.send('removeFiles', [file])
       const obj = {
         title: '操作结果',
@@ -248,23 +298,21 @@ export default class extends Vue {
       myNotification.onclick = () => {
         return true
       }
-      this.getGallery()
+      this.updateGallery()
     }).catch((e) => {
       console.log(e)
       return true
     })
   }
   openDialog (item: ImgInfo) {
-    this.imgInfo.id = item.id
+    this.imgInfo.id = item.id!
     this.imgInfo.imgUrl = item.imgUrl as string
     this.dialogVisible = true
   }
-  confirmModify () {
+  async confirmModify () {
-    this.$db.read().get('uploaded')
+    await this.$$db.updateById(this.imgInfo.id, {
-      // @ts-ignore
+      imgUrl: this.imgInfo.imgUrl
-      .getById(this.imgInfo.id)
+    })
-      .assign({ imgUrl: this.imgInfo.imgUrl })
-      .write()
     const obj = {
       title: '修改图片URL成功',
       body: this.imgInfo.imgUrl,
@@ -275,7 +323,7 @@ export default class extends Vue {
       return true
     }
     this.dialogVisible = false
-    this.getGallery()
+    this.updateGallery()
   }
   choosePicBed (type: string) {
     let idx = this.choosedPicBed.indexOf(type)
@@ -291,24 +339,35 @@ export default class extends Vue {
   isMultiple (obj: IObj) {
     return Object.values(obj).some(item => item)
   }
+  toggleSelectAll () {
+    const result = !this.isAllSelected
+    this.filterList.forEach(item => {
+      this.$set(this.choosedList, item.id!, result)
+    })
+  }
   multiRemove () {
     // choosedList -> { [id]: true or false }; true means choosed. false means not choosed.
-    if (Object.values(this.choosedList).some(item => item)) {
+    const multiRemoveNumber = Object.values(this.choosedList).filter(item => item).length
-      this.$confirm('将删除刚才选中的图片，是否继续？', '提示', {
+    if (multiRemoveNumber) {
+      this.$confirm(`将在相册中移除刚才选中的 ${multiRemoveNumber} 张图片，是否继续？`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
+      }).then(async () => {
-        let files: ImgInfo[] = []
+        let files: IResult<ImgInfo>[] = []
-        Object.keys(this.choosedList).forEach(key => {
+        const imageIDList = Object.keys(this.choosedList)
+        for (let i = 0; i < imageIDList.length; i++) {
+          const key = imageIDList[i]
           if (this.choosedList[key]) {
-            const file = this.$db.getById('uploaded', key)
+            const file = await this.$$db.getById<ImgInfo>(key)
-            files.push(file)
+            if (file) {
-            this.$db.removeById('uploaded', key)
+              files.push(file)
+              await this.$$db.removeById(key)
+            }
           }
-        })
+        }
-        this.choosedList = {}
+        this.clearChoosedList()
-        this.getGallery()
+        this.choosedList = {} // 只有删除才能将这个置空
         const obj = {
           title: '操作结果',
           body: '删除成功'
@@ -318,29 +377,35 @@ export default class extends Vue {
         myNotification.onclick = () => {
           return true
         }
+        this.updateGallery()
       }).catch(() => {
         return true
       })
     }
   }
-  multiCopy () {
+  async multiCopy () {
     if (Object.values(this.choosedList).some(item => item)) {
-      let copyString = ''
+      const copyString: string[] = []
-      const style = this.$db.get('settings.pasteStyle') || 'markdown'
+      const style = await this.getConfig<IPasteStyle>('settings.pasteStyle') || IPasteStyle.MARKDOWN
+      const customLink = await this.getConfig<string>('settings.customLink')
       // choosedList -> { [id]: true or false }; true means choosed. false means not choosed.
-      Object.keys(this.choosedList).forEach(key => {
+      const imageIDList = Object.keys(this.choosedList)
+      for (let i = 0; i < imageIDList.length; i++) {
+        const key = imageIDList[i]
         if (this.choosedList[key]) {
-          const item = this.$db.getById('uploaded', key)
+          const item = await this.$$db.getById<ImgInfo>(key)
-          copyString += pasteStyle(style, item) + '\n'
+          if (item) {
-          this.choosedList[key] = false
+            copyString.push(pasteStyle(style, item, customLink))
+            this.choosedList[key] = false
+          }
         }
-      })
+      }
       const obj = {
         title: '批量复制链接成功',
-        body: copyString
+        body: copyString.join('\n')
       }
       const myNotification = new Notification(obj.title, obj)
-      clipboard.writeText(copyString)
+      clipboard.writeText(copyString.join('\n'))
       myNotification.onclick = () => {
         return true
       }
@@ -349,11 +414,11 @@ export default class extends Vue {
   toggleHandleBar () {
     this.handleBarActive = !this.handleBarActive
   }
-  getPasteStyle () {
+  // getPasteStyle () {
-    this.pasteStyle = this.$db.get('settings.pasteStyle') || 'markdown'
+  //   this.pasteStyle = this.$db.get('settings.pasteStyle') || 'markdown'
-  }
+  // }
-  handlePasteStyleChange (val: string) {
+  async handlePasteStyleChange (val: string) {
-    this.$db.set('settings.pasteStyle', val)
+    this.saveConfig('settings.pasteStyle', val)
     this.pasteStyle = val
   }
   beforeDestroy () {
@@ -400,6 +465,13 @@ export default class extends Vue {
       cursor pointer
       background #F15140
       color #fff
+  &.all-pick
+    cursor not-allowed
+    background #69C282
+    &.active
+      cursor pointer
+      background #44B363
+      color #fff
 #gallery-view
   position relative
   .round

src/renderer/pages/MiniPage.vue

@@ -23,7 +23,7 @@ import {
   IpcRendererEvent,
   remote
 } from 'electron'
-import path from 'path'
+import { SHOW_PRIVACY_MESSAGE, OPEN_DEVTOOLS } from '~/universal/events/constants'
 @Component({
   name: 'mini-page',
   mixins: [mixin]
@@ -136,16 +136,18 @@ export default class extends Vue {
   openContextMenu () {
     this.menu!.popup()
   }
-  buildMenu () {
+  async buildMenu () {
     const _this = this
+    const current = await this.getConfig('picBed.current')
     const submenu = this.picBed.filter(item => item.visible).map(item => {
       return {
         label: item.name,
         type: 'radio',
-        checked: this.$db.get('picBed.current') === item.type,
+        checked: current === item.type,
         click () {
-          _this.letPicGoSaveData({
+          _this.saveConfig({
-            'picBed.current': item.type
+            'picBed.current': item.type,
+            'picBed.uploader': item.type
           })
           ipcRenderer.send('syncPicBed')
         }
@@ -175,6 +177,12 @@ export default class extends Vue {
           remote.BrowserWindow.getFocusedWindow()!.hide()
         }
       },
+      {
+        label: '隐私协议',
+        click () {
+          ipcRenderer.send(SHOW_PRIVACY_MESSAGE)
+        }
+      },
       {
         label: '重启应用',
         click () {
@@ -182,6 +190,12 @@ export default class extends Vue {
           remote.app.exit(0)
         }
       },
+      {
+        label: '打开调试器',
+        click () {
+          ipcRenderer.send(OPEN_DEVTOOLS)
+        }
+      },
       {
         role: 'quit',
         label: '退出'

src/renderer/pages/PicGoSetting.vue

@@ -4,10 +4,10 @@
       PicGo设置 - <i class="el-icon-document" @click="goConfigPage"></i>
     </div>
     <el-row class="setting-list">
-      <el-col :span="15" :offset="4">
+      <el-col :span="16" :offset="4">
         <el-row>
         <el-form
-          label-width="120px"
+          label-width="160px"
           label-position="right"
           size="small"
         >
@@ -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>
@@ -56,6 +56,17 @@
               @change="updateHelperChange"
             ></el-switch>
           </el-form-item>
+          <el-form-item
+            v-show="form.updateHelper"
+            label="接受Beta版本更新"
+          >
+            <el-switch
+              v-model="form.checkBetaUpdate"
+              active-text="开"
+              inactive-text="关"
+              @change="checkBetaUpdateChange"
+            ></el-switch>
+          </el-form-item>
           <el-form-item
             label="开机自启"
           >
@@ -107,6 +118,16 @@
               @change="handleMiniWindowOntop"
             ></el-switch>
           </el-form-item>
+          <el-form-item
+            label="上传后自动复制URL"
+          >
+            <el-switch
+              v-model="form.autoCopyUrl"
+              active-text="开"
+              inactive-text="关"
+              @change="handleAutoCopyUrl"
+            ></el-switch>
+          </el-form-item>
           <el-form-item
             label="选择显示的图床"
           >
@@ -162,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"
@@ -182,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>
@@ -298,13 +338,14 @@
 <script lang="ts">
 import keyDetect from '@/utils/key-binding'
 import pkg from 'root/package.json'
-import path from 'path'
+import { IConfig } from 'picgo/dist/src/types/index'
+import { PICGO_OPEN_FILE } from '#/events/constants'
 import {
   ipcRenderer,
   remote
 } from 'electron'
 import { Component, Vue } from 'vue-property-decorator'
-import db from '#/datastore'
+// import db from '#/datastore'
 const releaseUrl = 'https://api.github.com/repos/Molunerfinn/PicGo/releases/latest'
 const releaseUrlBackup = 'https://cdn.jsdelivr.net/gh/Molunerfinn/PicGo@latest/package.json'
 const downloadUrl = 'https://github.com/Molunerfinn/PicGo/releases/latest'
@@ -315,28 +356,22 @@ const customLinkRule = (rule: string, value: string, callback: (arg0?: Error) =>
     return callback()
   }
 }
-let logLevel = db.get('settings.logLevel')
-if (!Array.isArray(logLevel)) {
-  if (logLevel && logLevel.length > 0) {
-    logLevel = [logLevel]
-  } else {
-    logLevel = ['all']
-  }
-}
 
 @Component({
   name: 'picgo-setting'
 })
 export default class extends Vue {
   form: ISettingForm = {
-    updateHelper: db.get('settings.showUpdateTip'),
+    updateHelper: false,
     showPicBedList: [],
-    autoStart: db.get('settings.autoStart') || false,
+    autoStart: false,
-    rename: db.get('settings.rename') || false,
+    rename: false,
-    autoRename: db.get('settings.autoRename') || false,
+    autoRename: false,
-    uploadNotification: db.get('settings.uploadNotification') || false,
+    uploadNotification: false,
-    miniWindowOntop: db.get('settings.miniWindowOntop') || false,
+    miniWindowOntop: false,
-    logLevel
+    logLevel: ['all'],
+    autoCopyUrl: true,
+    checkBetaUpdate: true
   }
   picBed: IPicBedType[] = []
   logFileVisible = false
@@ -346,12 +381,14 @@ export default class extends Vue {
   serverVisible = false
   proxyVisible = false
   customLink = {
-    value: db.get('settings.customLink') || '$url'
+    value: '$url'
   }
   shortKey: IShortKeyMap = {
-    upload: db.get('settings.shortKey.upload')
+    upload: ''
   }
-  proxy = db.get('picBed.proxy') || ''
+  proxy = ''
+  npmRegistry = ''
+  npmProxy = ''
   rules = {
     value: [
       { validator: customLinkRule, trigger: 'blur' }
@@ -365,7 +402,7 @@ export default class extends Vue {
     warn: '提醒-Warn',
     none: '不记录日志-None'
   }
-  server = db.get('settings.server') || {
+  server = {
     port: 36677,
     host: '127.0.0.1',
     enable: true
@@ -385,7 +422,47 @@ export default class extends Vue {
     this.os = process.platform
     ipcRenderer.send('getPicBeds')
     ipcRenderer.on('getPicBeds', this.getPicBeds)
+    this.initData()
   }
+  async initData () {
+    const config = (await this.getConfig<IConfig>())!
+    if (config !== undefined) {
+      const settings = config.settings || {}
+      const picBed = config.picBed
+      this.form.updateHelper = settings.showUpdateTip || false
+      this.form.autoStart = settings.autoStart || false
+      this.form.rename = settings.rename || false
+      this.form.autoRename = settings.autoRename || false
+      this.form.uploadNotification = settings.uploadNotification || false
+      this.form.miniWindowOntop = settings.miniWindowOntop || false
+      this.form.logLevel = this.initLogLevel(settings.logLevel || [])
+      this.form.autoCopyUrl = settings.autoCopy === undefined ? true : settings.autoCopy
+      this.form.checkBetaUpdate = settings.checkBetaUpdate === undefined ? true : settings.checkBetaUpdate
+
+      this.customLink.value = settings.customLink || '$url'
+      this.shortKey.upload = settings.shortKey.upload
+      this.proxy = picBed.proxy || ''
+      this.npmRegistry = settings.registry || ''
+      this.npmProxy = settings.proxy || ''
+      this.server = settings.server || {
+        port: 36677,
+        host: '127.0.0.1',
+        enable: true
+      }
+    }
+  }
+
+  initLogLevel (logLevel: string | string[]) {
+    if (!Array.isArray(logLevel)) {
+      if (logLevel && logLevel.length > 0) {
+        logLevel = [logLevel]
+      } else {
+        logLevel = ['all']
+      }
+    }
+    return logLevel
+  }
+
   getPicBeds (event: Event, picBeds: IPicBedType[]) {
     this.picBed = picBeds
     this.form.showPicBedList = this.picBed.map(item => {
@@ -395,10 +472,7 @@ export default class extends Vue {
     }) as string[]
   }
   openFile (file: string) {
-    const { app, shell } = remote
+    ipcRenderer.send(PICGO_OPEN_FILE, file)
-    const STORE_PATH = app.getPath('userData')
-    const FILE = path.join(STORE_PATH, `/${file}`)
-    shell.openItem(FILE)
   }
   openLogSetting () {
     this.logFileVisible = true
@@ -406,15 +480,15 @@ export default class extends Vue {
   keyDetect (type: string, event: KeyboardEvent) {
     this.shortKey[type] = keyDetect(event).join('+')
   }
-  cancelCustomLink () {
+  async cancelCustomLink () {
     this.customLinkVisible = false
-    this.customLink.value = db.get('settings.customLink') || '$url'
+    this.customLink.value = await this.getConfig<string>('settings.customLink') || '$url'
   }
   confirmCustomLink () {
     // @ts-ignore
     this.$refs.customLink.validate((valid: boolean) => {
       if (valid) {
-        db.set('settings.customLink', this.customLink.value)
+        this.saveConfig('settings.customLink', this.customLink.value)
         this.customLinkVisible = false
         ipcRenderer.send('updateCustomLink')
       } else {
@@ -422,14 +496,16 @@ export default class extends Vue {
       }
     })
   }
-  cancelProxy () {
+  async cancelProxy () {
     this.proxyVisible = false
-    this.proxy = db.get('picBed.proxy') || undefined
+    this.proxy = await this.getConfig<string>('picBed.proxy') || ''
   }
   confirmProxy () {
     this.proxyVisible = false
-    this.letPicGoSaveData({
+    this.saveConfig({
-      'picBed.proxy': this.proxy
+      'picBed.proxy': this.proxy,
+      'settings.proxy': this.npmProxy,
+      'settings.registry': this.npmRegistry
     })
     const successNotification = new Notification('设置代理', {
       body: '设置成功'
@@ -439,7 +515,10 @@ export default class extends Vue {
     }
   }
   updateHelperChange (val: boolean) {
-    db.set('settings.showUpdateTip', val)
+    this.saveConfig('settings.showUpdateTip', val)
+  }
+  checkBetaUpdateChange (val: boolean) {
+    this.saveConfig('settings.checkBetaUpdate', val)
   }
   handleShowPicBedListChange (val: string[]) {
     const list = this.picBed.map(item => {
@@ -450,22 +529,22 @@ export default class extends Vue {
       }
       return item
     })
-    this.letPicGoSaveData({
+    this.saveConfig({
       'picBed.list': list
     })
     ipcRenderer.send('getPicBeds')
   }
   handleAutoStartChange (val: boolean) {
-    db.set('settings.autoStart', val)
+    this.saveConfig('settings.autoStart', val)
     ipcRenderer.send('autoStart', val)
   }
   handleRename (val: boolean) {
-    this.letPicGoSaveData({
+    this.saveConfig({
       'settings.rename': val
     })
   }
   handleAutoRename (val: boolean) {
-    this.letPicGoSaveData({
+    this.saveConfig({
       'settings.autoRename': val
     })
   }
@@ -507,17 +586,28 @@ export default class extends Vue {
     this.checkUpdateVisible = false
   }
   handleUploadNotification (val: boolean) {
-    db.set('settings.uploadNotification', val)
+    this.saveConfig({
+      'settings.uploadNotification': val
+    })
   }
   handleMiniWindowOntop (val: boolean) {
-    db.set('settings.miniWindowOntop', val)
+    this.saveConfig('settings.miniWindowOntop', val)
     this.$message.info('需要重启生效')
   }
+  handleAutoCopyUrl (val: boolean) {
+    this.saveConfig('settings.autoCopy', val)
+    const successNotification = new Notification('设置自动复制链接', {
+      body: '设置成功'
+    })
+    successNotification.onclick = () => {
+      return true
+    }
+  }
   confirmLogLevelSetting () {
     if (this.form.logLevel.length === 0) {
       return this.$message.error('请选择日志记录等级')
     }
-    this.letPicGoSaveData({
+    this.saveConfig({
       'settings.logLevel': this.form.logLevel
     })
     const successNotification = new Notification('设置日志', {
@@ -528,9 +618,9 @@ export default class extends Vue {
     }
     this.logFileVisible = false
   }
-  cancelLogLevelSetting () {
+  async cancelLogLevelSetting () {
     this.logFileVisible = false
-    let logLevel = db.get('settings.logLevel')
+    let logLevel = await this.getConfig<string | string[]>('settings.logLevel')
     if (!Array.isArray(logLevel)) {
       if (logLevel && logLevel.length > 0) {
         logLevel = [logLevel]
@@ -541,7 +631,9 @@ export default class extends Vue {
     this.form.logLevel = logLevel
   }
   confirmServerSetting () {
-    this.letPicGoSaveData({
+    // @ts-ignore
+    this.server.port = parseInt(this.server.port, 10)
+    this.saveConfig({
       'settings.server': this.server
     })
     const successNotification = new Notification('设置PicGo-Server', {
@@ -553,9 +645,9 @@ export default class extends Vue {
     this.serverVisible = false
     ipcRenderer.send('updateServer')
   }
-  cancelServerSetting () {
+  async cancelServerSetting () {
     this.serverVisible = false
-    this.server = db.get('settings.server') || {
+    this.server = await this.getConfig('settings.server') || {
       port: 36677,
       host: '127.0.0.1',
       enable: true

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"'
@@ -155,26 +164,32 @@ export default class extends Vue {
       document.querySelector('.main-content.el-row').style.zIndex = 10
     }
   }
-  created () {
+  async created () {
     this.os = process.platform
-    ipcRenderer.on('pluginList', (evt: IpcRendererEvent, list: IPicGoPlugin[]) => {
+    ipcRenderer.on('hideLoading', () => {
-      this.pluginList = list
-      this.pluginNameList = list.map(item => item.name)
       this.loading = false
     })
-    ipcRenderer.on('installSuccess', (evt: IpcRendererEvent, plugin: string) => {
+    ipcRenderer.on('pluginList', (evt: IpcRendererEvent, list: IPicGoPlugin[]) => {
+      this.pluginList = list
+      this.pluginNameList = list.map(item => item.fullName)
+      this.loading = false
+    })
+    ipcRenderer.on('installPlugin', (evt: IpcRendererEvent, { success, body }: {
+      success: boolean,
+      body: string
+    }) => {
       this.loading = false
       this.pluginList.forEach(item => {
-        if (item.name === plugin) {
+        if (item.fullName === body) {
           item.ing = false
-          item.hasInstall = true
+          item.hasInstall = success
         }
       })
     })
     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 +201,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,32 +210,33 @@ export default class extends Vue {
           }
           this.getPicBeds()
         }
-        return item.name !== plugin
+        return item.fullName !== plugin
       })
       this.pluginNameList = this.pluginNameList.filter(item => item !== plugin)
     })
     this.getPluginList()
     this.getSearchResult = debounce(this.getSearchResult, 50)
-    this.needReload = this.$db.get('needReload')
+    this.needReload = await this.getConfig<boolean>('needReload') || false
   }
-  buildContextMenu (plugin: IPicGoPlugin) {
+  async buildContextMenu (plugin: IPicGoPlugin) {
     const _this = this
     let menu = [{
       label: '启用插件',
       enabled: !plugin.enabled,
       click () {
-        _this.letPicGoSaveData({
+        _this.saveConfig({
-          [`picgoPlugins.picgo-plugin-${plugin.name}`]: true
+          [`picgoPlugins.${plugin.fullName}`]: true
         })
         plugin.enabled = true
         _this.getPicBeds()
+        _this.needReload = true
       }
     }, {
       label: '禁用插件',
       enabled: plugin.enabled,
       click () {
-        _this.letPicGoSaveData({
+        _this.saveConfig({
-          [`picgoPlugins.picgo-plugin-${plugin.name}`]: false
+          [`picgoPlugins.${plugin.fullName}`]: false
         })
         plugin.enabled = false
         _this.getPicBeds()
@@ -230,28 +246,30 @@ export default class extends Vue {
         if (plugin.config.uploader.name) {
           _this.handleRestoreState('uploader', plugin.config.uploader.name)
         }
+        _this.needReload = true
       }
     }, {
       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
-          }
+          },
+          enabled: plugin.enabled
         }
         menu.push(obj)
       }
@@ -259,7 +277,7 @@ export default class extends Vue {
 
     // handle transformer
     if (plugin.config.transformer.name) {
-      let currentTransformer = this.$db.get('picBed.transformer') || 'path'
+      let currentTransformer = await this.getConfig<string>('picBed.transformer') || 'path'
       let pluginTransformer = plugin.config.transformer.name
       const obj = {
         label: `${currentTransformer === pluginTransformer ? '禁用' : '启用'}transformer - ${plugin.config.transformer.name}`,
@@ -280,7 +298,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)
           }
         })
       }
@@ -303,13 +321,13 @@ export default class extends Vue {
         type: 'warning'
       }).then(() => {
         item.ing = true
-        ipcRenderer.send('installPlugin', item.name)
+        ipcRenderer.send('installPlugin', item.fullName)
       }).catch(() => {
         console.log('Install canceled')
       })
     } else {
       item.ing = true
-      ipcRenderer.send('installPlugin', item.name)
+      ipcRenderer.send('installPlugin', item.fullName)
     }
   }
   uninstallPlugin (val: string) {
@@ -318,22 +336,26 @@ 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 () {
     remote.app.relaunch()
     remote.app.exit(0)
   }
-  handleReload () {
+  async handleReload () {
-    this.$db.set('needReload', true)
+    this.saveConfig({
+      needReload: true
+    })
     this.needReload = true
     const successNotification = new Notification('更新成功', {
       body: '请点击此通知重启应用以生效'
@@ -345,14 +367,14 @@ export default class extends Vue {
   cleanSearch () {
     this.searchText = ''
   }
-  toggleTransformer (transformer: string) {
+  async toggleTransformer (transformer: string) {
-    let currentTransformer = this.$db.get('picBed.transformer') || 'path'
+    let currentTransformer = await this.getConfig<string>('picBed.transformer') || 'path'
     if (currentTransformer === transformer) {
-      this.letPicGoSaveData({
+      this.saveConfig({
         'picBed.transformer': 'path'
       })
     } else {
-      this.letPicGoSaveData({
+      this.saveConfig({
         'picBed.transformer': transformer
       })
     }
@@ -363,17 +385,17 @@ export default class extends Vue {
     if (result !== false) {
       switch (this.currentType) {
         case 'plugin':
-          this.letPicGoSaveData({
+          this.saveConfig({
-            [`picgo-plugin-${this.configName}`]: result
+            [`${this.configName}`]: result
           })
           break
         case 'uploader':
-          this.letPicGoSaveData({
+          this.saveConfig({
             [`picBed.${this.configName}`]: result
           })
           break
         case 'transformer':
-          this.letPicGoSaveData({
+          this.saveConfig({
             [`transformer.${this.configName}`]: result
           })
           break
@@ -407,7 +429,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,31 +438,33 @@ 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
     }
   }
   // restore Uploader & Transformer
-  handleRestoreState (item: string, name: string) {
+  async handleRestoreState (item: string, name: string) {
     if (item === 'uploader') {
-      const current = this.$db.get('picBed.current')
+      const current = await this.getConfig('picBed.current')
       if (current === name) {
-        this.letPicGoSaveData({
+        this.saveConfig({
-          'picBed.current': 'smms'
+          'picBed.current': 'smms',
+          'picBed.uploader': 'smms'
         })
       }
     }
     if (item === 'transformer') {
-      const current = this.$db.get('picBed.transformer')
+      const current = await this.getConfig('picBed.transformer')
       if (current === name) {
-        this.letPicGoSaveData({
+        this.saveConfig({
           'picBed.transformer': 'path'
         })
       }
@@ -454,14 +478,16 @@ export default class extends Vue {
   goAwesomeList () {
     remote.shell.openExternal('https://github.com/PicGo/Awesome-PicGo')
   }
-  letPicGoSaveData (data: IObj) {
+  handleImportLocalPlugin () {
-    ipcRenderer.send('picgoSaveData', data)
+    ipcRenderer.send('importLocalPlugin')
+    this.loading = true
   }
   beforeDestroy () {
     ipcRenderer.removeAllListeners('pluginList')
-    ipcRenderer.removeAllListeners('installSuccess')
+    ipcRenderer.removeAllListeners('installPlugin')
     ipcRenderer.removeAllListeners('uninstallSuccess')
     ipcRenderer.removeAllListeners('updateSuccess')
+    ipcRenderer.removeAllListeners('hideLoading')
   }
 }
 </script>
@@ -491,6 +517,7 @@ $darwinBg = #172426
     font-size 20px
     text-align center
     margin 10px auto
+    position relative
     i.el-icon-goods
       font-size 20px
       vertical-align middle
@@ -498,6 +525,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/ShortKey.vue

@@ -98,6 +98,7 @@
 import { Component, Vue, Watch } from 'vue-property-decorator'
 import keyDetect from '@/utils/key-binding'
 import { ipcRenderer, IpcRendererEvent } from 'electron'
+import { TOGGLE_SHORTKEY_MODIFIED_MODE } from '#/events/constants'
 
 @Component({
   name: 'shortkey-page'
@@ -108,8 +109,8 @@ export default class extends Vue {
   command = ''
   shortKey = ''
   currentIndex = 0
-  created () {
+  async created () {
-    const shortKeyConfig = this.$db.get('settings.shortKey') as IShortKeyConfigs
+    const shortKeyConfig = (await this.getConfig<IShortKeyConfigs>('settings.shortKey'))!
     this.list = Object.keys(shortKeyConfig).map(item => {
       return {
         ...shortKeyConfig[item],
@@ -119,7 +120,7 @@ export default class extends Vue {
   }
   @Watch('keyBindingVisible')
   onKeyBindingVisibleChange (val: boolean) {
-    ipcRenderer.send('toggleShortKeyModifiedMode', val)
+    ipcRenderer.send(TOGGLE_SHORTKEY_MODIFIED_MODE, val)
   }
   calcOrigin (item: string) {
     const [origin] = item.split(':')
@@ -131,26 +132,23 @@ export default class extends Vue {
   toggleEnable (item: IShortKeyConfig) {
     const status = !item.enable
     item.enable = status
-    // this.$db.set(`settings.shortKey.${item.name}.enable`, status)
     ipcRenderer.send('bindOrUnbindShortKey', item, item.from)
   }
   keyDetect (event: KeyboardEvent) {
     this.shortKey = keyDetect(event).join('+')
   }
-  openKeyBindingDialog (config: IShortKeyConfig, index: number) {
+  async openKeyBindingDialog (config: IShortKeyConfig, index: number) {
     this.command = `${config.from}:${config.name}`
-    this.shortKey = this.$db.get(`settings.shortKey.${this.command}.key`)
+    this.shortKey = await this.getConfig(`settings.shortKey.${this.command}.key`) || ''
     this.currentIndex = index
     this.keyBindingVisible = true
   }
-  cancelKeyBinding () {
+  async cancelKeyBinding () {
     this.keyBindingVisible = false
-    this.shortKey = this.$db.get(`settings.shortKey.${this.command}.key`)
+    this.shortKey = await this.getConfig<string>(`settings.shortKey.${this.command}.key`) || ''
   }
-  confirmKeyBinding () {
+  async confirmKeyBinding () {
-    const oldKey = this.$db.get(`settings.shortKey.${this.command}.key`)
+    const oldKey = await this.getConfig<string>(`settings.shortKey.${this.command}.key`)
-    // this.$db.set(`settings.shortKey.${this.command}.key`, this.shortKey)
-    // const newKey = this.$db.get(`settings.shortKey.${this.command}`)
     const config = Object.assign({}, this.list[this.currentIndex])
     config.key = this.shortKey
     ipcRenderer.send('updateShortKey', config, oldKey, config.from)
@@ -162,7 +160,7 @@ export default class extends Vue {
     })
   }
   beforeDestroy () {
-    ipcRenderer.send('toggleShortKeyModifiedMode', false)
+    ipcRenderer.send(TOGGLE_SHORTKEY_MODIFIED_MODE, false)
   }
 }
 </script>

src/renderer/pages/TrayPage.vue

@@ -30,12 +30,15 @@ import { Component, Vue } from 'vue-property-decorator'
 import mixin from '@/utils/mixin'
 import pasteTemplate from '#/utils/pasteTemplate'
 import { ipcRenderer, clipboard } from 'electron'
+import { IPasteStyle } from '#/types/enum'
+import { IResult } from '@picgo/store/dist/types'
+
 @Component({
   name: 'tray-page',
   mixins: [mixin]
 })
 export default class extends Vue {
-  files = []
+  files: IResult<ImgInfo>[] = []
   notification = {
     title: '复制链接成功',
     body: '',
@@ -46,16 +49,16 @@ export default class extends Vue {
   get reverseList () {
     return this.files.slice().reverse()
   }
-  getData () {
+  async getData () {
-    // @ts-ignore
+    this.files = (await this.$$db.get<ImgInfo>({ orderBy: 'desc', limit: 5 })).data
-    this.files = this.$db.read().get('uploaded').slice().reverse().slice(0, 5).value()
   }
-  copyTheLink (item: ImgInfo) {
+  async copyTheLink (item: ImgInfo) {
     this.notification.body = item.imgUrl!
     this.notification.icon = item.imgUrl!
     const myNotification = new Notification(this.notification.title, this.notification)
-    const pasteStyle = this.$db.get('settings.pasteStyle') || 'markdown'
+    const pasteStyle = await this.getConfig<IPasteStyle>('settings.pasteStyle') || IPasteStyle.MARKDOWN
-    clipboard.writeText(pasteTemplate(pasteStyle, item))
+    const customLink = await this.getConfig<string>('settings.customLink')
+    clipboard.writeText(pasteTemplate(pasteStyle, item, customLink))
     myNotification.onclick = () => {
       return true
     }
@@ -83,19 +86,18 @@ export default class extends Vue {
   mounted () {
     this.disableDragFile()
     this.getData()
-    ipcRenderer.on('dragFiles', (event: Event, files: string[]) => {
+    ipcRenderer.on('dragFiles', async (event: Event, files: string[]) => {
-      files.forEach(item => {
+      for (let i = 0; i < files.length; i++) {
-        this.$db.insert('uploaded', item)
+        const item = files[i]
-      })
+        await this.$$db.insert(item)
-      // @ts-ignore
+      }
-      this.files = this.$db.read().get('uploaded').slice().reverse().slice(0, 5).value()
+      this.files = (await this.$$db.get<ImgInfo>({ orderBy: 'desc', limit: 5 })).data
     })
     ipcRenderer.on('clipboardFiles', (event: Event, files: ImgInfo[]) => {
       this.clipboardFiles = files
     })
-    ipcRenderer.on('uploadFiles', (event: Event) => {
+    ipcRenderer.on('uploadFiles', async (event: Event) => {
-      // @ts-ignore
+      this.files = (await this.$$db.get<ImgInfo>({ orderBy: 'desc', limit: 5 })).data
-      this.files = this.$db.read().get('uploaded').slice().reverse().slice(0, 5).value()
       console.log(this.files)
       this.uploadFlag = false
     })

src/renderer/pages/Upload.vue

@@ -48,7 +48,8 @@
             <div class="paste-style__text">
               快捷上传
             </div>
-            <el-button type="primary" round size="mini" @click="uploadClipboardFiles" class="paste-upload">剪贴板图片上传</el-button>
+            <el-button type="primary" round size="mini" @click="uploadClipboardFiles" class="quick-upload" style="width: 50%">剪贴板图片</el-button>
+            <el-button type="primary" round size="mini" @click="uploadURLFiles" class="quick-upload" style="width: 46%; margin-left: 6px">URL</el-button>
           </div>
         </div>
       </el-col>
@@ -62,6 +63,13 @@ import {
   IpcRendererEvent,
   remote
 } from 'electron'
+import {
+  SHOW_INPUT_BOX,
+  SHOW_INPUT_BOX_RESPONSE
+} from '~/universal/events/constants'
+import {
+  isUrl
+} from '~/universal/utils/common'
 const { Menu } = remote
 @Component({
   name: 'upload'
@@ -92,6 +100,7 @@ export default class extends Vue {
     })
     ipcRenderer.send('getPicBeds')
     ipcRenderer.on('getPicBeds', this.getPicBeds)
+    this.$bus.$on(SHOW_INPUT_BOX_RESPONSE, this.handleInputBoxValue)
   }
   @Watch('progress')
   onProgressChange (val: number) {
@@ -106,13 +115,41 @@ export default class extends Vue {
     }
   }
   beforeDestroy () {
+    this.$bus.$off(SHOW_INPUT_BOX_RESPONSE)
     ipcRenderer.removeAllListeners('uploadProgress')
     ipcRenderer.removeAllListeners('syncPicBed')
     ipcRenderer.removeListener('getPicBeds', this.getPicBeds)
   }
   onDrop (e: DragEvent) {
     this.dragover = false
-    this.ipcSendFiles(e.dataTransfer!.files)
+    const items = e.dataTransfer!.items
+    if (items.length === 2 && items[0].type === 'text/uri-list') {
+      this.handleURLDrag(items, e.dataTransfer!)
+    } else if (items[0].type === 'text/plain') {
+      const str = e.dataTransfer!.getData(items[0].type)
+      if (isUrl(str)) {
+        ipcRenderer.send('uploadChoosedFiles', [{ path: str }])
+      } else {
+        this.$message.error('请拖入合法的图片文件或者图片URL地址')
+      }
+    } else {
+      this.ipcSendFiles(e.dataTransfer!.files)
+    }
+  }
+  handleURLDrag (items: DataTransferItemList, dataTransfer: DataTransfer) {
+    // text/html
+    // Use this data to get a more precise URL
+    const urlString = dataTransfer.getData(items[1].type)
+    const urlMatch = urlString.match(/<img.*src="(.*?)"/)
+    if (urlMatch) {
+      ipcRenderer.send('uploadChoosedFiles', [
+        {
+          path: urlMatch[1]
+        }
+      ])
+    } else {
+      this.$message.error('请拖入合法的图片文件或者图片URL地址')
+    }
   }
   openUplodWindow () {
     document.getElementById('file-uploader')!.click()
@@ -132,19 +169,39 @@ export default class extends Vue {
     })
     ipcRenderer.send('uploadChoosedFiles', sendFiles)
   }
-  getPasteStyle () {
+  async getPasteStyle () {
-    this.pasteStyle = this.$db.get('settings.pasteStyle') || 'markdown'
+    this.pasteStyle = await this.getConfig('settings.pasteStyle') || 'markdown'
   }
   handlePasteStyleChange (val: string) {
-    this.$db.set('settings.pasteStyle', val)
+    this.saveConfig({
+      'settings.pasteStyle': val
+    })
   }
   uploadClipboardFiles () {
     ipcRenderer.send('uploadClipboardFilesFromUploadPage')
   }
-  getDefaultPicBed () {
+  async uploadURLFiles () {
-    const current: string = this.$db.get('picBed.current')
+    const str = await navigator.clipboard.readText()
+    this.$bus.$emit(SHOW_INPUT_BOX, {
+      value: isUrl(str) ? str : '',
+      title: '请输入URL',
+      placeholder: 'http://或者https://开头'
+    })
+  }
+  handleInputBoxValue (val: string) {
+    if (val === '') return false
+    if (isUrl(val)) {
+      ipcRenderer.send('uploadChoosedFiles', [{
+        path: val
+      }])
+    } else {
+      this.$message.error('请输入合法的URL')
+    }
+  }
+  async getDefaultPicBed () {
+    const currentPicBed = await this.getConfig<string>('picBed.current')
     this.picBed.forEach(item => {
-      if (item.type === current) {
+      if (item.type === currentPicBed) {
         this.picBedName = item.name
       }
     })
@@ -153,21 +210,23 @@ export default class extends Vue {
     this.picBed = picBeds
     this.getDefaultPicBed()
   }
-  handleChangePicBed () {
+  async handleChangePicBed () {
-    this.buildMenu()
+    await this.buildMenu()
     // this.menu.popup(remote.getCurrentWindow())
     this.menu!.popup()
   }
-  buildMenu () {
+  async buildMenu () {
     const _this = this
+    const currentPicBed = await this.getConfig<string>('picBed.current')
     const submenu = this.picBed.filter(item => item.visible).map(item => {
       return {
         label: item.name,
         type: 'radio',
-        checked: this.$db.get('picBed.current') === item.type,
+        checked: currentPicBed === item.type,
         click () {
-          _this.letPicGoSaveData({
+          _this.saveConfig({
-            'picBed.current': item.type
+            'picBed.current': item.type,
+            'picBed.uploader': item.type
           })
           ipcRenderer.send('syncPicBed')
         }
@@ -239,8 +298,6 @@ export default class extends Vue {
     .el-radio-button__inner
       border-left none
       border-radius 0 14px 14px 0
-  .paste-upload
-    width 100%
   .el-icon-caret-bottom
     cursor pointer
 </style>

src/renderer/pages/picbeds/AliYun.vue

@@ -86,8 +86,8 @@ export default class extends Vue {
     customUrl: '',
     options: ''
   }
-  created () {
+  async created () {
-    const config = this.$db.get('picBed.aliyun') as IAliYunConfig
+    const config = await this.getConfig<IAliYunConfig>('picBed.aliyun')
     if (config) {
       this.form = Object.assign({}, config)
     }
@@ -96,7 +96,7 @@ export default class extends Vue {
     // @ts-ignore
     this.$refs.aliyun.validate((valid) => {
       if (valid) {
-        this.letPicGoSaveData({
+        this.saveConfig({
           'picBed.aliyun': this.form
         })
         const successNotification = new window.Notification('设置结果', {

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"
@@ -71,8 +71,8 @@ export default class extends Vue {
     customUrl: '',
     branch: ''
   }
-  created () {
+  async created () {
-    const config = this.$db.get('picBed.github') as IGitHubConfig
+    const config = await this.getConfig<IGitHubConfig>('picBed.github')
     if (config) {
       this.form = Object.assign({}, config)
     }
@@ -81,7 +81,7 @@ export default class extends Vue {
     // @ts-ignore
     this.$refs.github.validate((valid) => {
       if (valid) {
-        this.letPicGoSaveData({
+        this.saveConfig({
           'picBed.github': this.form
         })
         const successNotification = new Notification('设置结果', {

src/renderer/pages/picbeds/Imgur.vue

@@ -48,8 +48,8 @@ export default class extends Vue {
     clientId: '',
     proxy: ''
   }
-  created () {
+  async created () {
-    const config = this.$db.get('picBed.imgur') as IImgurConfig
+    const config = await this.getConfig<IImgurConfig>('picBed.imgur')
     if (config) {
       this.form = Object.assign({}, config)
     }
@@ -58,7 +58,7 @@ export default class extends Vue {
     // @ts-ignore
     this.$refs.imgur.validate((valid) => {
       if (valid) {
-        this.letPicGoSaveData({
+        this.saveConfig({
           'picBed.imgur': this.form
         })
         const successNotification = new Notification('设置结果', {

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 }}设置
@@ -56,7 +56,7 @@ export default class extends Vue {
     // @ts-ignore
     const result = await this.$refs.configForm.validate()
     if (result !== false) {
-      this.letPicGoSaveData({
+      this.saveConfig({
         [`picBed.${this.type}`]: result
       })
       const successNotification = new Notification('设置结果', {
@@ -68,8 +68,9 @@ export default class extends Vue {
     }
   }
   setDefaultPicBed (type: string) {
-    this.letPicGoSaveData({
+    this.saveConfig({
-      'picBed.current': type
+      'picBed.current': type,
+      'picBed.uploader': type
     })
     // @ts-ignore 来自mixin的数据
     this.defaultPicBed = type
@@ -91,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/renderer/pages/picbeds/Qiniu.vue

@@ -17,7 +17,7 @@
             :rules="{
               required: true, message: 'AccessKey不能为空', trigger: 'blur'
             }">
-            <el-input v-model="form.accessKey" placeholder="AccessKey" @keyup.native.enter="confirm('weiboForm')"></el-input>
+            <el-input v-model="form.accessKey" placeholder="AccessKey" @keyup.native.enter="confirm"></el-input>
           </el-form-item>
           <el-form-item
             label="设定SecretKey"
@@ -88,8 +88,8 @@ export default class extends Vue {
     options: '',
     path: ''
   }
-  created () {
+  async created () {
-    const config = this.$db.get('picBed.qiniu') as IQiniuConfig
+    const config = await this.getConfig<IQiniuConfig>('picBed.qiniu')
     if (config) {
       this.form = Object.assign({}, config)
     }
@@ -98,7 +98,7 @@ export default class extends Vue {
     // @ts-ignore
     this.$refs.qiniu.validate((valid) => {
       if (valid) {
-        this.letPicGoSaveData({
+        this.saveConfig({
           'picBed.qiniu': this.form
         })
         const successNotification = new Notification('设置结果', {

src/renderer/pages/picbeds/SMMS.vue

@@ -5,12 +5,27 @@
         <div class="view-title">
           SM.MS设置
         </div>
-        <div class="content">
+        <el-form
-          感谢SM.MS提供的优质服务
+          ref="smms"
-        </div>
+          label-position="right"
-        <div style="text-align: center; margin-top: 20px;">
+          label-width="120px"
-          <el-button type="success" @click="confirm" round :disabled="defaultPicBed === 'smms'" size="mini">设为默认图床</el-button>
+          :model="form"
-        </div>
+          size="mini">
+          <el-form-item
+            label="设定Token"
+            prop="token"
+            :rules="{
+              required: true, message: 'Token不能为空', trigger: 'blur'
+            }">
+            <el-input v-model="form.token" type="password" placeholder="token" @keyup.native.enter="confirm('smmsForm')"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group>
+              <el-button type="primary" @click="confirm" round>确定</el-button>
+              <el-button type="success" @click="setDefaultPicBed('smms')" round :disabled="defaultPicBed === 'smms'">设为默认图床</el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-form>
       </el-col>
     </el-row>
   </div>
@@ -23,25 +38,58 @@ import mixin from '@/utils/ConfirmButtonMixin'
   mixins: [mixin]
 })
 export default class extends Vue {
-  confirm () {
+  form: ISMMSConfig = {
-    this.letPicGoSaveData({
+    token: ''
-      'picBed.smms': true
+  }
-    })
+  async created () {
-    // @ts-ignore 来自mixin
+    const config = await this.getConfig<string | boolean>('picBed.smms.token')
-    this.setDefaultPicBed('smms')
+    if (typeof config !== 'boolean') {
-    const successNotification = new window.Notification('设置结果', {
+      this.form.token = config || ''
-      body: '设置成功'
-    })
-    successNotification.onclick = () => {
-      return true
     }
   }
+  confirm () {
+    // @ts-ignore
+    this.$refs.smms.validate((valid) => {
+      if (valid) {
+        this.saveConfig({
+          'picBed.smms': this.form
+        })
+        const successNotification = new window.Notification('设置结果', {
+          body: '设置成功'
+        })
+        successNotification.onclick = () => {
+          return true
+        }
+      } else {
+        return false
+      }
+    })
+  }
 }
 </script>
 <style lang='stylus'>
 #smms-view
-  .content
+  .el-form
-    text-align center
+    label
-    font-size 14px
+      line-height 22px
-    color #eee
+      padding-bottom 0
+      color #eee
+    .el-input__inner
+      border-radius 19px
+    &-item
+      margin-bottom 10.5px
+  .el-radio-group
+    width 100%
+    label
+      width 25%
+    .el-radio-button__inner
+      width 100%
+  .el-radio-button:first-child
+    .el-radio-button__inner
+      border-left none
+      border-radius 14px 0 0 14px
+  .el-radio-button:last-child
+    .el-radio-button__inner
+      border-left none
+      border-radius 0 14px 14px 0
 </style>

src/renderer/pages/picbeds/TcYun.vue

@@ -30,7 +30,7 @@
             :rules="{
               required: true, message: 'SecretId不能为空', trigger: 'blur'
             }">
-            <el-input v-model="form.secretId" placeholder="SecretId" @keyup.native.enter="confirm('weiboForm')"></el-input>
+            <el-input v-model="form.secretId" placeholder="SecretId" @keyup.native.enter="confirm"></el-input>
           </el-form-item>
           <el-form-item
             label="设定SecretKey"
@@ -104,8 +104,8 @@ export default class extends Vue {
     customUrl: '',
     version: 'v4'
   }
-  created () {
+  async created () {
-    const config = this.$db.get('picBed.tcyun') as ITcYunConfig
+    const config = await this.getConfig<ITcYunConfig>('picBed.tcyun')
     if (config) {
       this.form = Object.assign({}, config)
     }
@@ -114,7 +114,7 @@ export default class extends Vue {
     // @ts-ignore
     this.$refs.tcyun.validate((valid) => {
       if (valid) {
-        this.letPicGoSaveData({
+        this.saveConfig({
           'picBed.tcyun': this.form
         })
         const successNotification = new window.Notification('设置结果', {

src/renderer/pages/picbeds/UpYun.vue

@@ -79,8 +79,8 @@ export default class extends Vue {
     options: '',
     path: ''
   }
-  created () {
+  async created () {
-    const config = this.$db.get('picBed.upyun') as IUpYunConfig
+    const config = await this.getConfig<IUpYunConfig>('picBed.upyun')
     if (config) {
       this.form = Object.assign({}, config)
     }
@@ -89,7 +89,7 @@ export default class extends Vue {
     // @ts-ignore
     this.$refs.tcyun.validate((valid) => {
       if (valid) {
-        this.letPicGoSaveData({
+        this.saveConfig({
           'picBed.upyun': this.form
         })
         const successNotification = new Notification('设置结果', {

src/renderer/pages/picbeds/Weibo.vue

@@ -1,153 +0,0 @@
-<template>
-  <div id="weibo-view">
-    <el-row :gutter="16">
-      <el-col :span="16" :offset="4">
-        <div class="view-title">
-          微博图床设置[已停止支持]
-        </div>
-        <el-form
-          ref="weiboForm"
-          label-position="right"
-          label-width="120px"
-          size="small"
-          :model="form">
-          <el-form-item
-            label="设定用户名"
-            prop="username"
-            :rules="{
-              required: !chooseCookie, message: '用户名不能为空', trigger: 'blur'
-            }">
-            <el-input v-model="form.username" placeholder="用户名" @keyup.native.enter="confirm('weiboForm')" :disabled="chooseCookie"></el-input>
-          </el-form-item>
-          <el-form-item
-            label="设定密码"
-            prop="password"
-            :rules="{required: !chooseCookie,messsage: '密码不能为空',trigger: 'blur'}">
-            <el-input v-model="form.password" type="password" @keyup.native.enter="confirm('weiboForm')" placeholder="密码" :disabled="chooseCookie"></el-input>
-          </el-form-item>
-          <el-form-item
-            label="使用Cookie上传"
-          >
-            <el-switch
-              v-model="chooseCookie"
-              active-text="cookie模式"
-              @change="handleSwitchChange"
-            ></el-switch>
-            <i class="el-icon-question" @click="openWiki"></i>
-          </el-form-item>
-          <el-form-item
-            label="设定Cookie"
-            prop="cookie"
-            :rules="{
-              required: chooseCookie, message: '密码不能为空', trigger: 'blur'
-            }">
-            <el-input v-model="form.cookie" @keyup.native.enter="confirm('weiboForm')" placeholder="Cookie" :disabled="!chooseCookie"></el-input>
-          </el-form-item>
-          <el-form-item label="* 图片质量">
-            <el-radio-group v-model="quality">
-              <el-radio label="thumbnail">缩略图</el-radio>
-              <el-radio label="mw690">中等尺寸</el-radio>
-              <el-radio label="large">原图</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group>
-              <el-button type="primary" @click="confirm('weiboForm')" round>确定</el-button>
-              <el-button type="success" @click="setDefaultPicBed('weibo')" round :disabled="defaultPicBed === 'weibo'">设为默认图床</el-button>
-            </el-button-group>
-          </el-form-item>
-        </el-form>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-<script>
-import mixin from '@/utils/ConfirmButtonMixin'
-export default {
-  name: 'weibo',
-  mixins: [mixin],
-  data () {
-    return {
-      form: {
-        username: '',
-        password: '',
-        cookie: ''
-      },
-      chooseCookie: false,
-      quality: 'large'
-    }
-  },
-  created () {
-    const config = this.$db.get('picBed.weibo')
-    if (config) {
-      this.form.username = config.username
-      this.form.password = config.password
-      this.quality = config.quality || 'large'
-      this.form.cookie = config.cookie
-      this.chooseCookie = config.chooseCookie
-    }
-  },
-  methods: {
-    confirm (formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          this.letPicGoSaveData({
-            'picBed.weibo': {
-              username: this.form.username,
-              password: this.form.password,
-              quality: this.quality,
-              cookie: this.form.cookie,
-              chooseCookie: this.chooseCookie
-            }
-          })
-          const successNotification = new window.Notification('设置结果', {
-            body: '设置成功'
-          })
-          successNotification.onclick = () => {
-            return true
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    handleSwitchChange () {
-      this.$refs['weiboForm'].resetFields()
-    },
-    openWiki () {
-      this.$electron.remote.shell.openExternal('https://picgo.github.io/PicGo-Doc/zh/guide/config.html#微博图床')
-    }
-  }
-}
-</script>
-<style lang='stylus'>
-.el-message
-  left 60%
-#weibo-view
-  .el-form
-    label
-      line-height 22px
-      padding-bottom 0
-      color #eee
-    .el-button-group
-      width 100%
-      .el-button
-        width 50%
-    .el-input__inner
-      border-radius 19px
-    .el-radio-group
-      margin-left 25px
-    .el-switch__label
-      color #eee
-      &.is-active
-        color #409EFF
-    .el-icon-question
-      font-size 20px
-      float right
-      margin-top 9px
-      color #eee
-      cursor pointer
-      transition .2s color ease-in-out
-      &:hover
-        color #409EFF
-</style>

src/renderer/router/index.ts

@@ -22,20 +22,15 @@ export default new Router({
       component: () => import(/* webpackChunkName: "MiniPage" */ '@/pages/MiniPage.vue')
     },
     {
-      path: '/setting',
+      path: '/main-page',
-      name: 'setting-page',
+      name: 'main-page',
-      component: () => import(/* webpackChunkName: "SettingPage" */ '@/layouts/SettingPage.vue'),
+      component: () => import(/* webpackChunkName: "SettingPage" */ '@/layouts/Main.vue'),
       children: [
         {
           path: 'upload',
           component: () => import(/* webpackChunkName: "Upload" */ '@/pages/Upload.vue'),
           name: 'upload'
         },
-        {
-          path: 'weibo',
-          component: () => import(/* webpackChunkName: "Weibo" */ '@/pages/picbeds/Weibo.vue'),
-          name: 'weibo'
-        },
         {
           path: 'qiniu',
           component: () => import(/* webpackChunkName: "Qiniu" */ '@/pages/picbeds/Qiniu.vue'),

src/renderer/utils/ConfirmButtonMixin.ts

@@ -1,11 +1,19 @@
 import { Component, Vue } from 'vue-property-decorator'
 import { ipcRenderer } from 'electron'
+import { IConfig } from 'picgo/dist/src/types'
 @Component
 export default class extends Vue {
-  defaultPicBed = this.$db.get('picBed.current')
+  defaultPicBed = 'smms'
+  async created () {
+    const config = await this.getConfig<IConfig>()
+    if (config) {
+      this.defaultPicBed = config?.picBed?.uploader || config?.picBed?.current || 'smms'
+    }
+  }
   setDefaultPicBed (type: string) {
-    this.letPicGoSaveData({
+    this.saveConfig({
-      'picBed.current': type
+      'picBed.current': type,
+      'picBed.uploader': type
     })
     this.defaultPicBed = type
     const successNotification = new Notification('设置默认图床', {

src/renderer/utils/analytics.ts

@@ -0,0 +1,23 @@
+/* eslint-disable camelcase */
+import {
+  TALKING_DATA_APPID, TALKING_DATA_EVENT
+} from '~/universal/events/constants'
+import pkg from 'root/package.json'
+import { ipcRenderer } from 'electron'
+import { handleTalkingDataEvent } from './common'
+const { version } = pkg
+
+export const initTalkingData = () => {
+  setTimeout(() => {
+    const talkingDataScript = document.createElement('script')
+
+    talkingDataScript.src = `http://sdk.talkingdata.com/app/h5/v1?appid=${TALKING_DATA_APPID}&vn=${version}&vc=${version}`
+
+    const head = document.getElementsByTagName('head')[0]
+    head.appendChild(talkingDataScript)
+  }, 0)
+}
+
+ipcRenderer.on(TALKING_DATA_EVENT, (_, data: ITalkingDataOptions) => {
+  handleTalkingDataEvent(data)
+})

src/renderer/utils/bus.ts

@@ -0,0 +1,2 @@
+import Vue from 'vue'
+export default new Vue()

src/renderer/utils/common.ts

@@ -0,0 +1,10 @@
+const isDevelopment = process.env.NODE_ENV !== 'production'
+/* eslint-disable camelcase */
+export const handleTalkingDataEvent = (data: ITalkingDataOptions) => {
+  const { EventId, Label = '', MapKv = {} } = data
+  MapKv.from = window.location.href
+  window.TDAPP.onEvent(EventId, Label, MapKv)
+  if (isDevelopment) {
+    console.log('talkingData', data)
+  }
+}

src/renderer/utils/db.ts

@@ -0,0 +1,53 @@
+import { IObject, IResult, IGetResult, IFilter } from '@picgo/store/dist/types'
+import { ipcRenderer, IpcRendererEvent } from 'electron'
+import { uuid } from 'uuidv4'
+import {
+  PICGO_GET_DB,
+  PICGO_INSERT_DB,
+  PICGO_INSERT_MANY_DB,
+  PICGO_UPDATE_BY_ID_DB,
+  PICGO_GET_BY_ID_DB,
+  PICGO_REMOVE_BY_ID_DB
+} from '#/events/constants'
+import { IGalleryDB } from '#/types/extra-vue'
+export class GalleryDB implements IGalleryDB {
+  async get<T> (filter?: IFilter): Promise<IGetResult<T>> {
+    const res = await this.msgHandler<IGetResult<T>>(PICGO_GET_DB, filter)
+    return res
+  }
+  async insert<T> (value: T): Promise<IResult<T>> {
+    const res = await this.msgHandler<IResult<T>>(PICGO_INSERT_DB, value)
+    return res
+  }
+  async insertMany<T> (value: T[]): Promise<IResult<T>[]> {
+    const res = await this.msgHandler<IResult<T>[]>(PICGO_INSERT_MANY_DB, value)
+    return res
+  }
+  async updateById (id: string, value: IObject): Promise<boolean> {
+    const res = await this.msgHandler<boolean>(PICGO_UPDATE_BY_ID_DB, id, value)
+    return res
+  }
+  async getById<T> (id: string): Promise<IResult<T> | undefined> {
+    const res = await this.msgHandler<IResult<T> | undefined>(PICGO_GET_BY_ID_DB, id)
+    return res
+  }
+  async removeById (id: string): Promise<void> {
+    const res = await this.msgHandler<void>(PICGO_REMOVE_BY_ID_DB, id)
+    return res
+  }
+  private msgHandler<T> (method: string, ...args: any[]): Promise<T> {
+    return new Promise((resolve) => {
+      const callbackId = uuid()
+      const callback = (event: IpcRendererEvent, data: T, returnCallbackId: string) => {
+        if (returnCallbackId === callbackId) {
+          resolve(data)
+          ipcRenderer.removeListener(method, callback)
+        }
+      }
+      ipcRenderer.on(method, callback)
+      ipcRenderer.send(method, ...args, callbackId)
+    })
+  }
+}
+
+export default new GalleryDB()

src/renderer/utils/mainMixin.ts

@@ -1,8 +1,29 @@
 import { Component, Vue } from 'vue-property-decorator'
-import { ipcRenderer } from 'electron'
+import { ipcRenderer, IpcRendererEvent } from 'electron'
+import { PICGO_SAVE_CONFIG, PICGO_GET_CONFIG } from '#/events/constants'
+import { uuid } from 'uuidv4'
 @Component
 export default class extends Vue {
-  letPicGoSaveData (data: IObj) {
+  // support string key + value or object config
-    ipcRenderer.send('picgoSaveData', data)
+  saveConfig (config: IObj | string, value?: any) {
+    if (typeof config === 'string') {
+      config = {
+        [config]: value
+      }
+    }
+    ipcRenderer.send(PICGO_SAVE_CONFIG, config)
+  }
+  getConfig<T> (key?: string): Promise<T | undefined> {
+    return new Promise((resolve) => {
+      const callbackId = uuid()
+      const callback = (event: IpcRendererEvent, config: T | undefined, returnCallbackId: string) => {
+        if (returnCallbackId === callbackId) {
+          resolve(config)
+          ipcRenderer.removeListener(PICGO_GET_CONFIG, callback)
+        }
+      }
+      ipcRenderer.on(PICGO_GET_CONFIG, callback)
+      ipcRenderer.send(PICGO_GET_CONFIG, key, callbackId)
+    })
   }
 }

src/universal/events/constants.ts

@@ -0,0 +1,16 @@
+export const SHOW_INPUT_BOX = 'SHOW_INPUT_BOX'
+export const SHOW_INPUT_BOX_RESPONSE = 'SHOW_INPUT_BOX_RESPONSE'
+export const TOGGLE_SHORTKEY_MODIFIED_MODE = 'TOGGLE_SHORTKEY_MODIFIED_MODE'
+export const TALKING_DATA_APPID = '7E6832BCE3F1438696579E541DFEBFDA'
+export const TALKING_DATA_EVENT = 'TALKING_DATA_EVENT'
+export const SHOW_PRIVACY_MESSAGE = 'SHOW_PRIVACY_MESSAGE'
+export const PICGO_SAVE_CONFIG = 'PICGO_SAVE_CONFIG'
+export const PICGO_GET_CONFIG = 'PICGO_GET_CONFIG'
+export const PICGO_GET_DB = 'PICGO_GET_DB'
+export const PICGO_INSERT_DB = 'PICGO_INSERT_DB'
+export const PICGO_INSERT_MANY_DB = 'PICGO_INSERT_MANY_DB'
+export const PICGO_UPDATE_BY_ID_DB = 'PICGO_UPDATE_BY_ID_DB'
+export const PICGO_GET_BY_ID_DB = 'PICGO_GET_BY_ID_DB'
+export const PICGO_REMOVE_BY_ID_DB = 'PICGO_REMOVE_BY_ID_DB'
+export const PICGO_OPEN_FILE = 'PICGO_OPEN_FILE'
+export const OPEN_DEVTOOLS = 'OPEN_DEVTOOLS'

src/universal/types/electron.d.ts

@@ -3,18 +3,31 @@ import {
 } from 'electron'
 import {
   IWindowList
-} from '~/main/apis/window/constants'
+} from 'apis/app/window/constants'
 
 declare interface IWindowListItem {
   isValid: boolean
   multiple: boolean
   options: () => IBrowserWindowOptions,
-  callback: (window: BrowserWindow | null) => void
+  callback: (window: BrowserWindow, windowManager: IWindowManager) => void
 }
 
 declare interface IWindowManager {
   create: (name: IWindowList) => BrowserWindow | null
   get: (name: IWindowList) => BrowserWindow | null
-  delete: (name: IWindowList) => void
+  has: (name: IWindowList) => boolean
+  // delete: (name: IWindowList) => void
+  deleteById: (id: number) => void
   getAvailableWindow: () => BrowserWindow
 }
+
+// https://stackoverflow.com/questions/35074713/extending-typescript-global-object-in-node-js/44387594#44387594
+declare global {
+  namespace NodeJS {
+    interface Global {
+      PICGO_GUI_VERSION: string
+      PICGO_CORE_VERSION: string
+      notificationList?: IAppNotification[]
+    }
+  }
+}

src/universal/types/extra-vue.d.ts

@@ -1,13 +1,25 @@
 import VueRouter, { Route } from 'vue-router'
-import db from '#/datastore'
 import axios from 'axios'
+import { IObject, IResult, IGetResult, IFilter } from '@picgo/store/dist/types'
+
+interface IGalleryDB {
+  get<T>(filter?: IFilter): Promise<IGetResult<T>>
+  insert<T> (value: T): Promise<IResult<T>>
+  insertMany<T> (value: T[]): Promise<IResult<T>[]>
+  updateById (id: string, value: IObject): Promise<boolean>
+  getById<T> (id: string): Promise<IResult<T> | undefined>
+  removeById (id: string): Promise<void>
+}
+
 declare module 'vue/types/vue' {
   interface Vue {
     $router: VueRouter,
     $route: Route,
-    $db: typeof db
     $http: typeof axios
     $builtInPicBed: string[]
-    letPicGoSaveData(data: IObj): void
+    $bus: Vue
+    $$db: IGalleryDB
+    saveConfig(data: IObj | string, value?: any): void
+    getConfig<T>(key?: string): Promise<T | undefined>
   }
 }

src/universal/types/shims-tsx.d.ts

@@ -10,4 +10,10 @@ declare global {
       [elem: string]: any
     }
   }
+
+  interface Window {
+    TDAPP: {
+      onEvent: (EventId: string, Label?: string, MapKv?: IStringKeyMap) => void
+    }
+  }
 }

src/universal/types/types.d.ts

@@ -30,8 +30,8 @@ interface IServerCTX {
 }
 
 interface IServerConfig {
-  port: number
+  port: number | string
-  host: string,
+  host: string
   enable: boolean
 }
 
@@ -44,6 +44,8 @@ interface ImgInfo {
   height?: number
   extname?: string
   imgUrl?: string
+  id?: string
+  type?: string
   [propName: string]: any
 }
 
@@ -122,6 +124,7 @@ interface IBounds {
 type ICtx = import('picgo')
 interface IPicGoPlugin {
   name: string
+  fullName: string
   author: string
   description: string
   logo: string
@@ -142,8 +145,17 @@ interface IPicGoPlugin {
   hasInstall?: boolean
 }
 
+interface IPicGoPluginConfig {
+  name: string
+  type: string
+  required: boolean
+  default?: any
+  [propName: string]: any
+}
+
 interface IPluginMenuConfig {
   name: string
+  fullName?: string
   config: any[]
 }
 
@@ -170,6 +182,8 @@ interface INPMSearchResultObject {
   }
 }
 
+type IDispose = () => void
+
 // GuiApi
 interface IGuiApi {
   showInputBox: (options: IShowInputBoxOption) => Promise<string>
@@ -179,6 +193,7 @@ interface IGuiApi {
   showMessageBox: (options?: IShowMessageBoxOption) => Promise<IShowMessageBoxResult>
 }
 interface IShowInputBoxOption {
+  value?: string
   title: string
   placeholder: string
 }
@@ -190,6 +205,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 {
@@ -251,6 +274,10 @@ interface IQiniuConfig {
   path: string
 }
 
+interface ISMMSConfig {
+  token: string
+}
+
 interface ITcYunConfig {
   secretId: string,
   secretKey: string,
@@ -271,3 +298,30 @@ interface IUpYunConfig {
 }
 
 type ILoggerType = string | Error | boolean | number | undefined
+
+interface IAppNotification {
+  title: string
+  body: string
+  icon?: string
+}
+
+interface ITalkingDataOptions {
+  EventId: string
+  Label?: string
+  MapKv?: IStringKeyMap
+}
+
+interface IAnalyticsData {
+  fromClipboard: boolean
+  type: string
+  count: number
+  duration?: number // 耗时
+}
+
+interface IStringKeyMap {
+  [propName: string]: any
+}
+
+type ILogArgvType = string | number
+
+type ILogArgvTypeWithError = ILogArgvType | Error

src/universal/types/view.d.ts

@@ -7,6 +7,8 @@ interface ISettingForm {
   uploadNotification: boolean
   miniWindowOntop: boolean
   logLevel: string[]
+  autoCopyUrl: boolean
+  checkBetaUpdate: boolean
 }
 
 interface IShortKeyMap {

src/universal/utils/common.ts

@@ -0,0 +1,32 @@
+export const isUrl = (url: string): boolean => (url.startsWith('http://') || url.startsWith('https://'))
+export const isUrlEncode = (url: string): boolean => {
+  url = url || ''
+  try {
+    return url !== decodeURI(url)
+  } catch (e) {
+    // if some error caught, try to let it go
+    return true
+  }
+}
+
+export const handleUrlEncode = (url: string): string => {
+  if (!isUrlEncode(url)) {
+    url = encodeURI(url)
+  }
+  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-/, '')
+  }
+}

src/universal/utils/pasteTemplate.ts

@@ -1,9 +1,8 @@
-import db from '#/datastore'
 import { IPasteStyle } from '#/types/enum'
 
 const formatCustomLink = (customLink: string, item: ImgInfo) => {
   let fileName = item.fileName!.replace(new RegExp(`\\${item.extname}$`), '')
-  let url = item.url || item.imgUrl
+  const url = item.url || item.imgUrl
   const formatObj = {
     url,
     fileName
@@ -18,15 +17,15 @@ const formatCustomLink = (customLink: string, item: ImgInfo) => {
   return customLink
 }
 
-export default (style: IPasteStyle, item: ImgInfo) => {
+export default (style: IPasteStyle, item: ImgInfo, customLink: string | undefined) => {
-  let url = item.url || item.imgUrl
+  const url = item.url || item.imgUrl
-  const customLink = db.get('settings.customLink') || '$url'
+  const _customLink = customLink || '$url'
   const tpl = {
     'markdown': `![](${url})`,
     'HTML': `<img src="${url}"/>`,
     'URL': url,
     'UBB': `[IMG]${url}[/IMG]`,
-    'Custom': formatCustomLink(customLink, item)
+    'Custom': formatCustomLink(_customLink, item)
   }
   return tpl[style]
 }

tsconfig.json

@@ -30,6 +30,12 @@
       ],
       "#/*": [
         "src/universal/*"
+      ],
+      "apis/*": [
+        "src/main/apis/*"
+      ],
+      "@core/*": [
+        "src/main/apis/core/*"
       ]
     },
     "lib": [

vue.config.js

@@ -2,13 +2,24 @@ const path = require('path')
 function resolve (dir) {
   return path.join(__dirname, dir)
 }
-module.exports = {
+
+const arch = process.argv.includes('--ia32') ? 'ia32' : 'x64'
+
+const config = {
+  configureWebpack: {
+    devtool: 'nosources-source-map'
+  },
   chainWebpack: config => {
     config.resolve.alias
       .set('@', resolve('src/renderer'))
       .set('~', resolve('src'))
       .set('root', resolve('./'))
       .set('#', resolve('src/universal'))
+    // define
+    // config.plugin('define')
+    //   .tap(args => {
+    //     return args
+    //   })
   },
   pluginOptions: {
     electronBuilder: {
@@ -20,6 +31,8 @@ module.exports = {
           .set('~', resolve('src'))
           .set('root', resolve('./'))
           .set('#', resolve('src/universal'))
+          .set('apis', resolve('src/main/apis'))
+          .set('@core', resolve('src/main/apis/core'))
       },
       builderOptions: {
         productName: 'PicGo',
@@ -55,7 +68,14 @@ module.exports = {
         },
         win: {
           icon: 'build/icons/icon.ico',
-          target: 'nsis'
+          // eslint-disable-next-line no-template-curly-in-string
+          artifactName: `PicGo Setup \${version}-${arch}.exe`,
+          target: [{
+            target: 'nsis',
+            arch: [
+              arch
+            ]
+          }]
         },
         nsis: {
           shortcutName: 'PicGo',
@@ -72,3 +92,15 @@ module.exports = {
     }
   }
 }
+
+if (process.env.NODE_ENV === 'development') {
+  config.configureWebpack = {
+    devtool: 'source-map'
+  }
+  // for dev main process hot reload
+  config.pluginOptions.electronBuilder.mainProcessWatch = ['src/main/**/*']
+}
+
+module.exports = {
+  ...config
+}