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] =?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 +}