github
/
lx-music-desktop
mirror of https://github.com/lyswhut/lx-music-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

修复企鹅音乐搜索失效的问题

pull/1050/head
lyswhut 2022-08-11 15:44:37 +08:00
parent 85c5595f43
commit 251450fd50
11 changed files with 172 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jsconfig.json
View File

@ -8,7 +8,10 @@
"@lyric/*": ["src/renderer-lyric/*"],
"@static/*": ["src/static/*"],
"@common/*": ["src/common/*"],
}
},
},
"vueCompilerOptions": {
"experimentalDisableTemplateSupport": true
},
"exclude": ["node_modules", "build", "dist"]
}

1
publish/changeLog.md
View File

@ -2,6 +2,7 @@
- 修复无法批量排序歌曲的问题
- 修复某些缺失的繁体中文翻译
- 修复企鹅音乐搜索失效的问题
### 其他

6
src/renderer/utils/music/kw/album.js
View File

@ -43,6 +43,12 @@ export default {
size: null,
}
}
if (formats.includes('HIRFLAC')) {
types.push({ type: 'flac32bit', size: null })
_types.flac32bit = {
size: null,
}
}
// types.reverse()
return {
singer: formatSinger(decodeName(item.artist)),

6
src/renderer/utils/music/kw/leaderboard.js
View File

@ -115,6 +115,12 @@ export default {
size: null,
}
}
if (formats.includes('HIRFLAC')) {
types.push({ type: 'flac32bit', size: null })
_types.flac32bit = {
size: null,
}
}
// types.reverse()
return {
singer: formatSinger(decodeName(item.artist)),

49
src/renderer/utils/music/kw/musicSearch.js
View File

@ -7,7 +7,7 @@ import { formatSinger } from './util'
export default {
regExps: {
mInfo: /bitrate:(\d+),format:(\w+),size:([\w.]+)/,
mInfo: /level:(\w+),bitrate:(\d+),format:(\w+),size:([\w.]+)/,
},
limit: 30,
total: 0,
@ -27,61 +27,53 @@ export default {
handleResult(rawData) {
const result = []
if (!rawData) return result
// console.log(rawData)
for (let i = 0; i < rawData.length; i++) {
const info = rawData[i]
let songId = info.MUSICRID.replace('MUSIC_', '')
// const format = (info.FORMATS || info.formats).split('|')
if (!info.MINFO) {
console.log('mInfo is undefined')
if (!info.N_MINFO) {
console.log('N_MINFO is undefined')
return null
}
const types = []
const _types = {}
let infoArr = info.MINFO.split(';')
infoArr.forEach(info => {
let infoArr = info.N_MINFO.split(';')
for (let info of infoArr) {
info = info.match(this.regExps.mInfo)
if (info) {
switch (info[2]) {
case 'flac':
types.push({ type: 'flac', size: info[3] })
_types.flac = {
size: info[3].toLocaleUpperCase(),
case '4000':
types.push({ type: 'flac32bit', size: info[4] })
_types.flac32bit = {
size: info[4].toLocaleUpperCase(),
}
break
case '2000':
types.push({ type: 'flac', size: info[4] })
_types.flac = {
size: info[4].toLocaleUpperCase(),
}
break
// case 'ape':
// types.push({ type: 'ape', size: info[3] })
// _types.ape = {
// size: info[3].toLocaleUpperCase(),
// }
// break
case 'mp3':
switch (info[1]) {
case '320':
types.push({ type: '320k', size: info[3] })
types.push({ type: '320k', size: info[4] })
_types['320k'] = {
size: info[3].toLocaleUpperCase(),
size: info[4].toLocaleUpperCase(),
}
break
case '192':
// types.push({ type: '192k', size: info[3] })
// _types['192k'] = {
// size: info[3].toLocaleUpperCase(),
// }
// break
case '128':
types.push({ type: '128k', size: info[3] })
types.push({ type: '128k', size: info[4] })
_types['128k'] = {
size: info[3].toLocaleUpperCase(),
size: info[4].toLocaleUpperCase(),
}
break
}
break
}
}
})
types.reverse()
let interval = parseInt(info.DURATION)
@ -105,6 +97,7 @@ export default {
typeUrl: {},
})
}
// console.log(result)
return result
},
search(str, page = 1, { limit } = {}, retryNum = 0) {

30
src/renderer/utils/music/kw/songList.js
View File

@ -21,7 +21,7 @@ export default {
},
],
regExps: {
mInfo: /bitrate:(\d+),format:(\w+),size:([\w.]+)/,
mInfo: /level:(\w+),bitrate:(\d+),format:(\w+),size:([\w.]+)/,
// http://www.kuwo.cn/playlist_detail/2886046289
// https://m.kuwo.cn/h5app/playlist/2736267853?t=qqfriend
listDetailLink: /^.+\/playlist(?:_detail)?\/(\d+)(?:\?.*|&.*$|#.*$|$)/,
@ -244,34 +244,36 @@ export default {
filterListDetail(rawData) {
// console.log(rawData)
return rawData.map(item => {
let infoArr = item.MINFO.split(';')
let infoArr = item.N_MINFO.split(';')
let types = []
let _types = {}
for (let info of infoArr) {
info = info.match(this.regExps.mInfo)
if (info) {
switch (info[2]) {
case 'flac':
types.push({ type: 'flac', size: info[3] })
_types.flac = {
size: info[3].toLocaleUpperCase(),
case '4000':
types.push({ type: 'flac32bit', size: info[4] })
_types.flac32bit = {
size: info[4].toLocaleUpperCase(),
}
break
case '2000':
types.push({ type: 'flac', size: info[4] })
_types.flac = {
size: info[4].toLocaleUpperCase(),
}
break
case 'mp3':
switch (info[1]) {
case '320':
types.push({ type: '320k', size: info[3] })
types.push({ type: '320k', size: info[4] })
_types['320k'] = {
size: info[3].toLocaleUpperCase(),
size: info[4].toLocaleUpperCase(),
}
break
case '192':
case '128':
types.push({ type: '128k', size: info[3] })
types.push({ type: '128k', size: info[4] })
_types['128k'] = {
size: info[3].toLocaleUpperCase(),
}
break
size: info[4].toLocaleUpperCase(),
}
break
}

37
src/renderer/utils/music/tx/leaderboard.js
View File

@ -62,12 +62,14 @@ export default {
bangid: 128,
},
],
getUrl(id, period, limit) {
return `https://u.y.qq.com/cgi-bin/musicu.fcg?format=json&inCharset=utf8&outCharset=utf-8&platform=yqq.json&needNewCode=0&data=${encodeURIComponent(JSON.stringify({
comm: {
cv: 1602,
ct: 20,
listDetailRequest(id, period, limit) {
// console.log(id, period, limit)
return httpFetch('https://u.y.qq.com/cgi-bin/musicu.fcg', {
method: 'post',
headers: {
'User-Agent': 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0)',
},
body: {
toplist: {
module: 'musicToplist.ToplistInfoServer',
method: 'GetDetail',
@ -77,7 +79,14 @@ export default {
period,
},
},
}))}`
comm: {
uin: 0,
format: 'json',
ct: 20,
cv: 1859,
},
},
}).promise
},
regExps: {
periodList: /<i class="play_cover__btn c_tx_link js_icon_play" data-listkey=".+?" data-listname=".+?" data-tid=".+?" data-date=".+?" .+?<\/i>/g,
@ -121,13 +130,6 @@ export default {
size,
}
}
if (item.file.size_ape !== 0) {
let size = sizeFormate(item.file.size_ape)
types.push({ type: 'ape', size })
_types.ape = {
size,
}
}
if (item.file.size_flac !== 0) {
let size = sizeFormate(item.file.size_flac)
types.push({ type: 'flac', size })
@ -135,6 +137,13 @@ export default {
size,
}
}
if (item.file.size_hires !== 0) {
let size = sizeFormate(item.file.size_hires)
types.push({ type: 'flac32bit', size })
_types.flac32bit = {
size,
}
}
// types.reverse()
return {
singer: this.getSinger(item.singer),
@ -223,7 +232,7 @@ export default {
let info = this.periods[bangid]
let p = info ? Promise.resolve(info.period) : this.getPeriods(bangid)
return p.then(period => {
return this.getData(this.getUrl(bangid, period, this.limit)).then(resp => {
return this.listDetailRequest(bangid, period, this.limit).then(resp => {
if (resp.body.code !== 0) return this.getList(bangid, page, retryNum)
return {
total: resp.body.toplist.data.songInfoList.length,

94
src/renderer/utils/music/tx/musicSearch.js
View File

@ -6,7 +6,7 @@ import { formatPlayTime, sizeFormate } from '../../index'
// import { formatSinger } from './util'
export default {
limit: 30,
limit: 50,
total: 0,
page: 0,
allPage: 1,
@ -14,11 +14,35 @@ export default {
musicSearch(str, page, limit, retryNum = 0) {
if (retryNum > 5) return Promise.reject(new Error('搜索失败'))
// searchRequest = httpFetch(`https://c.y.qq.com/soso/fcgi-bin/client_search_cp?ct=24&qqmusic_ver=1298&new_json=1&remoteplace=sizer.yqq.song_next&searchid=49252838123499591&t=0&aggr=1&cr=1&catZhida=1&lossless=0&flag_qc=0&p=${page}&n=${limit}&w=${encodeURIComponent(str)}&loginUin=0&hostUin=0&format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq&needNewCode=0`)
const searchRequest = httpFetch(`https://shc.y.qq.com/soso/fcgi-bin/client_search_cp?ct=24&qqmusic_ver=1298&remoteplace=txt.yqq.top&aggr=1&cr=1&catZhida=1&lossless=0&flag_qc=0&p=${page}&n=${limit}&w=${encodeURIComponent(str)}&cv=4747474&ct=24&format=json&inCharset=utf-8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0&uin=0&hostUin=0&loginUin=0`)
// const searchRequest = httpFetch(`https://shc.y.qq.com/soso/fcgi-bin/client_search_cp?ct=24&qqmusic_ver=1298&remoteplace=txt.yqq.top&aggr=1&cr=1&catZhida=1&lossless=0&flag_qc=0&p=${page}&n=${limit}&w=${encodeURIComponent(str)}&cv=4747474&ct=24&format=json&inCharset=utf-8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0&uin=0&hostUin=0&loginUin=0`)
const searchRequest = httpFetch('https://u.y.qq.com/cgi-bin/musicu.fcg', {
method: 'post',
headers: {
'User-Agent': 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0)',
},
body: {
comm: {
ct: '19',
cv: '1859',
uin: '0',
},
req: {
method: 'DoSearchForQQMusicDesktop',
module: 'music.search.SearchCgiService',
param: {
grp: 1,
num_per_page: limit,
page_num: page,
query: str,
search_type: 0,
},
},
},
})
// searchRequest = httpFetch(`http://ioscdn.kugou.com/api/v3/search/song?keyword=${encodeURIComponent(str)}&page=${page}&pagesize=${this.limit}&showtype=10&plat=2&version=7910&tag=1&correct=1&privilege=1&sver=5`)
return searchRequest.promise.then(({ body }) => {
if (body.code !== this.successCode) return this.musicSearch(str, page, limit, ++retryNum)
return body.data
if (body.code != this.successCode || body.req.code != this.successCode) return this.musicSearch(str, page, limit, ++retryNum)
return body.req.data
})
},
getSinger(singers) {
@ -32,69 +56,75 @@ export default {
// console.log(rawList)
const list = []
rawList.forEach(item => {
if (!item.strMediaMid) return
if (!item.file?.media_mid) return
let types = []
let _types = {}
if (item.size128 !== 0) {
let size = sizeFormate(item.size128)
const file = item.file
if (file.size_128mp3 != 0) {
let size = sizeFormate(file.size_128mp3)
types.push({ type: '128k', size })
_types['128k'] = {
size,
}
}
if (item.size320 !== 0) {
let size = sizeFormate(item.size320)
if (file.size_320mp3 !== 0) {
let size = sizeFormate(file.size_320mp3)
types.push({ type: '320k', size })
_types['320k'] = {
size,
}
}
if (item.sizeape !== 0) {
let size = sizeFormate(item.sizeape)
types.push({ type: 'ape', size })
_types.ape = {
size,
}
}
if (item.sizeflac !== 0) {
let size = sizeFormate(item.sizeflac)
if (file.size_flac !== 0) {
let size = sizeFormate(file.size_flac)
types.push({ type: 'flac', size })
_types.flac = {
size,
}
}
if (file.size_hires !== 0) {
let size = sizeFormate(file.size_hires)
types.push({ type: 'flac32bit', size })
_types.flac32bit = {
size,
}
}
// types.reverse()
let albumId = ''
let albumName = ''
if (item.album) {
albumName = item.album.title
albumId = item.album.mid
}
list.push({
singer: this.getSinger(item.singer),
name: item.songname,
albumName: item.albumname,
albumId: item.albummid,
name: item.title,
albumName,
albumId,
source: 'tx',
interval: formatPlayTime(item.interval),
songId: item.songid,
albumMid: item.albummid,
strMediaMid: item.strMediaMid,
songmid: item.songmid,
img: (item.albummid === '' || item.albummid === '空')
songId: item.id,
albumMid: item.album?.mid ?? '',
strMediaMid: item.file.media_mid,
songmid: item.mid,
img: (albumId === '' || albumId === '空')
? `https://y.gtimg.cn/music/photo_new/T001R500x500M000${item.singer[0]?.mid}.jpg`
: `https://y.gtimg.cn/music/photo_new/T002R500x500M000${item.albummid}.jpg`,
lrc: null,
otherSource: null,
: `https://y.gtimg.cn/music/photo_new/T002R500x500M000${albumId}.jpg`,
types,
_types,
typeUrl: {},
})
})
// console.log(list)
return list
},
search(str, page = 1, { limit } = {}) {
if (limit == null) limit = this.limit
// http://newlyric.kuwo.cn/newlyric.lrc?62355680
return this.musicSearch(str, page, limit).then(({ song }) => {
let list = this.handleResult(song.list)
return this.musicSearch(str, page, limit).then(({ body, meta }) => {
let list = this.handleResult(body.song.list)
this.total = song.totalnum
this.total = meta.sum
this.page = page
this.allPage = Math.ceil(this.total / limit)

14
src/renderer/utils/music/tx/songList.js
View File

@ -253,13 +253,6 @@ export default {
size,
}
}
if (item.file.size_ape !== 0) {
let size = sizeFormate(item.file.size_ape)
types.push({ type: 'ape', size })
_types.ape = {
size,
}
}
if (item.file.size_flac !== 0) {
let size = sizeFormate(item.file.size_flac)
types.push({ type: 'flac', size })
@ -267,6 +260,13 @@ export default {
size,
}
}
if (item.file.size_hires !== 0) {
let size = sizeFormate(item.file.size_hires)
types.push({ type: 'flac32bit', size })
_types.flac32bit = {
size,
}
}
// types.reverse()
return {
singer: this.getSinger(item.singer),

3
src/renderer/utils/music/wy/musicDetail.js
View File

@ -24,7 +24,7 @@ export default {
switch (privilege.maxbr) {
case 999000:
size = null
size = item.sq ? sizeFormate(item.sq.size) : null
types.push({ type: 'flac', size })
_types.flac = {
size,
@ -62,6 +62,7 @@ export default {
typeUrl: {},
})
})
// console.log(list)
return list
},
async getList(ids = [], retryNum = 0) {

3
src/renderer/utils/music/wy/musicSearch.js
View File

@ -35,7 +35,7 @@ export default {
let size
switch (item.privilege.maxbr) {
case 999000:
size = null
size = item.sq ? sizeFormate(item.sq.size) : null
types.push({ type: 'flac', size })
_types.flac = {
size,
@ -80,6 +80,7 @@ export default {
// console.log(result)
if (!result || result.code !== 200) return this.search(str, page, { limit }, retryNum)
let list = this.handleResult(result.result.songs || [])
// console.log(list)
if (list == null) return this.search(str, page, { limit }, retryNum)