From a43e127dd0f142841ea903d755c734b8bf42717c Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sat, 14 Jan 2023 00:50:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=87=E4=BB=BD=E4=B8=8E?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D=E7=9A=84=E5=88=97=E8=A1=A8=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=A1=E6=81=AF=E8=AE=BE=E7=BD=AE=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E9=97=AE=E9=A2=98=E4=B8=8E=E6=BD=9C=E5=9C=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                                    | 1 +
 src/renderer/views/List/MyList/useShare.ts              | 1 +
 src/renderer/views/Setting/components/SettingBackup.vue | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index a7cef709..11b32226 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -6,3 +6,4 @@
 - 就放桌面歌词在启用卡拉OK歌词后字体边缘可能被截断的问题
 - 修复桌面歌词启用歌词缩放后的阴影显示问题
 - 修复Linux armv7l系统（如树莓派）下无法启动的问题（与修复Linux arm64的方法一样采用内置预编译模块的方式修复）
+- 修复备份与恢复的列表导入列表信息设置逻辑问题与潜在导入问题
diff --git a/src/renderer/views/List/MyList/useShare.ts b/src/renderer/views/List/MyList/useShare.ts
index 5bf1c771..1d4bb98b 100644
--- a/src/renderer/views/List/MyList/useShare.ts
+++ b/src/renderer/views/List/MyList/useShare.ts
@@ -51,6 +51,7 @@ export default () => {
           break
         case 'playListPart_v2':
           listData = configData.data
+          listData.list = filterMusicList(listData.list).map(m => fixNewMusicInfoQuality(m))
           break
         default:
           showImportTip(configData.type)
diff --git a/src/renderer/views/Setting/components/SettingBackup.vue b/src/renderer/views/Setting/components/SettingBackup.vue
index bec0e514..71bf9e6a 100644
--- a/src/renderer/views/Setting/components/SettingBackup.vue
+++ b/src/renderer/views/Setting/components/SettingBackup.vue
@@ -79,9 +79,9 @@ export default {
               name: list.name,
               id: list.id,
               list: filterMusicList(list.list.map(m => toNewMusicInfo(m))),
-              position: list.position,
               source: list.source,
               sourceListId: list.sourceListId,
+              locationUpdateTime: list.locationUpdateTime ?? null,
             })
           }
         } catch (err) {
@@ -98,15 +98,15 @@ export default {
         try {
           const targetList = allLists.find(l => l.id == list.id)
           if (targetList) {
-            targetList.list = list.list.map(m => fixNewMusicInfoQuality(m))
+            targetList.list = filterMusicList(list.list).map(m => fixNewMusicInfoQuality(m))
           } else {
             allLists.push({
               name: list.name,
               id: list.id,
-              list: list.list.map(m => fixNewMusicInfoQuality(m)),
-              position: list.position,
+              list: filterMusicList(list.list).map(m => fixNewMusicInfoQuality(m)),
               source: list.source,
               sourceListId: list.sourceListId,
+              locationUpdateTime: list.locationUpdateTime ?? null,
             })
           }
         } catch (err) {