🐛 Fix(db): fix some db bugs

#873,#806

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

@@ -177,7 +177,7 @@ class ShortKeyHandler {
     keyList.forEach(item => {
       globalShortcut.unregister(item.key)
       shortKeyService.unregisterCommand(item.command)
-      picgo.unsetConfig('settings.shortKey', item.command)
+      db.unset('settings.shortKey', item.command)
     })
   }
 }

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

@@ -18,6 +18,7 @@ import logger from '@core/picgo/logger'
 import { T } from '~/universal/i18n'
 import fse from 'fs-extra'
 import path from 'path'
+import { privacyManager } from '~/main/utils/privacyManager'
 
 const waitForShow = (webcontent: WebContents) => {
   return new Promise<void>((resolve) => {
@@ -140,6 +141,10 @@ class Uploader {
 
   async upload (img?: IUploadOption): Promise<ImgInfo[]|false> {
     try {
+      const privacyCheckRes = await privacyManager.check()
+      if (!privacyCheckRes) {
+        throw Error(T('PRIVACY_TIPS'))
+      }
       const startTime = Date.now()
       const output = await picgo.upload(img)
       if (Array.isArray(output) && output.some((item: ImgInfo) => item.imgUrl)) {

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

@@ -1,10 +1,6 @@
-import Datastore from 'lowdb'
-// @ts-ignore
-import LodashId from 'lodash-id'
-import FileSync from 'lowdb/adapters/FileSync'
 import fs from 'fs-extra'
 import { dbPathChecker, dbPathDir, getGalleryDBPath } from './dbChecker'
-import { DBStore } from '@picgo/store'
+import { DBStore, JSONStore } from '@picgo/store'
 import { T } from '~/universal/i18n'
 
 const STORE_PATH = dbPathDir()
@@ -15,68 +11,55 @@ if (!fs.pathExistsSync(STORE_PATH)) {
 const CONFIG_PATH: string = dbPathChecker()
 const DB_PATH: string = getGalleryDBPath().dbPath
 
-// TODO: use JSONStore with @picgo/store
 class ConfigStore {
-  private db: Datastore.LowdbSync<Datastore.AdapterSync>
+  private db: JSONStore
   constructor () {
-    const adapter = new FileSync(CONFIG_PATH)
+    this.db = new JSONStore(CONFIG_PATH)
 
-    this.db = Datastore(adapter)
-    this.db._.mixin(LodashId)
-
-    if (!this.db.has('picBed').value()) {
+    if (!this.db.has('picBed')) {
       this.db.set('picBed', {
         current: 'smms', // deprecated
         uploader: 'smms',
         smms: {
           token: ''
         }
-      }).write()
+      })
     }
 
-    if (!this.db.has('settings.shortKey').value()) {
+    if (!this.db.has('settings.shortKey')) {
       this.db.set('settings.shortKey[picgo:upload]', {
         enable: true,
         key: 'CommandOrControl+Shift+P',
         name: 'upload',
         label: T('QUICK_UPLOAD')
-      }).write()
+      })
     }
+    this.read()
   }
 
-  read () {
-    return this.db.read()
+  read (flush = false) {
+    // if flush -> true, read origin file again
+    this.db.read(flush)
+    return this.db
   }
 
-  get (key = '') {
-    return this.read().get(key).value()
+  get (key = ''): any {
+    if (key === '') {
+      return this.db.read()
+    }
+    return this.db.get(key)
   }
 
-  set (key: string, value: any) {
-    return this.read().set(key, value).write()
+  set (key: string, value: any): void {
+    return this.db.set(key, value)
   }
 
   has (key: string) {
-    return this.read().has(key).value()
-  }
-
-  insert (key: string, value: any): void {
-    // @ts-ignore
-    return this.read().get(key).insert(value).write()
+    return this.db.has(key)
   }
 
   unset (key: string, value: any): boolean {
-    return this.read().get(key).unset(value).value()
-  }
-
-  getById (key: string, id: string) {
-    // @ts-ignore
-    return this.read().get(key).getById(id).value()
-  }
-
-  removeById (key: string, id: string) {
-    // @ts-ignore
-    return this.read().get(key).removeById(id).write()
+    return this.db.unset(key, value)
   }
 
   getConfigPath () {
@@ -84,7 +67,9 @@ class ConfigStore {
   }
 }
 
-export default new ConfigStore()
+const db = new ConfigStore()
+
+export default db
 
 // v2.3.0 add gallery db
 class GalleryDB {

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

@@ -1,6 +1,7 @@
 import { dbChecker, dbPathChecker } from 'apis/core/datastore/dbChecker'
 import pkg from 'root/package.json'
 import { PicGo } from 'picgo'
+import db from 'apis/core/datastore'
 
 const CONFIG_PATH = dbPathChecker()
 
@@ -15,4 +16,14 @@ picgo.saveConfig({
 global.PICGO_GUI_VERSION = pkg.version
 picgo.GUI_VERSION = global.PICGO_GUI_VERSION
 
+const originPicGoSaveConfig = picgo.saveConfig.bind(picgo)
+
+picgo.saveConfig = (config: IStringKeyMap) => {
+  originPicGoSaveConfig(config)
+  // flush electron's db
+  setTimeout(() => {
+    db.read(true)
+  }, 0)
+}
+
 export default picgo

src/main/apis/gui/index.ts

@@ -146,6 +146,27 @@ class GuiApi implements IGuiApi {
   get galleryDB (): DBStore {
     return new Proxy<DBStore>(GalleryDB.getInstance(), {
       get (target, prop: keyof DBStore) {
+        if (prop === 'overwrite') {
+          return new Proxy(GalleryDB.getInstance().overwrite, {
+            apply (target, ctx, args) {
+              return new Promise((resolve) => {
+                const guiApi = GuiApi.getInstance()
+                guiApi.showMessageBox({
+                  title: T('TIPS_WARNING'),
+                  message: T('TIPS_PLUGIN_REMOVE_GALLERY_ITEM'),
+                  type: 'info',
+                  buttons: ['Yes', 'No']
+                }).then(res => {
+                  if (res.result === 0) {
+                    resolve(Reflect.apply(target, ctx, args))
+                  } else {
+                    resolve(undefined)
+                  }
+                })
+              })
+            }
+          })
+        }
         if (prop === 'removeById') {
           return new Proxy(GalleryDB.getInstance().removeById, {
             apply (target, ctx, args) {

src/main/events/picgoCoreIPC.ts

@@ -10,7 +10,7 @@ import {
 import { IPasteStyle, IPicGoHelperType, IWindowList } from '#/types/enum'
 import shortKeyHandler from 'apis/app/shortKey/shortKeyHandler'
 import picgo from '@core/picgo'
-import { handleStreamlinePluginName } from '~/universal/utils/common'
+import { handleStreamlinePluginName, simpleClone } from '~/universal/utils/common'
 import { IGuiMenuItem, PicGo as PicGoCore } from 'picgo'
 import windowManager from 'apis/app/window/windowManager'
 import { showNotification } from '~/main/utils/common'
@@ -128,10 +128,19 @@ const getPluginList = (): IPicGoPlugin[] => {
 
 const handleGetPluginList = () => {
   ipcMain.on('getPluginList', (event: IpcMainEvent) => {
-    const list = getPluginList()
-    // here can just send JS Object not function
-    // or will cause [Failed to serialize arguments] error
-    event.sender.send('pluginList', list)
+    try {
+      const list = simpleClone(getPluginList())
+      // here can just send JS Object not function
+      // or will cause [Failed to serialize arguments] error
+      event.sender.send('pluginList', list)
+    } catch (e: any) {
+      event.sender.send('pluginList', [])
+      showNotification({
+        title: T('TIPS_GET_PLUGIN_LIST_FAILED'),
+        body: e.message
+      })
+      picgo.log.error(e)
+    }
   })
 }
 
@@ -267,8 +276,16 @@ const handleImportLocalPlugin = () => {
     if (filePaths.length > 0) {
       const res = await picgo.pluginHandler.install(filePaths)
       if (res.success) {
-        const list = getPluginList()
-        event.sender.send('pluginList', list)
+        try {
+          const list = simpleClone(getPluginList())
+          event.sender.send('pluginList', list)
+        } catch (e: any) {
+          event.sender.send('pluginList', [])
+          showNotification({
+            title: T('TIPS_GET_PLUGIN_LIST_FAILED'),
+            body: e.message
+          })
+        }
         showNotification({
           title: T('PLUGIN_IMPORT_SUCCEED'),
           body: ''

src/main/lifeCycle/index.ts

@@ -31,7 +31,6 @@ 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'
 import fixPath from './fixPath'
@@ -81,10 +80,6 @@ class LifeCycle {
           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()

src/main/migrate/index.ts

@@ -34,7 +34,7 @@ const updateShortKeyFromVersion212 = (db: typeof ConfigStore, shortKeyConfig: IS
 }
 
 const migrateGalleryFromVersion230 = async (configDB: typeof ConfigStore, galleryDB: DBStore, picgo: PicGoCore) => {
-  const originGallery: ImgInfo[] = configDB.get('uploaded')
+  const originGallery: ImgInfo[] = picgo.getConfig('uploaded')
   // if hasMigrate, we don't need to migrate
   const hasMigrate: boolean = configDB.get('__migrateUploaded')
   if (hasMigrate) {

src/main/utils/getPicBeds.ts

@@ -10,6 +10,11 @@ const getPicBeds = () => {
       name: picgo.helper.uploader.get(item)!.name || item,
       visible: visible ? visible.visible : true
     }
+  }).sort((a) => {
+    if (a.type === 'tcyun') {
+      return -1
+    }
+    return 0
   }) as IPicBedType[]
   return picBeds
 }

src/main/utils/privacyManager.ts

@@ -1,14 +1,9 @@
 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'
 import { T } from '~/universal/i18n'
 
 class PrivacyManager {
-  async init () {
-    ipcMain.on(SHOW_PRIVACY_MESSAGE, () => {
-      this.show(false)
-    })
+  async check () {
     if (db.get('settings.privacyEnsure') !== true) {
       const res = await this.show(true)
       // cancel