🐛 Fix: shortKeyConfig maybe undefined

ISSUES CLOSED: #557
Molunerfinn · Aug 22, 2020 · 7b5e5ef · 7b5e5ef
1 parent 92ff282
commit 7b5e5ef
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/main/migrate/index.ts b/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 {