From ea5de9a289694cb003402d785e4b5e6499802f01 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sat, 20 Mar 2021 20:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=AD=8C=E6=9B=B2=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=8D=A2=E6=BA=90=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md              |  1 +
 src/renderer/utils/music/index.js | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index fa8794a2..79a31f7e 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -6,6 +6,7 @@
 
 - 程序启动时对数据文件做读取校验，数据出现损坏时自动备份损坏的数据，若出现数据读取错误的弹窗并出现我的列表丢失时可到GitHub或加群反馈
 - 当设置-代理启用，但主机地址为空的时，将不再使用代理配置进行网络连接，并且在离开设置界面时自动禁用代理
+- 优化歌曲自动换源匹配
 
 ### 修复
 
diff --git a/src/renderer/utils/music/index.js b/src/renderer/utils/music/index.js
index c9466f67..fb97975f 100644
--- a/src/renderer/utils/music/index.js
+++ b/src/renderer/utils/music/index.js
@@ -92,8 +92,7 @@ export default {
           // console.log(lowerCaseName, item.lowerCaseName)
           if (
             (
-              item.sortedSinger === sortedSinger &&
-              (item.lowerCaseName === lowerCaseName || item.interval === musicInfo.interval)
+              item.sortedSinger === sortedSinger && item.lowerCaseName === lowerCaseName
             ) ||
             (
               item.interval === musicInfo.interval && item.lowerCaseName === lowerCaseName &&
@@ -107,6 +106,18 @@ export default {
             return item
           }
         }
+        for (const item of res.list) {
+          item.sortedSinger = String(sortSingle(item.singer)).toLowerCase()
+          item.name = trimStr(item.name)
+          item.lowerCaseName = String(item.name).toLowerCase()
+          item.lowerCaseAlbumName = String(item.albumName).toLowerCase()
+          // console.log(lowerCaseName, item.lowerCaseName)
+          if (
+            item.sortedSinger === sortedSinger && item.interval === musicInfo.interval
+          ) {
+            return item
+          }
+        }
         return null
       }).catch(_ => null))
     }
@@ -114,9 +125,9 @@ export default {
     const newResult = []
     if (result.length) {
       newResult.push(...sortMusic(result, item => item.sortedSinger === sortedSinger && item.lowerCaseName === lowerCaseName && item.interval === musicInfo.interval))
-      newResult.push(...sortMusic(result, item => item.sortedSinger === sortedSinger && item.interval === musicInfo.interval))
       newResult.push(...sortMusic(result, item => item.lowerCaseName === lowerCaseName && item.sortedSinger === sortedSinger && item.lowerCaseAlbumName === lowerCaseAlbumName))
       newResult.push(...sortMusic(result, item => item.sortedSinger === sortedSinger && item.lowerCaseName === lowerCaseName))
+      newResult.push(...sortMusic(result, item => item.sortedSinger === sortedSinger && item.interval === musicInfo.interval))
       for (const item of result) {
         delete item.sortedSinger
         delete item.lowerCaseName