Merge pull request #7 from lxmusics/dev

移除多余代码

src/renderer/utils/musicSdk/kg/leaderboard.js

@@ -1,6 +1,6 @@
 import { httpFetch } from '../../request'
 import { decodeName, formatPlayTime, sizeFormate } from '../../index'
-import { formatSingerName, formatSingerList } from '../utils'
+import { formatSingerName } from '../utils'
 
 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,7 +128,6 @@ export default {
       }
       return {
         singer: formatSingerName(item.authors, 'author_name'),
-        singerList: formatSingerList(item.authors, 'author_name', 'author_id'),
         name: decodeName(item.songname),
         albumName: decodeName(item.remark),
         albumId: item.album_id,

src/renderer/utils/musicSdk/kg/musicSearch.js

@@ -1,6 +1,6 @@
 import { httpFetch } from '../../request'
 import { decodeName, formatPlayTime, sizeFormate } from '../../index'
-import { formatSingerName, formatSingerList } from '../utils'
+import { formatSingerName } from '../utils'
 
 export default {
   limit: 30,
@@ -48,7 +48,6 @@ export default {
     }
     return {
       singer: decodeName(formatSingerName(rawData.Singers, 'name')),
-      singerList: formatSingerList(rawData.Singers),
       name: decodeName(rawData.SongName),
       albumName: decodeName(rawData.AlbumName),
       albumId: rawData.AlbumID,

src/renderer/utils/musicSdk/tx/leaderboard.js

@@ -1,6 +1,6 @@
 import { httpFetch } from '../../request'
 import { formatPlayTime, sizeFormate } from '../../index'
-import { formatSingerName, formatSingerList } from '../utils'
+import { formatSingerName } 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' }]
 
@@ -141,7 +141,6 @@ 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,

src/renderer/utils/musicSdk/tx/musicInfo.js

@@ -1,8 +1,8 @@
 import { formatPlayTime, sizeFormate } from '../../index'
-import { formatSingerName, formatSingerList } from '../utils'
+import { formatSingerName } from '../utils'
 import { createMusicuFetch } from './util'
 
-export const filterMusicInfoItem = (item) => {
+export const filterMusicInfoItem = item => {
   const types = []
   const _types = {}
   if (item.file.size_128mp3 != 0) {
@@ -40,7 +40,6 @@ export const filterMusicInfoItem = (item) => {
   return {
     source: 'tx',
     singer: formatSingerName(item.singer, 'name'),
-    singerList: formatSingerList(item.singer),
     name: item.name,
     albumName,
     albumId,
@@ -60,16 +59,18 @@ export const filterMusicInfoItem = (item) => {
 
 export const getMusicInfo = (id) => {
   return createMusicuFetch({
-    module: 'music.pf_song_detail_svr',
+    req: {
-    method: 'get_song_detail_yqq',
+      module: 'music.pf_song_detail_svr',
-    param: {
+      method: 'get_song_detail_yqq',
-      song_type: 0,
+      param: {
-      song_mid: id,
+        song_type: 0,
+        song_mid: id,
+      },
     },
   }).then(body => {
-    if (!body) throw new Error('get music info faild.')
+    if (!body.req) throw new Error('get music info faild.')
 
-    const item = body.track_info
+    const item = body.req.track_info
     if (!item.file?.media_mid) return null
 
     return filterMusicInfoItem(item)

src/renderer/utils/musicSdk/tx/musicSearch.js

@@ -54,7 +54,6 @@ export default {
       if (!item.file?.media_mid) return
       list.push(filterMusicInfoItem(item))
     })
-    // console.log(list)
     return list
   },
   search(str, page = 1, limit) {

src/renderer/utils/musicSdk/tx/singer.js

@@ -1,5 +1,5 @@
-import { createMusicuFetch, createMusicuFetchs } from './util'
+import { createMusicuFetch } from './util'
-import { filterMusicInfo } from './musicInfo'
+import { filterMusicInfoItem } from './musicInfo'
 
 export default {
   /**
@@ -7,7 +7,7 @@ export default {
    * @param {*} id
    */
   getInfo(id) {
-    return createMusicuFetchs({
+    return createMusicuFetch({
       req_1: {
         module: 'music.musichallSinger.SingerInfoInter',
         method: 'GetSingerDetail',
@@ -43,11 +43,11 @@ export default {
         },
       },
     }).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.')
+      if (body.req_1 != 0 || body.req_2 != 0 || body.req_3 != 0) throw new Error('get singer info faild.')
 
-      const info = body.req_1.data.singer_list[0]
+      const info = body.req_1.singer_list[0]
-      const music = body.req_3.data
+      const music = body.req_3
-      const album = body.req_3.data
+      const album = body.req_3
       return {
         source: 'tx',
         id: info.basic_info.singer_mid,
@@ -73,26 +73,28 @@ export default {
   getAlbumList(id, page = 1, limit = 10) {
     if (page === 1) page = 0
     return createMusicuFetch({
-      module: 'music.musichallAlbum.AlbumListServer',
+      req: {
-      method: 'GetAlbumList',
+        module: 'music.musichallAlbum.AlbumListServer',
-      param: {
+        method: 'GetAlbumList',
-        singerMid: id,
+        param: {
-        order: 0,
+          singerMid: id,
-        begin: page * limit,
+          order: 0,
-        num: limit,
+          begin: page * limit,
-        songNumTag: 0,
+          num: limit,
-        singerID: 0,
+          songNumTag: 0,
+          singerID: 0,
+        },
       },
     }).then(body => {
-      if (!body.albumList) throw new Error('get singer album faild.')
+      if (!body.req) throw new Error('get singer album faild.')
 
-      const list = this.filterAlbumList(body.albumList)
+      const list = this.filterAlbumList(body.req.albumList)
       return {
         source: 'tx',
         list,
         limit,
         page,
-        total: body.total,
+        total: body.req.total,
       }
     })
   },
@@ -105,24 +107,26 @@ export default {
   async getSongList(id, page = 1, limit = 100) {
     if (page === 1) page = 0
     return createMusicuFetch({
-      module: 'musichall.song_list_server',
+      req: {
-      method: 'GetSingerSongList',
+        module: 'musichall.song_list_server',
-      param: {
+        method: 'GetSingerSongList',
-        singerMid: id,
+        param: {
-        order: 1,
+          singerMid: id,
-        begin: page * limit,
+          order: 1,
-        num: limit,
+          begin: page * limit,
+          num: limit,
+        },
       },
     }).then(body => {
-      if (!body.albumList) throw new Error('get singer song list faild.')
+      if (!body.req) throw new Error('get singer song list faild.')
 
-      const list = this.filterSongList(body.songList)
+      const list = this.filterSongList(body.req.songList)
       return {
         source: 'tx',
         list,
         limit,
         page,
-        total: body.totalNum,
+        total: body.req.totalNum,
       }
     })
   },
@@ -142,11 +146,9 @@ export default {
     })
   },
   filterSongList(raw) {
-    const list = []
+    raw.map(item => {
-    raw.forEach(item => {
+      return filterMusicInfoItem(item.songInfo)
-      list.push(filterMusicInfo(item.songInfo))
     })
-    return list
   }
 }
 

src/renderer/utils/musicSdk/tx/songList.js

@@ -1,6 +1,6 @@
 import { httpFetch } from '../../request'
 import { decodeName, formatPlayTime, sizeFormate, dateFormat, formatPlayCount } from '../../index'
-import { formatSingerName, formatSingerList } from '../utils'
+import { formatSingerName } from '../utils'
 
 export default {
   _requestObj_tags: null,
@@ -259,7 +259,6 @@ 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,

src/renderer/utils/musicSdk/tx/util.js

@@ -9,47 +9,9 @@ import { httpFetch } from '../../request'
 export const createMusicuFetch = async(data, options, retryNum = 0) => {
   if (retryNum > 2) throw new Error('try max num')
 
-  let result
+  let request
   try {
-    result = await httpFetch('https://u.y.qq.com/cgi-bin/musicu.fcg', {
+    request = 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: {
@@ -68,9 +30,14 @@ export const createMusicuFetchs = async(data, options, retryNum = 0) => {
     }).promise
   } catch (err) {
     console.log(err)
-    return createMusicuFetchs(data, options, ++retryNum)
+    return createMusicuFetch(data, options, ++retryNum)
   }
+  if (request.statusCode !== 200 || request.body.code != 0) return createMusicuFetch(data, options, ++retryNum)
 
-  if (result.statusCode !== 200 || result.body.code != 0) return createMusicuFetchs(data, options, ++retryNum)
+  const result = {}
-  return result.body
+  Object.keys(data).forEach(item => {
+    if (request.body[item].code != 0) return
+    result[item] = request.body[item].data
+  })
+  return result
 }

src/renderer/utils/musicSdk/utils.js

@@ -48,24 +48,3 @@ 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) => {
-    const name = s[nameKey]
-    const id = s[idKey]
-    const mid = s[midKey]
-
-    const info = {}
-    if (name) info.name = decodeName(name)
-    if (id) info.id = id
-    if (mid) info.mid = mid
-
-    list.push(info)
-  })
-  return list
-}