🚧 WIP: gallery db in progress

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

@@ -4,7 +4,7 @@ import {
 } from 'electron'
 import logger from '@core/picgo/logger'
 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 '@core/picgo'

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

@@ -9,7 +9,7 @@ import {
 } from 'electron'
 import uploader from 'apis/app/uploader'
 import getPicBeds from '~/main/utils/getPicBeds'
-import db from '#/datastore'
+import db from '~/main/apis/core/datastore'
 import windowManager from 'apis/app/window/windowManager'
 import { IWindowList } from 'apis/app/window/constants'
 import picgo from '@core/picgo'

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

@@ -6,7 +6,7 @@ import windowManager from 'apis/app/window/windowManager'
 import { IWindowList } from 'apis/app/window/constants'
 import uploader from '.'
 import pasteTemplate from '#/utils/pasteTemplate'
-import db from '#/datastore'
+import db from '~/main/apis/core/datastore'
 import { handleCopyUrl } from '~/main/utils/common'
 import { handleUrlEncode } from '#/utils/common'
 export const uploadClipboardFiles = async (): Promise<string> => {

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

@@ -6,7 +6,7 @@ import {
 } from 'electron'
 import dayjs from 'dayjs'
 import picgo from '@core/picgo'
-import db from '#/datastore'
+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'

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

@@ -8,7 +8,7 @@ import {
 import { IWindowListItem } from '#/types/electron'
 import bus from '@core/bus'
 import { CREATE_APP_MENU } from '@core/bus/constants'
-import db from '#/datastore'
+import db from '~/main/apis/core/datastore'
 import { TOGGLE_SHORTKEY_MODIFIED_MODE } from '#/events/constants'
 import { app } from 'electron'
 

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

@@ -0,0 +1,87 @@
+import fs from 'fs-extra'
+import path from 'path'
+import { remote, app } from 'electron'
+import dayjs from 'dayjs'
+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')
+
+const errorMsg = {
+  broken: 'PicGo 配置文件损坏，已经恢复为默认配置',
+  brokenButBackup: 'PicGo 配置文件损坏，已经恢复为备份配置'
+}
+
+function dbChecker () {
+  if (process.type !== 'renderer') {
+    if (!global.notificationList) global.notificationList = []
+    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' })
+  }
+}
+
+/**
+ * Get config path
+ */
+function dbPathChecker (): string {
+  const defaultConfigPath = configFilePath
+  if (process.type !== 'renderer') {
+    // if defaultConfig path is not exit
+    // do not parse the content of config
+    if (!fs.existsSync(defaultConfigPath)) {
+      return defaultConfigPath
+    }
+    try {
+      const configString = fs.readFileSync(configFilePath, { encoding: 'utf-8' })
+      const config = JSON.parse(configString)
+      const userConfigPath: string = config.configPath || ''
+      if (userConfigPath) {
+        if (fs.existsSync(userConfigPath) && userConfigPath.endsWith('.json')) {
+          return userConfigPath
+        }
+      }
+      return defaultConfigPath
+    } catch (e) {
+      // TODO: local logger is needed
+      console.error(e)
+      return defaultConfigPath
+    }
+  }
+  return defaultConfigPath
+}
+
+export {
+  dbChecker,
+  dbPathChecker
+}

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

@@ -0,0 +1,89 @@
+import Datastore from 'lowdb'
+// @ts-ignore
+import LodashId from 'lodash-id'
+import FileSync from 'lowdb/adapters/FileSync'
+import fs from 'fs-extra'
+import path from 'path'
+import { app } from 'electron'
+import { dbPathChecker } from './dbChecker'
+import { DBStore } from '@picgo/store'
+
+const APP = app
+const STORE_PATH = APP.getPath('userData')
+
+if (!fs.pathExistsSync(STORE_PATH)) {
+  fs.mkdirpSync(STORE_PATH)
+}
+const CONFIG_PATH: string = dbPathChecker()
+const CONFIG_DIR = path.dirname(CONFIG_PATH)
+const DB_PATH = path.join(CONFIG_DIR, 'picgo.db')
+
+// TODO: use JSONStore with @picgo/store
+class ConfigStore {
+  private db: Datastore.LowdbSync<Datastore.AdapterSync>
+  constructor () {
+    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: 'smms', // deprecated
+        uploader: 'smms',
+        smms: {
+          token: ''
+        }
+      }).write()
+    }
+
+    if (!this.db.has('settings.shortKey').value()) {
+      this.db.set('settings.shortKey[picgo:upload]', {
+        enable: true,
+        key: 'CommandOrControl+Shift+P',
+        name: 'upload',
+        label: '快捷上传'
+      }).write()
+    }
+  }
+  read () {
+    return this.db.read()
+  }
+  get (key = '') {
+    return this.read().get(key).value()
+  }
+  set (key: string, value: any) {
+    return this.read().set(key, value).write()
+  }
+  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()
+  }
+  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()
+  }
+}
+
+export default new ConfigStore()
+
+// v2.3.0 add gallery db
+const dbStore = new DBStore(DB_PATH, 'gallery')
+
+export {
+  dbStore
+}

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

