From e848fda4e37c9d8f024802e9c35b5bf7803fd205 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Mon, 1 Feb 2021 14:55:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E4=B8=8B=E8=BD=BD=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8E=E6=88=91=E7=9A=84=E5=88=97=E8=A1=A8=E5=88=86=E7=A6=BB?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/utils.js                 | 12 +++++++++++-
 src/main/rendererEvents/playList.js | 21 +++++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/common/utils.js b/src/common/utils.js
index ae274f99..372a67a5 100644
--- a/src/common/utils.js
+++ b/src/common/utils.js
@@ -150,6 +150,9 @@ exports.initSetting = () => {
   const electronStore_config = new Store({
     name: 'config',
   })
+  const electronStore_downloadList = new Store({
+    name: 'downloadList',
+  })
   let setting = electronStore_config.get('setting')
   if (setting) {
     let version = electronStore_config.get('version')
@@ -165,7 +168,7 @@ exports.initSetting = () => {
       }
       const downloadList = electronStore_config.get('download')
       if (downloadList) {
-        if (downloadList.list) electronStore_list.set('downloadList', downloadList.list)
+        if (downloadList.list) electronStore_downloadList.set('list', downloadList.list)
         electronStore_config.delete('download')
       }
     }
@@ -181,6 +184,13 @@ exports.initSetting = () => {
     }
   }
 
+  // 从我的列表分离下载列表 v1.7.0 后
+  let downloadList = electronStore_list.get('downloadList')
+  if (downloadList) {
+    electronStore_downloadList.set('list', downloadList)
+    electronStore_list.delete('downloadList')
+  }
+
   const { version: settingVersion, setting: newSetting } = exports.mergeSetting(setting, electronStore_config.get('version'))
 
   // 重置 ^0.18.2 排行榜ID
diff --git a/src/main/rendererEvents/playList.js b/src/main/rendererEvents/playList.js
index 219046da..5bfeb50e 100644
--- a/src/main/rendererEvents/playList.js
+++ b/src/main/rendererEvents/playList.js
@@ -3,6 +3,7 @@ const { mainOn, NAMES: { mainWindow: ipcMainWindowNames }, mainHandle } = requir
 
 
 let electronStore_list
+let electronStore_downloadList
 
 mainHandle(ipcMainWindowNames.get_playlist, async(event, isIgnoredError = false) => {
   if (!electronStore_list) {
@@ -11,13 +12,29 @@ mainHandle(ipcMainWindowNames.get_playlist, async(event, isIgnoredError = false)
       clearInvalidConfig: !isIgnoredError,
     })
   }
+  if (!electronStore_downloadList) {
+    electronStore_downloadList = new Store({
+      name: 'downloadList',
+    })
+  }
 
   return {
     defaultList: electronStore_list.get('defaultList'),
     loveList: electronStore_list.get('loveList'),
     userList: electronStore_list.get('userList'),
-    downloadList: electronStore_list.get('downloadList'),
+    downloadList: electronStore_downloadList.get('list'),
   }
 })
 
-mainOn(ipcMainWindowNames.save_playlist, (event, { type, data }) => electronStore_list && electronStore_list.set(type, data))
+mainOn(ipcMainWindowNames.save_playlist, (event, { type, data }) => {
+  switch (type) {
+    case 'defaultList':
+    case 'loveList':
+    case 'userList':
+      electronStore_list && electronStore_list.set(type, data)
+      break
+    case 'downloadList':
+      electronStore_downloadList && electronStore_downloadList.set(type, data)
+      break
+  }
+})