🎉 Release: v2.3.0-beta.3

ISSUES CLOSED: #537

CHANGELOG.md

@@ -1,3 +1,33 @@
+# :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)
 
 

README.md

@@ -24,43 +24,40 @@
 
 ## 应用概述
 
-**PicGo: 一个用于快速上传图片并获取图片URL链接的工具**
+**PicGo: 一个用于快速上传图片并获取图片 URL 链接的工具**
 
 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~~ **由于官方不再支持V1版本，暂时请使用[smms-user](https://github.com/xlzy520/picgo-plugin-smms-user)插件**
+- `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/)**。
 
-
 ## 特色功能
 
 - 支持拖拽图片上传
 - 支持快捷键上传剪贴板里第一张图片
-- Windows和macOS支持右键图片文件通过菜单上传 (v2.1.0+)
+- Windows 和 macOS 支持右键图片文件通过菜单上传 (v2.1.0+)
 - 上传图片后自动复制链接到剪贴板
 - 支持自定义复制到剪贴板的链接格式
 - 支持修改快捷键，默认快速上传快捷键：`command+shift+p`（macOS）| `control+shift+p`（Windows\Linux)
-- 支持插件系统，已有插件支持Gitee、青云等第三方图床
+- 支持插件系统，已有插件支持 Gitee、青云等第三方图床
   - 更多第三方插件以及使用了 PicGo 底层的应用可以在 [Awesome-PicGo](https://github.com/PicGo/Awesome-PicGo) 找到。欢迎贡献！
-- 支持通过发送HTTP请求调用 PicGo 上传（v2.2.0+)
+- 支持通过发送 HTTP 请求调用 PicGo 上传（v2.2.0+)
 - 更多功能等你自己去发现，同时也会不断开发新功能
   - 开发进度可以查看 [Projects](https://github.com/Molunerfinn/PicGo/projects)，会同步更新开发进度
-  - 欢迎加入[官方Gitter频道](https://gitter.im/picgo-all/PicGo?utm_source=share-link&utm_medium=link&utm_campaign=share-link)与我交流
+  - 欢迎加入 [官方 Gitter 频道](https://gitter.im/picgo-all/PicGo?utm_source=share-link&utm_medium=link&utm_campaign=share-link) 与我交流
 
-
-**如果第一次使用，请参考应用[使用文档](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://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)。
 
 ### Windows
 
@@ -78,11 +75,10 @@ macOS 用户请下载最新版本的 `dmg` 文件。
 
 ### Linux
 
-Linux用户请下载 `AppImage` 文件。
+Linux 用户请下载 `AppImage` 文件。
 
 **如果你是 Arch 类的 Linux 用户，可以直接通过 `aurman -S picgo-appimage` 来安装 PicGo。感谢 @houbaron 的贡献！**
 
-
 ## 应用截图
 
 ![](https://raw.githubusercontent.com/Molunerfinn/test/master/picgo/picgo-2.0.gif)
@@ -97,9 +93,9 @@ Linux用户请下载 `AppImage` 文件。
 
 > 如果想学习 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` 并进入项目。
-3. `yarn` 下载依赖。注意如果你没有 `yarn`，请去[官网](https://classic.yarnpkg.com/en/docs/install)下载安装后再使用。 **用 `npm install` 将导致未知错误！**
+3. `yarn` 下载依赖。注意如果你没有 `yarn`，请去 [官网](https://classic.yarnpkg.com/en/docs/install) 下载安装后再使用。 **用 `npm install` 将导致未知错误！**
 4. Mac 需要有 Xcode 环境，Windows 需要有 VS 环境。
 
 ### 开发模式
@@ -111,7 +107,7 @@ ctrl+c # 退出开发模式
 npm run electron:serve # 重新进入开发模式
 ```
 
-**注：Windows开发模式运行之后会在底部任务栏的右下角应用区出现PicGo的应用图标。**
+**注：Windows 开发模式运行之后会在底部任务栏的右下角应用区出现 PicGo 的应用图标。**
 
 ### 生产模式
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "picgo",
-  "version": "2.3.0-beta.1",
+  "version": "2.3.0-beta.3",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service electron:serve",
@@ -42,7 +42,8 @@
     "keycode": "^2.2.0",
     "lodash-id": "^0.14.0",
     "lowdb": "^1.0.0",
-    "picgo": "^1.4.10",
+    "picgo": "^1.4.11",
+    "qrcode.vue": "^1.7.0",
     "vue": "^2.6.10",
     "vue-gallery": "^2.0.1",
     "vue-lazyload": "^1.2.6",

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

@@ -24,11 +24,14 @@ 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, () => {
-          this.handler(command)
-        })
+        // if disabled, don't register #534
+        if (config.enable) {
+          globalShortcut.register(config.key, () => {
+            this.handler(command)
+          })
+        }
       })
   }
   private initPluginsShortKey () {
@@ -46,7 +49,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)
           }
@@ -65,6 +71,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}`]: {

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

@@ -28,7 +28,8 @@ export function createContextMenu () {
       checked: db.get('picBed.current') === item.type,
       click () {
         picgo.saveConfig({
-          'picBed.current': item.type
+          'picBed.current': item.type,
+          'picBed.uploader': item.type
         })
         if (windowManager.has(IWindowList.SETTING_WINDOW)) {
           windowManager.get(IWindowList.SETTING_WINDOW)!.webContents.send('syncPicBed')

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

@@ -8,6 +8,7 @@ import uploader from '.'
 import pasteTemplate from '#/utils/pasteTemplate'
 import db from '#/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()
@@ -28,7 +29,7 @@ export const uploadClipboardFiles = async (): Promise<string> => {
       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: '上传不成功',
@@ -60,7 +61,7 @@ export const uploadChoosedFiles = async (webContents: WebContents, files: IFileW
         notification.show()
       }, i * 100)
       db.insert('uploaded', imgs[i])
-      result.push(imgs[i].imgUrl!)
+      result.push(handleUrlEncode(imgs[i].imgUrl!))
     }
     handleCopyUrl(pasteText.join('\n'))
     windowManager.get(IWindowList.TRAY_WINDOW)!.webContents.send('uploadFiles', imgs)

src/renderer/components/ChoosePicBed.vue

@@ -28,7 +28,8 @@ export default {
   methods: {
     choosePicBed (val) {
       this.letPicGoSaveData({
-        'picBed.current': this.type
+        'picBed.current': this.type,
+        'picBed.uploader': this.type
       })
       this.$emit('update:choosed', this.type)
     }

src/renderer/layouts/Main.vue

@@ -120,14 +120,69 @@
         <el-button type="primary" @click="confirmCustomLink">确定</el-button>
       </span>
     </el-dialog>
+    <el-dialog
+      class="qrcode-dialog"
+      top="3vh"
+      width="60%"
+      title="图床配置二维码"
+      :visible.sync="qrcodeVisible"
+      :modal-append-to-body="false"
+      lock-scroll
+    >
+      <el-form
+        label-position="left"
+        label-width="70px"
+        size="mini"
+      >
+        <el-form-item
+          label="选择图床"
+        >
+          <el-select
+            v-model="choosedPicBedForQRCode"
+            multiple
+            collapse-tags
+          >
+            <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 class="qrcode-container">
+        <qrcode-vue
+          v-show="choosedPicBedForQRCode.length > 0"
+          :size="280"
+          :value="picBedConfigString"
+        />
+      </div>
+    </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 {
+  remote,
+  ipcRenderer,
+  IpcRendererEvent,
+  clipboard
+} from 'electron'
 import db from '#/datastore'
 import mixin from '@/utils/mixin'
 import InputBoxDialog from '@/components/InputBoxDialog.vue'
@@ -143,7 +198,8 @@ const customLinkRule = (rule: string, value: string, callback: (arg0?: Error) =>
   name: 'main-page',
   mixins: [mixin],
   components: {
-    InputBoxDialog
+    InputBoxDialog,
+    QrcodeVue
   }
 })
 export default class extends Vue {
@@ -166,12 +222,27 @@ export default class extends Vue {
     upload: db.get('shortKey.upload')
   }
   picBed: IPicBedType[] = []
+  qrcodeVisible = false
+  picBedConfigString = ''
+  choosedPicBedForQRCode: string[] = []
   created () {
     this.os = process.platform
     this.buildMenu()
     ipcRenderer.send('getPicBeds')
     ipcRenderer.on('getPicBeds', this.getPicBeds)
   }
+
+  @Watch('choosedPicBedForQRCode')
+  choosedPicBedForQRCodeChange (val: string[], oldVal: string[]) {
+    if (val.length > 0) {
+      this.$nextTick(() => {
+        const picBedConfig = db.get('picBed')
+        const config = pick(picBedConfig, ...this.choosedPicBedForQRCode)
+        this.picBedConfigString = JSON.stringify(config)
+      })
+    }
+  }
+
   handleSelect (index: string) {
     const type = index.match(/picbeds-/)
     if (type === null) {
@@ -220,6 +291,12 @@ export default class extends Vue {
         click () {
           _this.visible = true
         }
+      },
+      {
+        label: '生成图床配置二维码',
+        click () {
+          _this.qrcodeVisible = true
+        }
       }
     ]
     this.menu = Menu.buildFromTemplate(template)
@@ -254,6 +331,10 @@ export default class extends Vue {
   openMiniWindow () {
     ipcRenderer.send('openMiniWindow')
   }
+  handleCopyPicBedConfig () {
+    clipboard.writeText(this.picBedConfigString)
+    this.$message.success('图床配置复制成功')
+  }
   getPicBeds (event: IpcRendererEvent, picBeds: IPicBedType[]) {
     this.picBed = picBeds
   }
@@ -283,6 +364,16 @@ $darwinBg = transparentify(#172426, #000, 0.7)
   text-align center
   margin 10px auto
 #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/MiniPage.vue

@@ -145,7 +145,8 @@ export default class extends Vue {
         checked: this.$db.get('picBed.current') === item.type,
         click () {
           _this.letPicGoSaveData({
-            'picBed.current': item.type
+            'picBed.current': item.type,
+            'picBed.uploader': item.type
           })
           ipcRenderer.send('syncPicBed')
         }

src/renderer/pages/Plugin.vue

@@ -433,7 +433,8 @@ export default class extends Vue {
       const current = this.$db.get('picBed.current')
       if (current === name) {
         this.letPicGoSaveData({
-          'picBed.current': 'smms'
+          'picBed.current': 'smms',
+          'picBed.uploader': 'smms'
         })
       }
     }

src/renderer/pages/Upload.vue

@@ -222,7 +222,8 @@ export default class extends Vue {
         checked: this.$db.get('picBed.current') === item.type,
         click () {
           _this.letPicGoSaveData({
-            'picBed.current': item.type
+            'picBed.current': item.type,
+            'picBed.uploader': item.type
           })
           ipcRenderer.send('syncPicBed')
         }

src/renderer/pages/picbeds/Others.vue

@@ -69,7 +69,8 @@ export default class extends Vue {
   }
   setDefaultPicBed (type: string) {
     this.letPicGoSaveData({
-      'picBed.current': type
+      'picBed.current': type,
+      'picBed.uploader': type
     })
     // @ts-ignore 来自mixin的数据
     this.defaultPicBed = type

src/renderer/utils/ConfirmButtonMixin.ts

@@ -5,7 +5,8 @@ export default class extends Vue {
   defaultPicBed = this.$db.get('picBed.current')
   setDefaultPicBed (type: string) {
     this.letPicGoSaveData({
-      'picBed.current': type
+      'picBed.current': type,
+      'picBed.uploader': type
     })
     this.defaultPicBed = type
     const successNotification = new Notification('设置默认图床', {

src/universal/datastore/index.ts

@@ -29,7 +29,11 @@ class DB {
 
     if (!this.db.has('picBed').value()) {
       this.db.set('picBed', {
-        current: 'weibo'
+        current: 'smms', // deprecated
+        uploader: 'smms',
+        smms: {
+          token: ''
+        }
       }).write()
     }
 

yarn.lock

@@ -8289,10 +8289,10 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picgo@^1.4.10:
-  version "1.4.10"
-  resolved "https://registry.npmjs.org/picgo/-/picgo-1.4.10.tgz#460b311663521e90c680c1ec1cf1edf1bcc7a294"
-  integrity sha512-mDFr1d4gh0BIhLAkCVKZFMzDLz2KwM0grbgqTCtLhZYXiOYihv8hOTArUlrffOiTD5vuB2P+a1LN6a7WNDVSeA==
+picgo@^1.4.11:
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.4.11.tgz#759dde14232cd94b62aa2d3256669014f132babe"
+  integrity sha512-OdhLpSycS/YjHgHSvWDh46eoW8hYPaMtwNQkW67QkNgji7VHU7rinKnaE5xmOhh6BsgFcgEt8bC+e2uKX3qXYA==
   dependencies:
     chalk "^2.4.1"
     commander "^2.17.0"
@@ -8908,6 +8908,11 @@ qiniu@^7.2.1:
     tunnel-agent "0.6.0"
     urllib "2.22.0"
 
+qrcode.vue@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.npmjs.org/qrcode.vue/-/qrcode.vue-1.7.0.tgz#c54b2934f0650c10d92785d08aaad36c55e0fc56"
+  integrity sha512-R7t6Y3fDDtcU7L4rtqwGUDP9xD64gJhIwpfjhRCTKmBoYF6SS49PIJHRJ048cse6OI7iwTwgyy2C46N9Ygoc6g==
+
 qs@6.7.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"