From 7990e841e0546dee80f44da49218f0cca50dddf4 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 9 Jan 2021 01:15:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=AD=8C=E6=9B=B2=E6=9F=A5?= =?UTF-8?q?=E6=89=BE=E5=8C=B9=E9=85=8D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/utils/music/index.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/renderer/utils/music/index.js b/src/renderer/utils/music/index.js index 5453c952..0e969593 100644 --- a/src/renderer/utils/music/index.js +++ b/src/renderer/utils/music/index.js @@ -64,7 +64,16 @@ export default { tasks.push(sources[source.id].musicSearch.search(`${musicInfo.name} ${musicInfo.singer || ''} ${musicInfo.albumName || ''}`.trim(), 1, { limit: 5 }).then(res => { for (const item of res.list) { - if (item.singer === musicInfo.singer && (item.name === musicInfo.name || item.interval === musicInfo.interval)) { + if ( + ( + item.singer === musicInfo.singer && + (item.name === musicInfo.name || item.interval === musicInfo.interval) + ) || + ( + item.interval === musicInfo.interval && item.name === musicInfo.name && + (item.singer.includes(musicInfo.singer) || musicInfo.singer.includes(item.singer)) + ) + ) { return item } } @@ -95,6 +104,7 @@ export default { result.splice(i, 1) } } + newResult.push(...result) } // console.log(newResult) return newResult