ion/Melo
1
0
Fork 0
Code Issues Pull Requests Actions 11 Packages Projects Releases Wiki Activity

新增 我的列表-换源播放 功能

Browse Source
This commit is contained in:
lyswhut
2024-08-17 13:44:11 +08:00
parent bb5b667613
commit 584c12e60f
36 changed files with 559 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/utils/musicSdk/index.js
+33 -25
View File
@@ -59,8 +59,21 @@ export default {
},
supportQuality,
async findMusic({ name, singer, albumName, interval, source: s }) {
async searchMusic({ name, singer, source: s, limit = 10 }) {
const trimStr = str => typeof str == 'string' ? str.trim() : str
const musicName = trimStr(name)
const tasks = []
const excludeSource = ['xm']
for (const source of sources.sources) {
if (!sources[source.id].musicSearch || source.id == s || excludeSource.includes(source.id)) continue
tasks.push(sources[source.id].musicSearch.search(`${musicName} ${singer || ''}`.trim(), 1, limit).catch(_ => null))
}
return (await Promise.all(tasks)).filter(s => s)
},
async findMusic({ name, singer, albumName, interval, source: s }) {
const lists = await this.searchMusic({ name, singer, source: s, limit: 25 })
const singersRxp = /、|&|;|；|\/|,|，|\|/
const sortSingle = singer => singersRxp.test(singer)
? singer.split(singersRxp).sort((a, b) => a.localeCompare(b)).join('、')
@@ -86,21 +99,18 @@ export default {
const sortedSinger = filterStr(String(sortSingle(singer)).toLowerCase())
const lowerCaseName = filterStr(String(musicName).toLowerCase())
const lowerCaseAlbumName = filterStr(String(albumName).toLowerCase())
const excludeSource = ['xm']
for (const source of sources.sources) {
if (!sources[source.id].musicSearch || source.id == s || excludeSource.includes(source.id)) continue
tasks.push(sources[source.id].musicSearch.search(`${musicName} ${singer || ''}`.trim(), 1, 25).then(res => {
for (const item of res.list) {
item.name = trimStr(item.name)
item.sortedSinger = filterStr(String(sortSingle(item.singer)).toLowerCase())
item.lowerCaseName = filterStr(String(item.name ?? '').toLowerCase())
item.lowerCaseAlbumName = filterStr(String(item.albumName ?? '').toLowerCase())
// console.log(lowerCaseName, item.lowerCaseName, item.source)
if (
(
item.sortedSinger == sortedSinger && item.lowerCaseName == lowerCaseName
) ||
const result = lists.map(source => {
for (const item of source.list) {
item.name = trimStr(item.name)
item.sortedSinger = filterStr(String(sortSingle(item.singer)).toLowerCase())
item.lowerCaseName = filterStr(String(item.name ?? '').toLowerCase())
item.lowerCaseAlbumName = filterStr(String(item.albumName ?? '').toLowerCase())
// console.log(lowerCaseName, item.lowerCaseName, item.source)
if (
(
item.sortedSinger == sortedSinger && item.lowerCaseName == lowerCaseName
) ||
(
(interval ? item.interval == interval : true) && item.lowerCaseName == lowerCaseName &&
(item.sortedSinger.includes(sortedSinger) || sortedSinger.includes(item.sortedSinger))
@@ -113,17 +123,15 @@ export default {
item.lowerCaseName == lowerCaseName && (lowerCaseAlbumName ? item.lowerCaseAlbumName == lowerCaseAlbumName : true) &&
(item.sortedSinger.includes(sortedSinger) || sortedSinger.includes(item.sortedSinger))
)
) {
return item
}
if (!singer) {
if (item.lowerCaseName == lowerCaseName && (interval ? item.interval == interval : true)) return item
}
) {
return item
}
return null
}).catch(_ => null))
}
const result = (await Promise.all(tasks)).filter(s => s)
if (!singer) {
if (item.lowerCaseName == lowerCaseName && (interval ? item.interval == interval : true)) return item
}
}
return null
}).filter(s => s)
const newResult = []
if (result.length) {
newResult.push(...sortMusic(result, item => item.sortedSinger == sortedSinger && item.lowerCaseName == lowerCaseName && item.interval == interval))