更新electron到 10.1.0

src/main/index.js

@@ -35,7 +35,7 @@ app.commandLine.appendSwitch('wm-window-animations-disabled')
 // https://github.com/electron/electron/issues/18397
 // 开发模式下为true时 多次引入native模块会导致渲染进程卡死
 // https://github.com/electron/electron/issues/22791
-app.allowRendererProcessReuse = !isDev
+// app.allowRendererProcessReuse = !isDev
 
 
 app.on('web-contents-created', (event, contents) => {
@@ -124,7 +124,9 @@ global.appHotKey = {
 }
 
 function init() {
-  global.appSetting = initSetting()
+  const info = initSetting()
+  global.appSetting = info.setting
+  global.appSettingVersion = info.version
   global.appHotKey.config = initHotKey()
   global.lx_event.common.initSetting()
   global.lx_event.hotKey.init()

src/main/rendererEvents/appSetting.js

@@ -1,7 +1,9 @@
 const { mainWindow: MAIN_WINDOW_EVENT_NAME } = require('../events/_name')
-const { mainOn, NAMES: { mainWindow: ipcMainWindowNames } } = require('../../common/ipc')
+const { mainOn, NAMES: { mainWindow: ipcMainWindowNames }, mainHandle } = require('../../common/ipc')
 
 mainOn(ipcMainWindowNames.set_app_setting, (event, config) => {
   if (!config) return
   global.lx_event.common.setAppConfig(config, MAIN_WINDOW_EVENT_NAME.name)
 })
+
+mainHandle(ipcMainWindowNames.get_setting, async() => ({ setting: global.appSetting, version: global.appSettingVersion }))

src/main/rendererEvents/cache.js

@@ -1,7 +1,11 @@
 const { mainHandle, NAMES: { mainWindow: ipcMainWindowNames } } = require('../../common/ipc')
 
+mainHandle(ipcMainWindowNames.clear_cache, async(event, options) => {
+  if (!global.modules.mainWindow) throw new Error('mainWindow is undefined')
+  return global.modules.mainWindow.webContents.session.clearCache()
+})
+
 mainHandle(ipcMainWindowNames.get_cache_size, async(event, options) => {
   if (!global.modules.mainWindow) throw new Error('mainWindow is undefined')
   return global.modules.mainWindow.webContents.session.getCacheSize()
 })
-

src/main/rendererEvents/clearCache.js

@@ -1,8 +0,0 @@
-const { mainHandle, NAMES: { mainWindow: ipcMainWindowNames } } = require('../../common/ipc')
-
-mainHandle(ipcMainWindowNames.clear_cache, async(event, options) => {
-  if (!global.modules.mainWindow) throw new Error('mainWindow is undefined')
-  return global.modules.mainWindow.webContents.session.clearCache()
-})
-
-

src/main/rendererEvents/data.js

@@ -0,0 +1,12 @@
+const Store = require('electron-store')
+const { mainOn, NAMES: { mainWindow: ipcMainWindowNames }, mainHandle } = require('../../common/ipc')
+
+
+const electronStore_data = new Store({
+  name: 'data',
+})
+
+mainHandle(ipcMainWindowNames.get_data, async(event, path) => electronStore_data.get(path))
+
+
+mainOn(ipcMainWindowNames.save_data, (event, { path, data }) => electronStore_data.get(path, data))

src/main/rendererEvents/hotKey.js

@@ -1,5 +1,10 @@
-const { mainSend, NAMES: { mainWindow: ipcMainWindowNames }, mainOn } = require('../../common/ipc')
+const Store = require('electron-store')
+const { mainSend, NAMES: { mainWindow: ipcMainWindowNames }, mainOn, mainHandle } = require('../../common/ipc')
 const { mainWindow: MAIN_WINDOW_EVENT_NAME, hotKey: HOT_KEY_EVENT_NAME } = require('../events/_name')
+
+const electronStore_hotKey = new Store({
+  name: 'hotKey',
+})
 // const { registerHotkey, unRegisterHotkey } = require('../modules/hotKey/utils')
 
 // mainHandle(ipcMainWindowNames.set_hot_key_config, async(event, { action, data }) => {
@@ -14,6 +19,11 @@ const { mainWindow: MAIN_WINDOW_EVENT_NAME, hotKey: HOT_KEY_EVENT_NAME } = requi
 //   }
 // })
 
+mainHandle(ipcMainWindowNames.get_hot_key, async() => ({
+  local: electronStore_hotKey.get('local'),
+  global: electronStore_hotKey.get('global'),
+}))
+
 mainOn(ipcMainWindowNames.quit, () => global.lx_event.mainWindow.quit())
 mainOn(ipcMainWindowNames.min_toggle, () => global.lx_event.mainWindow.toggleMinimize())
 mainOn(ipcMainWindowNames.hide_toggle, () => global.lx_event.mainWindow.toggleHide())

src/main/rendererEvents/index.js

@@ -7,15 +7,16 @@ require('./musicMeta')
 require('./selectDir')
 require('./setWindowSize')
 require('./showSaveDialog')
-require('./clearCache')
-require('./getCacheSize')
+require('./cache')
 require('./setIgnoreMouseEvent')
 require('./getEnvParams')
-require('./setAppSetting')
+require('./appSetting')
 require('./setLyricInfo')
 require('./hotKey')
 require('./getDataPath')
 require('./showDialog')
+require('./playList')
+require('./data')
 
 require('./xm_verify')
 

src/main/rendererEvents/playList.js

@@ -0,0 +1,23 @@
+const Store = require('electron-store')
+const { mainOn, NAMES: { mainWindow: ipcMainWindowNames }, mainHandle } = require('../../common/ipc')
+
+
+const electronStore_list = new Store({
+  name: 'playList',
+})
+
+mainHandle(ipcMainWindowNames.get_playlist, async(event, isIgnoredError = false) => {
+  let electronStore_list = new Store({
+    name: 'playList',
+    clearInvalidConfig: !isIgnoredError,
+  })
+
+  return {
+    defaultList: electronStore_list.get('defaultList'),
+    loveList: electronStore_list.get('loveList'),
+    userList: electronStore_list.get('userList'),
+    downloadList: electronStore_list.get('downloadList'),
+  }
+})
+
+mainOn(ipcMainWindowNames.save_playlist, (event, { type, data }) => electronStore_list.set(type, data))