🎉 Release: v2.3.0-beta.4

ISSUES CLOSED: #581

CHANGELOG.md

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

README.md

@@ -51,7 +51,7 @@ PicGo 本体支持如下图床：
 - 支持通过发送 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) 与我交流
+  - 欢迎加入 [官方讨论区](https://github.com/Molunerfinn/PicGo/discussions) 与我交流
 
 **如果第一次使用，请参考应用 [使用文档](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)。**
 
@@ -71,13 +71,13 @@ Windows 用户请下载最新版本的 `exe` 文件。
 
 macOS 用户请下载最新版本的 `dmg` 文件。
 
-**还可以使用 `brew cask` 来安装 PicGo: `brew cask install picgo`。感谢 @womeimingzi11 的贡献！**
+**还可以使用 [Homebrew](https://brew.sh/) 来安装 PicGo: `brew install picgo --cask`。感谢 @womeimingzi11 的贡献！**
 
 ### Linux
 
 Linux 用户请下载 `AppImage` 文件。
 
-**如果你是 Arch 类的 Linux 用户，可以直接通过 `aurman -S picgo-appimage` 来安装 PicGo。感谢 @houbaron 的贡献！**
+**如果你是 Arch 类的 Linux 用户，可以直接通过 `yay -S picgo-appimage` 来安装 PicGo （若是没有则先安装 yay ，是 aur 仓库助手）。感谢 @houbaron 的贡献！**
 
 ## 应用截图
 
@@ -125,7 +125,8 @@ npm run electron:build
 
 ## 其他相关
 
-- [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 ）。
 
 ## 赞助
 
@@ -143,4 +144,4 @@ npm run electron:build
 
 [MIT](http://opensource.org/licenses/MIT)
 
-Copyright (c) 2017 - 2019 Molunerfinn
+Copyright (c) 2017 - 2019 Molunerfinn

package.json

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

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

@@ -35,6 +35,7 @@ class ShortKeyHandler {
       })
   }
   private initPluginsShortKey () {
+    // get enabled plugin
     const pluginList = picgo.pluginLoader.getList()
     for (let item of pluginList) {
       const plugin = picgo.pluginLoader.getPlugin(item)

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

@@ -10,6 +10,7 @@ import picgo from '@core/picgo'
 import db from '#/datastore'
 import windowManager from 'apis/app/window/windowManager'
 import { IWindowList } from 'apis/app/window/constants'
+import util from 'util'
 
 const waitForShow = (webcontent: WebContents) => {
   return new Promise((resolve, reject) => {
@@ -101,11 +102,11 @@ class Uploader {
         }
         picgo.removeAllListeners('failed')
       })
-      picgo.once('failed', ctx => {
+      picgo.once('failed', (e: Error) => {
         setTimeout(() => {
           const notification = new Notification({
             title: '上传失败',
-            body: '请检查配置和上传的文件是否符合要求'
+            body: util.format(e.stack)
           })
           notification.show()
         }, 500)

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

@@ -16,4 +16,7 @@ picgo.saveConfig({
   PICGO_ENV: 'GUI'
 })
 
+// @ts-ignore
+picgo.GUI_VERSION = global.PICGO_GUI_VERSION
+
 export default picgo! as PicGoCore

src/main/events/picgoCoreIPC.ts

@@ -58,7 +58,7 @@ const handleConfigWithFunction = (config: any[]) => {
 
 const handleGetPluginList = () => {
   ipcMain.on('getPluginList', (event: IpcMainEvent) => {
-    const pluginList = picgo.pluginLoader.getList()
+    const pluginList = picgo.pluginLoader.getFullList()
     const list = []
     for (let i in pluginList) {
       const plugin = picgo.pluginLoader.getPlugin(pluginList[i])

src/main/lifeCycle/index.ts

@@ -1,7 +1,9 @@
 import {
   app,
   globalShortcut,
-  protocol
+  protocol,
+  dialog,
+  Notification
 } from 'electron'
 import {
   createProtocol,
@@ -75,6 +77,14 @@ class LifeCycle {
           }
         }
       }
+
+      if (global.notificationList?.length > 0) {
+        while (global.notificationList.length) {
+          const option = global.notificationList.pop()
+          const notice = new Notification(option!)
+          notice.show()
+        }
+      }
     })
   }
   private onRunning () {

src/main/migrate/index.ts

@@ -1,9 +1,18 @@
 import DB from '#/datastore'
 // from v2.1.2
 const updateShortKeyFromVersion212 = (db: typeof DB, 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,
@@ -12,13 +21,10 @@ const updateShortKeyFromVersion212 = (db: typeof DB, shortKeyConfig: IShortKeyCo
       label: '快捷上传'
     }
     delete shortKeyConfig.upload
-  }
-  if (needUpgrade) {
     db.set('settings.shortKey', shortKeyConfig)
-    return shortKeyConfig
-  } else {
-    return false
+    return true
   }
+  return false
 }
 
 export {

src/main/utils/beforeOpen.ts

@@ -2,11 +2,18 @@ import fs from 'fs-extra'
 import path from 'path'
 import os from 'os'
 import { remote, app } from 'electron'
+import pkg from 'root/package.json'
 
 const APP = process.type === 'renderer' ? remote.app : app
 const STORE_PATH = APP.getPath('userData')
 
+function injectPicGoVersion () {
+  global.PICGO_GUI_VERSION = pkg.version
+  global.PICGO_CORE_VERSION = pkg.dependencies.picgo.replace('^', '')
+}
+
 function beforeOpen () {
+  injectPicGoVersion()
   if (process.platform === 'darwin') {
     resolveMacWorkFlow()
   }

src/universal/datastore/dbChecker.ts

@@ -0,0 +1,55 @@
+import fs from 'fs-extra'
+import path from 'path'
+import { app } from 'electron'
+import dayjs from 'dayjs'
+
+const errorMsg = {
+  broken: 'PicGo 配置文件损坏，已经恢复为默认配置',
+  brokenButBackup: 'PicGo 配置文件损坏，已经恢复为备份配置'
+}
+
+function dbChecker () {
+  if (process.type !== 'renderer') {
+    if (!global.notificationList) global.notificationList = []
+    const STORE_PATH = app.getPath('userData')
+    const configFilePath = path.join(STORE_PATH, 'data.json')
+    const configFileBackupPath = path.join(STORE_PATH, 'data.bak.json')
+    if (!fs.existsSync(configFilePath)) {
+      return
+    }
+    let configFile: string = ''
+    let optionsTpl = {
+      title: '注意',
+      body: ''
+    }
+    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' })
+  }
+}
+
+export {
+  dbChecker
+}

src/universal/datastore/index.ts

@@ -5,6 +5,7 @@ import FileSync from 'lowdb/adapters/FileSync'
 import path from 'path'
 import fs from 'fs-extra'
 import { remote, app } from 'electron'
+import { dbChecker } from './dbChecker'
 
 const APP = process.type === 'renderer' ? remote.app : app
 const STORE_PATH = APP.getPath('userData')
@@ -15,6 +16,8 @@ if (process.type !== 'renderer') {
   }
 }
 
+dbChecker()
+
 class DB {
   private db: Datastore.LowdbSync<Datastore.AdapterSync>
   constructor () {

src/universal/types/electron.d.ts

@@ -20,3 +20,14 @@ declare interface IWindowManager {
   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/types.d.ts

@@ -279,3 +279,9 @@ interface IUpYunConfig {
 }
 
 type ILoggerType = string | Error | boolean | number | undefined
+
+interface IAppNotification {
+  title: string
+  body: string
+  icon?: string
+}

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.11:
-  version "1.4.11"
-  resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.4.11.tgz#759dde14232cd94b62aa2d3256669014f132babe"
-  integrity sha512-OdhLpSycS/YjHgHSvWDh46eoW8hYPaMtwNQkW67QkNgji7VHU7rinKnaE5xmOhh6BsgFcgEt8bC+e2uKX3qXYA==
+picgo@^1.4.14:
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.4.14.tgz#312a1814d35eb8e326587d5cd99316b09a2882cc"
+  integrity sha512-r2i/Ox85xG5oskI4nemhdCU0SC/pxUzJ9np53qGC9qfQ2WumTLN5Ro09pDwFctxtI4Pl0jO03LAQ7hzVSX4rfA==
   dependencies:
     chalk "^2.4.1"
     commander "^2.17.0"