From 5d2bfd5bebfb91047ad73abf712e6c8275c6a995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E7=8B=B8=E8=8A=B1=E5=96=B5?= Date: Fri, 9 Jun 2023 16:18:49 +0000 Subject: [PATCH 1/2] =?UTF-8?q?tx,=20kw,=20=E6=AD=8C=E6=9B=B2=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=AD=8C=E6=89=8B=E5=88=97=E8=A1=A8=EF=BC=8C=20kg?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E3=80=81=E6=8E=92=E8=A1=8C=E6=A6=9C=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=AD=8C=E6=89=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/utils/musicSdk/kg/leaderboard.js | 2 ++ src/renderer/utils/musicSdk/kg/musicSearch.js | 3 ++- src/renderer/utils/musicSdk/kg/util.js | 15 +++++++++++++++ src/renderer/utils/musicSdk/kw/leaderboard.js | 4 ++++ src/renderer/utils/musicSdk/kw/musicSearch.js | 4 ++++ src/renderer/utils/musicSdk/kw/songList.js | 4 ++++ src/renderer/utils/musicSdk/tx/leaderboard.js | 2 ++ src/renderer/utils/musicSdk/tx/musicSearch.js | 2 ++ src/renderer/utils/musicSdk/tx/songList.js | 2 ++ src/renderer/utils/musicSdk/tx/util.js | 15 +++++++++++++++ 10 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 src/renderer/utils/musicSdk/tx/util.js diff --git a/src/renderer/utils/musicSdk/kg/leaderboard.js b/src/renderer/utils/musicSdk/kg/leaderboard.js index d9821f29..3bbbf66f 100644 --- a/src/renderer/utils/musicSdk/kg/leaderboard.js +++ b/src/renderer/utils/musicSdk/kg/leaderboard.js @@ -1,6 +1,7 @@ import { httpFetch } from '../../request' import { decodeName, formatPlayTime, sizeFormate } from '../../index' import { formatSingerName } from '../utils' +import { formatSingerList } from './util' let boardList = [{ id: 'kg__8888', name: 'TOP500', bangid: '8888' }, { id: 'kg__6666', name: '飙升榜', bangid: '6666' }, { id: 'kg__59703', name: '蜂鸟流行音乐榜', bangid: '59703' }, { id: 'kg__52144', name: '抖音热歌榜', bangid: '52144' }, { id: 'kg__52767', name: '快手热歌榜', bangid: '52767' }, { id: 'kg__24971', name: 'DJ热歌榜', bangid: '24971' }, { id: 'kg__23784', name: '网络红歌榜', bangid: '23784' }, { id: 'kg__44412', name: '说唱先锋榜', bangid: '44412' }, { id: 'kg__31308', name: '内地榜', bangid: '31308' }, { id: 'kg__33160', name: '电音榜', bangid: '33160' }, { id: 'kg__31313', name: '香港地区榜', bangid: '31313' }, { id: 'kg__51341', name: '民谣榜', bangid: '51341' }, { id: 'kg__54848', name: '台湾地区榜', bangid: '54848' }, { id: 'kg__31310', name: '欧美榜', bangid: '31310' }, { id: 'kg__33162', name: 'ACG新歌榜', bangid: '33162' }, { id: 'kg__31311', name: '韩国榜', bangid: '31311' }, { id: 'kg__31312', name: '日本榜', bangid: '31312' }, { id: 'kg__49225', name: '80后热歌榜', bangid: '49225' }, { id: 'kg__49223', name: '90后热歌榜', bangid: '49223' }, { id: 'kg__49224', name: '00后热歌榜', bangid: '49224' }, { id: 'kg__33165', name: '粤语金曲榜', bangid: '33165' }, { id: 'kg__33166', name: '欧美金曲榜', bangid: '33166' }, { id: 'kg__33163', name: '影视金曲榜', bangid: '33163' }, { id: 'kg__51340', name: '伤感榜', bangid: '51340' }, { id: 'kg__35811', name: '会员专享榜', bangid: '35811' }, { id: 'kg__37361', name: '雷达榜', bangid: '37361' }, { id: 'kg__21101', name: '分享榜', bangid: '21101' }, { id: 'kg__46910', name: '综艺新歌榜', bangid: '46910' }, { id: 'kg__30972', name: '酷狗音乐人原创榜', bangid: '30972' }, { id: 'kg__60170', name: '闽南语榜', bangid: '60170' }, { id: 'kg__65234', name: '儿歌榜', bangid: '65234' }, { id: 'kg__4681', name: '美国BillBoard榜', bangid: '4681' }, { id: 'kg__25028', name: 'Beatport电子舞曲榜', bangid: '25028' }, { id: 'kg__4680', name: '英国单曲榜', bangid: '4680' }, { id: 'kg__38623', name: '韩国Melon音乐榜', bangid: '38623' }, { id: 'kg__42807', name: 'joox本地热歌榜', bangid: '42807' }, { id: 'kg__36107', name: '小语种热歌榜', bangid: '36107' }, { id: 'kg__4673', name: '日本公信榜', bangid: '4673' }, { id: 'kg__46868', name: '日本SPACE SHOWER榜', bangid: '46868' }, { id: 'kg__42808', name: 'KKBOX风云榜', bangid: '42808' }, { id: 'kg__60171', name: '越南语榜', bangid: '60171' }, { id: 'kg__60172', name: '泰语榜', bangid: '60172' }, { id: 'kg__59895', name: 'R&B榜', bangid: '59895' }, { id: 'kg__59896', name: '摇滚榜', bangid: '59896' }, { id: 'kg__59897', name: '爵士榜', bangid: '59897' }, { id: 'kg__59898', name: '乡村音乐榜', bangid: '59898' }, { id: 'kg__59900', name: '纯音乐榜', bangid: '59900' }, { id: 'kg__59899', name: '古典榜', bangid: '59899' }, { id: 'kg__22603', name: '5sing音乐榜', bangid: '22603' }, { id: 'kg__21335', name: '繁星音乐榜', bangid: '21335' }, { id: 'kg__33161', name: '古风新歌榜', bangid: '33161' }] @@ -128,6 +129,7 @@ export default { } return { singer: formatSingerName(item.authors, 'author_name'), + singerList: formatSingerList(item.authors, 'author_id', 'author_name'), name: decodeName(item.songname), albumName: decodeName(item.remark), albumId: item.album_id, diff --git a/src/renderer/utils/musicSdk/kg/musicSearch.js b/src/renderer/utils/musicSdk/kg/musicSearch.js index 0893c6c2..1b76545c 100644 --- a/src/renderer/utils/musicSdk/kg/musicSearch.js +++ b/src/renderer/utils/musicSdk/kg/musicSearch.js @@ -1,7 +1,7 @@ import { httpFetch } from '../../request' import { decodeName, formatPlayTime, sizeFormate } from '../../index' import { formatSingerName } from '../utils' - +import { formatSingerList } from './util' export default { limit: 30, @@ -49,6 +49,7 @@ export default { } return { singer: decodeName(formatSingerName(rawData.Singers, 'name')), + singerList: formatSingerList(rawData.Singers), name: decodeName(rawData.SongName), albumName: decodeName(rawData.AlbumName), albumId: rawData.AlbumID, diff --git a/src/renderer/utils/musicSdk/kg/util.js b/src/renderer/utils/musicSdk/kg/util.js index 955bac98..7ea15f58 100644 --- a/src/renderer/utils/musicSdk/kg/util.js +++ b/src/renderer/utils/musicSdk/kg/util.js @@ -60,3 +60,18 @@ export const createHttpFetch = async(url, options, retryNum = 0) => { if (Array.isArray(result.body.info)) return result.body return result.body.info } + +/** + * 处理歌手列表 + * @param {Array} rawList + */ +export const formatSingerList = (rawList, keyID = 'id', keyName = 'name') => { + let returnList = [] + rawList.forEach((s) => { + returnList.push({ + name: s[keyName], + id: String(s[keyID]), + }) + }) + return returnList +} diff --git a/src/renderer/utils/musicSdk/kw/leaderboard.js b/src/renderer/utils/musicSdk/kw/leaderboard.js index 5756ea72..c41f0b45 100644 --- a/src/renderer/utils/musicSdk/kw/leaderboard.js +++ b/src/renderer/utils/musicSdk/kw/leaderboard.js @@ -124,6 +124,10 @@ export default { // types.reverse() return { singer: formatSinger(decodeName(item.artist)), + singetList: [{ + name: formatSinger(decodeName(item.artist)), + id: item.artistid, + }], name: decodeName(item.name), albumName: decodeName(item.album), albumId: item.albumid, diff --git a/src/renderer/utils/musicSdk/kw/musicSearch.js b/src/renderer/utils/musicSdk/kw/musicSearch.js index fdcb3789..b51ab02c 100644 --- a/src/renderer/utils/musicSdk/kw/musicSearch.js +++ b/src/renderer/utils/musicSdk/kw/musicSearch.js @@ -81,6 +81,10 @@ export default { result.push({ name: decodeName(info.SONGNAME), singer: formatSinger(decodeName(info.ARTIST)), + singerList: [{ + name: formatSinger(decodeName(info.ARTIST)), + id: info.ARTISTID, + }], source: 'kw', // img = (info.album.name === '' || info.album.name === '空') // ? `http://player.kuwo.cn/webmusic/sj/dtflagdate?flag=6&rid=MUSIC_160911.jpg` diff --git a/src/renderer/utils/musicSdk/kw/songList.js b/src/renderer/utils/musicSdk/kw/songList.js index ac24630a..a63e5560 100644 --- a/src/renderer/utils/musicSdk/kw/songList.js +++ b/src/renderer/utils/musicSdk/kw/songList.js @@ -431,6 +431,10 @@ export default { return { singer: formatSinger(decodeName(item.artist)), + singerList: [{ + name: formatSinger(decodeName(item.artist)), + id: item.artistid, + }], name: decodeName(item.name), albumName: decodeName(item.album), albumId: item.albumid, diff --git a/src/renderer/utils/musicSdk/tx/leaderboard.js b/src/renderer/utils/musicSdk/tx/leaderboard.js index 09f51746..c15edbf4 100644 --- a/src/renderer/utils/musicSdk/tx/leaderboard.js +++ b/src/renderer/utils/musicSdk/tx/leaderboard.js @@ -1,6 +1,7 @@ import { httpFetch } from '../../request' import { formatPlayTime, sizeFormate } from '../../index' import { formatSingerName } from '../utils' +import { formatSingerList } from './util' let boardList = [{ id: 'tx__4', name: '流行指数榜', bangid: '4' }, { id: 'tx__26', name: '热歌榜', bangid: '26' }, { id: 'tx__27', name: '新歌榜', bangid: '27' }, { id: 'tx__62', name: '飙升榜', bangid: '62' }, { id: 'tx__58', name: '说唱榜', bangid: '58' }, { id: 'tx__57', name: '喜力电音榜', bangid: '57' }, { id: 'tx__28', name: '网络歌曲榜', bangid: '28' }, { id: 'tx__5', name: '内地榜', bangid: '5' }, { id: 'tx__3', name: '欧美榜', bangid: '3' }, { id: 'tx__59', name: '香港地区榜', bangid: '59' }, { id: 'tx__16', name: '韩国榜', bangid: '16' }, { id: 'tx__60', name: '抖快榜', bangid: '60' }, { id: 'tx__29', name: '影视金曲榜', bangid: '29' }, { id: 'tx__17', name: '日本榜', bangid: '17' }, { id: 'tx__52', name: '腾讯音乐人原创榜', bangid: '52' }, { id: 'tx__36', name: 'K歌金曲榜', bangid: '36' }, { id: 'tx__61', name: '台湾地区榜', bangid: '61' }, { id: 'tx__63', name: 'DJ舞曲榜', bangid: '63' }, { id: 'tx__64', name: '综艺新歌榜', bangid: '64' }, { id: 'tx__65', name: '国风热歌榜', bangid: '65' }, { id: 'tx__67', name: '听歌识曲榜', bangid: '67' }, { id: 'tx__72', name: '动漫音乐榜', bangid: '72' }, { id: 'tx__73', name: '游戏音乐榜', bangid: '73' }, { id: 'tx__75', name: '有声榜', bangid: '75' }, { id: 'tx__131', name: '校园音乐人排行榜', bangid: '131' }] @@ -141,6 +142,7 @@ export default { // types.reverse() return { singer: formatSingerName(item.singer, 'name'), + singerList: formatSingerList(item.singer), name: item.name, albumName: item.album.name, albumId: item.album.mid, diff --git a/src/renderer/utils/musicSdk/tx/musicSearch.js b/src/renderer/utils/musicSdk/tx/musicSearch.js index 2e011eca..ff06e71f 100644 --- a/src/renderer/utils/musicSdk/tx/musicSearch.js +++ b/src/renderer/utils/musicSdk/tx/musicSearch.js @@ -1,6 +1,7 @@ import { httpFetch } from '../../request' import { formatPlayTime, sizeFormate } from '../../index' import { formatSingerName } from '../utils' +import { formatSingerList } from './util' export default { limit: 50, @@ -95,6 +96,7 @@ export default { } list.push({ singer: formatSingerName(item.singer, 'name'), + singerList: formatSingerList(item.singer), name: item.name, albumName, albumId, diff --git a/src/renderer/utils/musicSdk/tx/songList.js b/src/renderer/utils/musicSdk/tx/songList.js index 5cf9ec7f..6eef9a97 100644 --- a/src/renderer/utils/musicSdk/tx/songList.js +++ b/src/renderer/utils/musicSdk/tx/songList.js @@ -1,6 +1,7 @@ import { httpFetch } from '../../request' import { decodeName, formatPlayTime, sizeFormate, dateFormat, formatPlayCount } from '../../index' import { formatSingerName } from '../utils' +import { formatSingerList } from './util' export default { _requestObj_tags: null, @@ -259,6 +260,7 @@ export default { // types.reverse() return { singer: formatSingerName(item.singer, 'name'), + singerList: formatSingerList(item.singer), name: item.name, albumName: item.album.name, albumId: item.album.mid, diff --git a/src/renderer/utils/musicSdk/tx/util.js b/src/renderer/utils/musicSdk/tx/util.js new file mode 100644 index 00000000..43e0a9b6 --- /dev/null +++ b/src/renderer/utils/musicSdk/tx/util.js @@ -0,0 +1,15 @@ +/** + * 处理歌手列表 + * @param {Array} rawList + */ +export const formatSingerList = (rawList) => { + let returnList = [] + rawList.forEach((s) => { + returnList.push({ + name: s.name, + id: String(s.id), + mid: s.mid, + }) + }) + return returnList +} From f0ece1d9d715b8fb67a9d1eb9f3743225dfb9392 Mon Sep 17 00:00:00 2001 From: Folltoshe Date: Sat, 10 Jun 2023 02:06:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E7=95=99tx=E6=AD=8C=E6=89=8BAPI?= =?UTF-8?q?=20&=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/utils/musicSdk/kg/singer.js | 6 +- src/renderer/utils/musicSdk/tx/leaderboard.js | 3 +- src/renderer/utils/musicSdk/tx/lyric.js | 2 +- src/renderer/utils/musicSdk/tx/musicInfo.js | 157 ++++++++---------- src/renderer/utils/musicSdk/tx/musicSearch.js | 64 +------ src/renderer/utils/musicSdk/tx/singer.js | 152 +++++++++++++++++ src/renderer/utils/musicSdk/tx/songList.js | 3 +- src/renderer/utils/musicSdk/tx/util.js | 85 ++++++++-- src/renderer/utils/musicSdk/utils.js | 16 ++ src/renderer/utils/musicSdk/wy/singer.js | 6 +- 10 files changed, 320 insertions(+), 174 deletions(-) create mode 100644 src/renderer/utils/musicSdk/tx/singer.js diff --git a/src/renderer/utils/musicSdk/kg/singer.js b/src/renderer/utils/musicSdk/kg/singer.js index 47ea1600..b1398336 100644 --- a/src/renderer/utils/musicSdk/kg/singer.js +++ b/src/renderer/utils/musicSdk/kg/singer.js @@ -18,7 +18,7 @@ export default { name: body.singername, desc: body.intro, avatar: body.imgurl.replace('{size}', 480), - gender: body.grade === 1 ? '1' : '2', + gender: body.grade === 1 ? 'man' : 'woman', }, count: { music: body.songcount, @@ -33,10 +33,10 @@ export default { * @param {*} page * @param {*} limit */ - getAlbumList(id, page, limit) { + getAlbumList(id, page = 1, limit = 10) { if (id == 0) throw new Error('歌手不存在') return createHttpFetch(`http://mobiles.kugou.com/api/v5/singer/album?singerid=${id}&page=${page}&pagesize=${limit}`).then(body => { - if (!body.info) throw new Error('get singer album faild.') + if (!body.info) throw new Error('get singer album list faild.') const list = this.filterAlbumList(body.info) return { diff --git a/src/renderer/utils/musicSdk/tx/leaderboard.js b/src/renderer/utils/musicSdk/tx/leaderboard.js index c15edbf4..b9184a37 100644 --- a/src/renderer/utils/musicSdk/tx/leaderboard.js +++ b/src/renderer/utils/musicSdk/tx/leaderboard.js @@ -1,7 +1,6 @@ import { httpFetch } from '../../request' import { formatPlayTime, sizeFormate } from '../../index' -import { formatSingerName } from '../utils' -import { formatSingerList } from './util' +import { formatSingerName, formatSingerList } from '../utils' let boardList = [{ id: 'tx__4', name: '流行指数榜', bangid: '4' }, { id: 'tx__26', name: '热歌榜', bangid: '26' }, { id: 'tx__27', name: '新歌榜', bangid: '27' }, { id: 'tx__62', name: '飙升榜', bangid: '62' }, { id: 'tx__58', name: '说唱榜', bangid: '58' }, { id: 'tx__57', name: '喜力电音榜', bangid: '57' }, { id: 'tx__28', name: '网络歌曲榜', bangid: '28' }, { id: 'tx__5', name: '内地榜', bangid: '5' }, { id: 'tx__3', name: '欧美榜', bangid: '3' }, { id: 'tx__59', name: '香港地区榜', bangid: '59' }, { id: 'tx__16', name: '韩国榜', bangid: '16' }, { id: 'tx__60', name: '抖快榜', bangid: '60' }, { id: 'tx__29', name: '影视金曲榜', bangid: '29' }, { id: 'tx__17', name: '日本榜', bangid: '17' }, { id: 'tx__52', name: '腾讯音乐人原创榜', bangid: '52' }, { id: 'tx__36', name: 'K歌金曲榜', bangid: '36' }, { id: 'tx__61', name: '台湾地区榜', bangid: '61' }, { id: 'tx__63', name: 'DJ舞曲榜', bangid: '63' }, { id: 'tx__64', name: '综艺新歌榜', bangid: '64' }, { id: 'tx__65', name: '国风热歌榜', bangid: '65' }, { id: 'tx__67', name: '听歌识曲榜', bangid: '67' }, { id: 'tx__72', name: '动漫音乐榜', bangid: '72' }, { id: 'tx__73', name: '游戏音乐榜', bangid: '73' }, { id: 'tx__75', name: '有声榜', bangid: '75' }, { id: 'tx__131', name: '校园音乐人排行榜', bangid: '131' }] diff --git a/src/renderer/utils/musicSdk/tx/lyric.js b/src/renderer/utils/musicSdk/tx/lyric.js index 6e1ac45c..924c54fe 100644 --- a/src/renderer/utils/musicSdk/tx/lyric.js +++ b/src/renderer/utils/musicSdk/tx/lyric.js @@ -1,5 +1,5 @@ import { httpFetch } from '../../request' -import getMusicInfo from './musicInfo' +import { getMusicInfo } from './musicInfo' import { rendererInvoke } from '@common/rendererIpc' import { WIN_MAIN_RENDERER_EVENT_NAME } from '@common/ipcNames' diff --git a/src/renderer/utils/musicSdk/tx/musicInfo.js b/src/renderer/utils/musicSdk/tx/musicInfo.js index ce8c52fb..e9920fff 100644 --- a/src/renderer/utils/musicSdk/tx/musicInfo.js +++ b/src/renderer/utils/musicSdk/tx/musicInfo.js @@ -1,98 +1,77 @@ -import { httpFetch } from '../../request' import { formatPlayTime, sizeFormate } from '../../index' +import { formatSingerName, formatSingerList } from '../utils' +import { createMusicuFetch } from './util' -const getSinger = (singers) => { - let arr = [] - singers.forEach(singer => { - arr.push(singer.name) - }) - return arr.join('、') +export const filterMusicInfoItem = (item) => { + const types = [] + const _types = {} + if (item.file.size_128mp3 != 0) { + let size = sizeFormate(item.file.size_128mp3) + types.push({ type: '128k', size }) + _types['128k'] = { + size, + } + } + if (item.file.size_320mp3 !== 0) { + let size = sizeFormate(item.file.size_320mp3) + types.push({ type: '320k', size }) + _types['320k'] = { + size, + } + } + if (item.file.size_flac !== 0) { + let size = sizeFormate(item.file.size_flac) + types.push({ type: 'flac', size }) + _types.flac = { + size, + } + } + if (item.file.size_hires !== 0) { + let size = sizeFormate(item.file.size_hires) + types.push({ type: 'flac24bit', size }) + _types.flac24bit = { + size, + } + } + + const albumId = item.album.id ?? '' + const albumMid = item.album.mid ?? '' + const albumName = item.album.name ?? '' + return { + source: 'tx', + singer: formatSingerName(item.singer, 'name'), + singerList: formatSingerList(item.singer), + name: item.name, + albumName, + albumId, + albumMid, + interval: formatPlayTime(item.interval), + songId: item.id, + songmid: item.mid, + strMediaMid: item.file.media_mid, + img: (albumId === '' || albumId === '空') + ? item.singer?.length ? `https://y.gtimg.cn/music/photo_new/T001R500x500M000${item.singer[0].mid}.jpg` : '' + : `https://y.gtimg.cn/music/photo_new/T002R500x500M000${albumMid}.jpg`, + types, + _types, + typeUrl: {}, + } } -export default (songmid) => { - const requestObj = 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)', +export const getMusicInfo = (id) => { + return createMusicuFetch({ + module: 'music.pf_song_detail_svr', + method: 'get_song_detail_yqq', + param: { + song_type: 0, + song_mid: id, }, - body: { - comm: { - ct: '19', - cv: '1859', - uin: '0', - }, - req: { - module: 'music.pf_song_detail_svr', - method: 'get_song_detail_yqq', - param: { - song_type: 0, - song_mid: songmid, - }, - }, - }, - }) - return requestObj.promise.then(({ body }) => { - // console.log(body) - if (body.code != 0 || body.req.code != 0) return Promise.reject('获取歌曲信息失败') - const item = body.req.data.track_info + }).then(body => { + if (!body) throw new Error('get music info faild.') + + const item = body.track_info if (!item.file?.media_mid) return null - let types = [] - let _types = {} - const file = item.file - if (file.size_128mp3 != 0) { - let size = sizeFormate(file.size_128mp3) - types.push({ type: '128k', size }) - _types['128k'] = { - size, - } - } - if (file.size_320mp3 !== 0) { - let size = sizeFormate(file.size_320mp3) - types.push({ type: '320k', size }) - _types['320k'] = { - size, - } - } - 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: 'flac24bit', size }) - _types.flac24bit = { - size, - } - } - // types.reverse() - let albumId = '' - let albumName = '' - if (item.album) { - albumName = item.album.name - albumId = item.album.mid - } - return { - singer: getSinger(item.singer), - name: item.name, - albumName, - albumId, - source: 'tx', - interval: formatPlayTime(item.interval), - songId: item.id, - albumMid: item.album?.mid ?? '', - strMediaMid: item.file.media_mid, - songmid: item.mid, - img: (albumId === '' || albumId === '空') - ? item.singer?.length ? `https://y.gtimg.cn/music/photo_new/T001R500x500M000${item.singer[0].mid}.jpg` : '' - : `https://y.gtimg.cn/music/photo_new/T002R500x500M000${albumId}.jpg`, - types, - _types, - typeUrl: {}, - } + return filterMusicInfoItem(item) }) } - diff --git a/src/renderer/utils/musicSdk/tx/musicSearch.js b/src/renderer/utils/musicSdk/tx/musicSearch.js index ff06e71f..24b86d99 100644 --- a/src/renderer/utils/musicSdk/tx/musicSearch.js +++ b/src/renderer/utils/musicSdk/tx/musicSearch.js @@ -1,7 +1,5 @@ import { httpFetch } from '../../request' -import { formatPlayTime, sizeFormate } from '../../index' -import { formatSingerName } from '../utils' -import { formatSingerList } from './util' +import { filterMusicInfoItem } from './musicInfo' export default { limit: 50, @@ -51,68 +49,10 @@ export default { }) }, handleResult(rawList) { - // console.log(rawList) const list = [] rawList.forEach(item => { if (!item.file?.media_mid) return - - let types = [] - let _types = {} - const file = item.file - if (file.size_128mp3 != 0) { - let size = sizeFormate(file.size_128mp3) - types.push({ type: '128k', size }) - _types['128k'] = { - size, - } - } - if (file.size_320mp3 !== 0) { - let size = sizeFormate(file.size_320mp3) - types.push({ type: '320k', size }) - _types['320k'] = { - size, - } - } - 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: 'flac24bit', size }) - _types.flac24bit = { - size, - } - } - // types.reverse() - let albumId = '' - let albumName = '' - if (item.album) { - albumName = item.album.name - albumId = item.album.mid - } - list.push({ - singer: formatSingerName(item.singer, 'name'), - singerList: formatSingerList(item.singer), - name: item.name, - albumName, - albumId, - source: 'tx', - interval: formatPlayTime(item.interval), - songId: item.id, - albumMid: item.album?.mid ?? '', - strMediaMid: item.file.media_mid, - songmid: item.mid, - img: (albumId === '' || albumId === '空') - ? item.singer?.length ? `https://y.gtimg.cn/music/photo_new/T001R500x500M000${item.singer[0].mid}.jpg` : '' - : `https://y.gtimg.cn/music/photo_new/T002R500x500M000${albumId}.jpg`, - types, - _types, - typeUrl: {}, - }) + list.push(filterMusicInfoItem(item)) }) // console.log(list) return list diff --git a/src/renderer/utils/musicSdk/tx/singer.js b/src/renderer/utils/musicSdk/tx/singer.js new file mode 100644 index 00000000..7722df7d --- /dev/null +++ b/src/renderer/utils/musicSdk/tx/singer.js @@ -0,0 +1,152 @@ +import { createMusicuFetch, createMusicuFetchs } from './util' +import { filterMusicInfo } from './musicInfo' + +export default { + /** + * 获取歌手信息 + * @param {*} id + */ + getInfo(id) { + return createMusicuFetchs({ + req_1: { + module: 'music.musichallSinger.SingerInfoInter', + method: 'GetSingerDetail', + param: { + singer_mid: [id], + ex_singer: 1, + wiki_singer: 1, + group_singer: 0, + pic: 1, + photos: 0, + }, + }, + req_2: { + module: 'music.musichallAlbum.AlbumListServer', + method: 'GetAlbumList', + param: { + singerMid: id, + order: 0, + begin: 0, + num: 1, + songNumTag: 0, + singerID: 0, + }, + }, + req_3: { + module: 'musichall.song_list_server', + method: 'GetSingerSongList', + param: { + singerMid: '0025NhlN2yWrP4', + order: 1, + begin: 0, + num: 1, + }, + }, + }).then(body => { + if (body.req_1.code != 0 || body.req_2.code != 0 || body.req_3.code != 0) throw new Error('get singer info faild.') + + const info = body.req_1.data.singer_list[0] + const music = body.req_3.data + const album = body.req_3.data + return { + source: 'tx', + id: info.basic_info.singer_mid, + info: { + name: info.basic_info.name, + desc: info.ex_info.desc, + avatar: info.pic.pic, + gender: info.ex_info.genre === 1 ? 'man' : 'woman', + }, + count: { + music: music.totalNum, + album: album.total, + }, + } + }) + }, + /** + * 获取歌手专辑列表 + * @param {*} id + * @param {*} page + * @param {*} limit + */ + getAlbumList(id, page = 1, limit = 10) { + if (page === 1) page = 0 + return createMusicuFetch({ + module: 'music.musichallAlbum.AlbumListServer', + method: 'GetAlbumList', + param: { + singerMid: id, + order: 0, + begin: page * limit, + num: limit, + songNumTag: 0, + singerID: 0, + }, + }).then(body => { + if (!body.albumList) throw new Error('get singer album faild.') + + const list = this.filterAlbumList(body.albumList) + return { + source: 'tx', + list, + limit, + page, + total: body.total, + } + }) + }, + /** + * 获取歌手歌曲列表 + * @param {*} id + * @param {*} page + * @param {*} limit + */ + async getSongList(id, page = 1, limit = 100) { + if (page === 1) page = 0 + return createMusicuFetch({ + module: 'musichall.song_list_server', + method: 'GetSingerSongList', + param: { + singerMid: id, + order: 1, + begin: page * limit, + num: limit, + }, + }).then(body => { + if (!body.albumList) throw new Error('get singer song list faild.') + + const list = this.filterSongList(body.songList) + return { + source: 'tx', + list, + limit, + page, + total: body.totalNum, + } + }) + }, + filterAlbumList(raw) { + return raw.map(item => { + return { + id: item.albumID, + mid: item.albumMid, + count: item.totalNum, + info: { + name: item.albumName, + author: item.singerName, + img: `https://y.gtimg.cn/music/photo_new/T002R500x500M000${item.albumMid}.jpg`, + desc: null, + }, + } + }) + }, + filterSongList(raw) { + const list = [] + raw.forEach(item => { + list.push(filterMusicInfo(item.songInfo)) + }) + return list + } +} + diff --git a/src/renderer/utils/musicSdk/tx/songList.js b/src/renderer/utils/musicSdk/tx/songList.js index 6eef9a97..42f7ed85 100644 --- a/src/renderer/utils/musicSdk/tx/songList.js +++ b/src/renderer/utils/musicSdk/tx/songList.js @@ -1,7 +1,6 @@ import { httpFetch } from '../../request' import { decodeName, formatPlayTime, sizeFormate, dateFormat, formatPlayCount } from '../../index' -import { formatSingerName } from '../utils' -import { formatSingerList } from './util' +import { formatSingerName, formatSingerList } from '../utils' export default { _requestObj_tags: null, diff --git a/src/renderer/utils/musicSdk/tx/util.js b/src/renderer/utils/musicSdk/tx/util.js index 43e0a9b6..4d5fc778 100644 --- a/src/renderer/utils/musicSdk/tx/util.js +++ b/src/renderer/utils/musicSdk/tx/util.js @@ -1,15 +1,76 @@ +import { httpFetch } from '../../request' + /** - * 处理歌手列表 - * @param {Array} rawList + * 创建一个适用于TX的Http请求 + * @param {*} url + * @param {*} options + * @param {*} retryNum */ -export const formatSingerList = (rawList) => { - let returnList = [] - rawList.forEach((s) => { - returnList.push({ - name: s.name, - id: String(s.id), - mid: s.mid, - }) - }) - return returnList +export const createMusicuFetch = async(data, options, retryNum = 0) => { + if (retryNum > 2) throw new Error('try max num') + + let result + try { + result = await httpFetch('https://u.y.qq.com/cgi-bin/musicu.fcg', { + method: 'POST', + body: { + comm: { + cv: 4747474, + ct: 24, + format: 'json', + inCharset: 'utf-8', + outCharset: 'utf-8', + uin: 0, + }, + req: data, + }, + headers: { + 'User-Angent': 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0)', + }, + }).promise + } catch (err) { + console.log(err) + return createMusicuFetch(data, options, ++retryNum) + } + + if (result.statusCode !== 200 || result.body.code != 0 || result.body.req.code != 0) return createMusicuFetch(data, options, ++retryNum) + if (result.body.req.data) return result.body.req.data + return result.body.req +} + +/** + * 创建许多个适用于TX的Http请求 + * @param {*} url + * @param {*} options + * @param {*} retryNum + */ +export const createMusicuFetchs = async(data, options, retryNum = 0) => { + if (retryNum > 2) throw new Error('try max num') + + let result + try { + result = await httpFetch('https://u.y.qq.com/cgi-bin/musicu.fcg', { + method: 'POST', + body: { + comm: { + cv: 4747474, + ct: 24, + format: 'json', + inCharset: 'utf-8', + outCharset: 'utf-8', + uin: 0, + }, + ...data, + }, + headers: { + 'User-Angent': 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0)', + }, + }).promise + } catch (err) { + console.log(err) + return createMusicuFetchs(data, options, ++retryNum) + } + + if (result.statusCode !== 200 || result.body.code != 0) return createMusicuFetchs(data, options, ++retryNum) + return result.body } diff --git a/src/renderer/utils/musicSdk/utils.js b/src/renderer/utils/musicSdk/utils.js index 0bbf6325..d91252f3 100644 --- a/src/renderer/utils/musicSdk/utils.js +++ b/src/renderer/utils/musicSdk/utils.js @@ -48,3 +48,19 @@ export const formatSingerName = (singers, nameKey = 'name', join = '、') => { } return decodeName(String(singers ?? '')) } + +/** + * 处理歌手列表 + * @param singers 歌手数组 + */ +export const formatSingerList = (singers, nameKey = 'name', idKey = 'id', midKey = 'mid') => { + const list = [] + singers.forEach((s) => { + list.push({ + name: s[nameKey], + id: s[idKey], + mid: s[midKey], + }) + }) + return list +} diff --git a/src/renderer/utils/musicSdk/wy/singer.js b/src/renderer/utils/musicSdk/wy/singer.js index 000d3b88..4fe350f4 100644 --- a/src/renderer/utils/musicSdk/wy/singer.js +++ b/src/renderer/utils/musicSdk/wy/singer.js @@ -17,7 +17,7 @@ export default { name: body.artist.name, desc: body.artist.briefDesc, avatar: body.user.avatarUrl, - gender: body.user.gender === 1 ? '1' : '2', + gender: body.user.gender === 1 ? 'man' : 'woman', }, count: { music: body.artist.musicSize, @@ -39,7 +39,7 @@ export default { limit, offset: limit * page }).then(body => { - if (!body.songs) throw new Error("get singer songs faild.") + if (!body.songs) throw new Error("get singer song list faild.") const list = this.filterSongList(body.songs) return { @@ -63,7 +63,7 @@ export default { limit, offset: limit * page }).then(body => { - if (!body.hotAlbums) throw new Error("get singer songs faild.") + if (!body.hotAlbums) throw new Error("get singer album list faild.") const list = this.filterAlbumList(body.hotAlbums) return {