@@ -1,14 +1,10 @@
 import PicGoCore from '~/universal/types/picgo'
-import {
-  app
-} from 'electron'
-import path from 'path'
+import { dbPathChecker } from 'apis/core/datastore/dbChecker'
 // 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()
 
 const picgo = new PicGo(CONFIG_PATH)
 picgo.saveConfig({
@@ -16,7 +12,6 @@ picgo.saveConfig({
   PICGO_ENV: 'GUI'
 })
 
-// @ts-ignore
 picgo.GUI_VERSION = global.PICGO_GUI_VERSION
 
 export default picgo! as PicGoCore

src/main/apis/gui/index.ts

@@ -4,7 +4,7 @@ import {
   Notification,
   ipcMain
 } from 'electron'
-import db from '#/datastore'
+import db from '~/main/apis/core/datastore'
 import uploader from 'apis/app/uploader'
 import pasteTemplate from '#/utils/pasteTemplate'
 import { handleCopyUrl } from '~/main/utils/common'

src/main/events/ipcList.ts

@@ -8,7 +8,7 @@ import windowManager from 'apis/app/window/windowManager'
 import { IWindowList } from 'apis/app/window/constants'
 import uploader from 'apis/app/uploader'
 import pasteTemplate from '#/utils/pasteTemplate'
-import db from '#/datastore'
+import db from '~/main/apis/core/datastore'
 import server from '~/main/server'
 import getPicBeds from '~/main/utils/getPicBeds'
 import shortKeyHandler from 'apis/app/shortKey/shortKeyHandler'

src/main/events/picgoCoreIPC.ts

@@ -16,6 +16,7 @@ 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 { PICGO_SAVE_CONFIG, PICGO_GET_CONFIG } from '#/events/constants'
 
 // eslint-disable-next-line
 const requireFunc = typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require
@@ -229,12 +230,19 @@ const handleRemoveFiles = () => {
   })
 }
 
-const handlePicGoSaveData = () => {
-  ipcMain.on('picgoSaveData', (event: IpcMainEvent, data: IObj) => {
+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)!
@@ -271,7 +279,8 @@ export default {
     handleGetPicBedConfig()
     handlePluginActions()
     handleRemoveFiles()
-    handlePicGoSaveData()
+    handlePicGoSaveConfig()
+    handlePicGoGetConfig()
     handleImportLocalPlugin()
   }
 }

src/main/lifeCycle/errorHandler.ts

@@ -8,7 +8,7 @@ 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
-const loggerWriter = (error: Error) => {
+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`

src/main/lifeCycle/index.ts

@@ -29,7 +29,7 @@ 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 from '#/datastore'
+import db from '~/main/apis/core/datastore'
 import bus from '@core/bus'
 import { privacyManager } from '~/main/utils/privacyManager'
 import logger from 'apis/core/picgo/logger'

src/main/migrate/index.ts

@@ -1,4 +1,4 @@
-import DB from '#/datastore'
+import DB from '~/main/apis/core/datastore'
 // from v2.1.2
 const updateShortKeyFromVersion212 = (db: typeof DB, shortKeyConfig: IShortKeyConfigs | IOldShortKeyConfigs) => {
   // #557 极端情况可能会出现配置不存在，需要重新写入

src/main/utils/common.ts

@@ -1,4 +1,4 @@
-import db from '#/datastore'
+import db from '~/main/apis/core/datastore'
 import { clipboard, Notification, dialog } from 'electron'
 
 export const handleCopyUrl = (str: string): void => {

src/main/utils/privacyManager.ts

@@ -1,4 +1,4 @@
-import db from '#/datastore'
+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'

src/main/utils/updateChecker.ts

@@ -1,5 +1,5 @@
 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'