优化歌曲自动换源匹配

pull/495/head
lyswhut 2021-03-20 20:55:44 +08:00
parent 7922920f51
commit ea5de9a289
2 changed files with 15 additions and 3 deletions

View File

@ -6,6 +6,7 @@
- 程序启动时对数据文件做读取校验数据出现损坏时自动备份损坏的数据若出现数据读取错误的弹窗并出现我的列表丢失时可到GitHub或加群反馈 - 程序启动时对数据文件做读取校验数据出现损坏时自动备份损坏的数据若出现数据读取错误的弹窗并出现我的列表丢失时可到GitHub或加群反馈
- 当设置-代理启用,但主机地址为空的时,将不再使用代理配置进行网络连接,并且在离开设置界面时自动禁用代理 - 当设置-代理启用,但主机地址为空的时,将不再使用代理配置进行网络连接,并且在离开设置界面时自动禁用代理
- 优化歌曲自动换源匹配
### 修复 ### 修复

View File

@ -92,8 +92,7 @@ export default {
// console.log(lowerCaseName, item.lowerCaseName) // console.log(lowerCaseName, item.lowerCaseName)
if ( if (
( (
item.sortedSinger === sortedSinger && item.sortedSinger === sortedSinger && item.lowerCaseName === lowerCaseName
(item.lowerCaseName === lowerCaseName || item.interval === musicInfo.interval)
) || ) ||
( (
item.interval === musicInfo.interval && item.lowerCaseName === lowerCaseName && item.interval === musicInfo.interval && item.lowerCaseName === lowerCaseName &&
@ -107,6 +106,18 @@ export default {
return item 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 return null
}).catch(_ => null)) }).catch(_ => null))
} }
@ -114,9 +125,9 @@ export default {
const newResult = [] const newResult = []
if (result.length) { 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.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.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.lowerCaseName === lowerCaseName))
newResult.push(...sortMusic(result, item => item.sortedSinger === sortedSinger && item.interval === musicInfo.interval))
for (const item of result) { for (const item of result) {
delete item.sortedSinger delete item.sortedSinger
delete item.lowerCaseName delete item.lowerCaseName