🎉 Release: v2.3.0

ISSUES CLOSED: #731

CHANGELOG.md

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

FAQ.md

@@ -57,3 +57,7 @@ PicGo 在 Mac 上是一个顶部栏应用，在 dock 栏是不会有图标的。
    1. 先自行搜索 error 里的报错信息，往往你能百度或者谷歌出问题原因，不必开 issue。
    2. 如果有带有 `401` 、`403` 等 `40X` 状态码字样的，不用怀疑，就是你配置写错了，仔细检查配置，看看是否多了空格之类的。
    3. 如果带有 `HttpError`、`RequestError` 、 `socket hang up` 等字样的说明这是网络问题，我无法帮你解决网络问题，请检查你自己的网络，是否有代理，DNS 设置是否正常等。
+
+## 10. macOS版本安装完之后没有主界面
+
+请找到PicGo在顶部栏的图标，然后右键（触摸板双指点按，或者鼠标右键），即可找到「打开详细窗口」的菜单。

package.json

@@ -1,6 +1,6 @@
 {
   "name": "picgo",
-  "version": "2.3.0-beta.8",
+  "version": "2.3.0",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service electron:serve",

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

@@ -2,6 +2,7 @@ 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')
@@ -15,9 +16,11 @@ const errorMsg = {
   brokenButBackup: 'PicGo 配置文件损坏，已经恢复为备份配置'
 }
 
+/** ensure notification list */
+if (!global.notificationList) global.notificationList = []
+
 function dbChecker () {
   if (process.type !== 'renderer') {
-    if (!global.notificationList) global.notificationList = []
     // db save bak
     try {
       const { dbPath, dbBackupPath } = getGalleryDBPath()
@@ -50,16 +53,16 @@ function dbChecker () {
           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)
+          global.notificationList?.push(optionsTpl)
           return
         } catch (e) {
           optionsTpl.body = errorMsg.broken
-          global.notificationList.push(optionsTpl)
+          global.notificationList?.push(optionsTpl)
           return
         }
       }
       optionsTpl.body = errorMsg.broken
-      global.notificationList.push(optionsTpl)
+      global.notificationList?.push(optionsTpl)
       return
     }
     fs.writeFileSync(configFileBackupPath, configFile, { encoding: 'utf-8' })
@@ -92,15 +95,17 @@ function dbPathChecker (): string {
     }
     return _configFilePath
   } catch (e) {
-    // TODO: local logger is needed
+    const picgoLogPath = path.join(defaultConfigPath, 'picgo.log')
+    const logger = getLogger(picgoLogPath)
     if (!hasCheckPath) {
       let optionsTpl = {
         title: '注意',
         body: '自定义文件解析出错，请检查路径内容是否正确'
       }
-      global.notificationList.push(optionsTpl)
+      global.notificationList?.push(optionsTpl)
       hasCheckPath = true
     }
+    logger('error', e)
     console.error(e)
     _configFilePath = defaultConfigPath
     return _configFilePath

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/events/ipcList.ts

@@ -14,7 +14,8 @@ import getPicBeds from '~/main/utils/getPicBeds'
 import shortKeyHandler from 'apis/app/shortKey/shortKeyHandler'
 import bus from '@core/bus'
 import {
-  TOGGLE_SHORTKEY_MODIFIED_MODE
+  TOGGLE_SHORTKEY_MODIFIED_MODE,
+  OPEN_DEVTOOLS
 } from '#/events/constants'
 import {
   uploadClipboardFiles,
@@ -141,6 +142,9 @@ export default {
     ipcMain.on('updateServer', () => {
       server.restart()
     })
+    ipcMain.on(OPEN_DEVTOOLS, (event: IpcMainEvent) => {
+      event.sender.openDevTools()
+    })
   },
   dispose () {}
 }

src/main/lifeCycle/index.ts

@@ -96,8 +96,8 @@ class LifeCycle {
         handleStartUpFiles(process.argv, process.cwd())
       }
 
-      if (global.notificationList?.length > 0) {
-        while (global.notificationList.length) {
+      if (global.notificationList && global.notificationList?.length > 0) {
+        while (global.notificationList?.length) {
           const option = global.notificationList.pop()
           const notice = new Notification(option!)
           notice.show()

src/main/migrate/index.ts

@@ -37,7 +37,7 @@ const migrateGalleryFromVersion230 = async (configDB: typeof ConfigStore, galler
   const configPath = configDB.getConfigPath()
   const configBakPath = path.join(path.dirname(configPath), 'config.bak.json')
   // migrate gallery from config to gallery db
-  if (originGallery && originGallery?.length > 0) {
+  if (originGallery && Array.isArray(originGallery) && originGallery?.length > 0) {
     if (fse.existsSync(configBakPath)) {
       fse.copyFileSync(configPath, configBakPath)
     }

src/renderer/components/ConfigForm.vue

@@ -116,7 +116,7 @@ export default class extends Vue {
   async handleConfig (val: any) {
     this.ruleForm = Object.assign({}, {})
     const config = await this.getConfig<IPicGoPluginConfig>(this.getConfigType())
-    if (val.length > 0 && config) {
+    if (val.length > 0) {
       this.configList = cloneDeep(val).map((item: any) => {
         let defaultValue = item.default !== undefined
           ? item.default : item.type === 'checkbox'

src/renderer/layouts/Main.vue

@@ -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>
@@ -158,7 +159,8 @@ import {
 import mixin from '@/utils/mixin'
 import InputBoxDialog from '@/components/InputBoxDialog.vue'
 import {
-  SHOW_PRIVACY_MESSAGE
+  SHOW_PRIVACY_MESSAGE,
+  OPEN_DEVTOOLS
 } from '~/universal/events/constants'
 import { IConfig } from 'picgo/dist/src/types/index'
 const { Menu, dialog, BrowserWindow } = remote
@@ -192,8 +194,8 @@ export default class extends Vue {
   created () {
     this.os = process.platform
     this.buildMenu()
-    ipcRenderer.send('getPicBeds')
     ipcRenderer.on('getPicBeds', this.getPicBeds)
+    this.handleGetPicPeds()
   }
 
   @Watch('choosedPicBedForQRCode')
@@ -207,6 +209,10 @@ export default class extends Vue {
     }
   }
 
+  handleGetPicPeds = () => {
+    ipcRenderer.send('getPicBeds')
+  }
+
   handleSelect (index: string) {
     const type = index.match(/picbeds-/)
     if (type === null) {
@@ -271,6 +277,12 @@ export default class extends Vue {
         click () {
           ipcRenderer.send(SHOW_PRIVACY_MESSAGE)
         }
+      },
+      {
+        label: '打开调试器',
+        click () {
+          ipcRenderer.send(OPEN_DEVTOOLS)
+        }
       }
     ]
     this.menu = Menu.buildFromTemplate(template)

src/renderer/pages/Gallery.vue

@@ -178,8 +178,12 @@ export default class extends Vue {
     document.addEventListener('keyup', this.handleDetectShiftKey)
   }
   handleDetectShiftKey (event: KeyboardEvent) {
-    if (event.keyCode === 16) {
-      this.isShiftKeyPress = !this.isShiftKeyPress
+    if (event.key === 'Shift') {
+      if (event.type === 'keydown') {
+        this.isShiftKeyPress = true
+      } else if (event.type === 'keyup') {
+        this.isShiftKeyPress = false
+      }
     }
   }
   get filterList () {

src/renderer/pages/MiniPage.vue

@@ -23,7 +23,7 @@ import {
   IpcRendererEvent,
   remote
 } from 'electron'
-import { SHOW_PRIVACY_MESSAGE } from '~/universal/events/constants'
+import { SHOW_PRIVACY_MESSAGE, OPEN_DEVTOOLS } from '~/universal/events/constants'
 @Component({
   name: 'mini-page',
   mixins: [mixin]
@@ -190,6 +190,12 @@ export default class extends Vue {
           remote.app.exit(0)
         }
       },
+      {
+        label: '打开调试器',
+        click () {
+          ipcRenderer.send(OPEN_DEVTOOLS)
+        }
+      },
       {
         role: 'quit',
         label: '退出'

src/universal/events/constants.ts

@@ -13,3 +13,4 @@ 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

@@ -27,7 +27,7 @@ declare global {
     interface Global {
       PICGO_GUI_VERSION: string
       PICGO_CORE_VERSION: string
-      notificationList: IAppNotification[]
+      notificationList?: IAppNotification[]
     }
   }
 }

src/universal/types/types.d.ts

@@ -321,3 +321,7 @@ interface IAnalyticsData {
 interface IStringKeyMap {
   [propName: string]: any
 }
+
+type ILogArgvType = string | number
+
+type ILogArgvTypeWithError = ILogArgvType | Error

src/universal/utils/pasteTemplate.ts

@@ -1,9 +1,8 @@
 import { IPasteStyle } from '#/types/enum'
-import { handleUrlEncode } from './common'
 
 const formatCustomLink = (customLink: string, item: ImgInfo) => {
   let fileName = item.fileName!.replace(new RegExp(`\\${item.extname}$`), '')
-  const url = handleUrlEncode(item.url || item.imgUrl)
+  const url = item.url || item.imgUrl
   const formatObj = {
     url,
     fileName
@@ -19,7 +18,7 @@ const formatCustomLink = (customLink: string, item: ImgInfo) => {
 }
 
 export default (style: IPasteStyle, item: ImgInfo, customLink: string | undefined) => {
-  const url = handleUrlEncode(item.url || item.imgUrl)
+  const url = item.url || item.imgUrl
   const _customLink = customLink || '$url'
   const tpl = {
     'markdown': `![](${url})`,