修复mg排行榜无法加载的问题

publish/changeLog.md

@@ -1,18 +1,3 @@
-如果你喜欢并经常使用洛雪音乐，并想要第一时间尝鲜洛雪的新功能，可以加入测试企鹅群768786588，
-注意：测试版的功可能会不稳定，打算潜水的勿加。
-
-### 新增
-
-- 歌曲搜索框新增清理按钮，点击此按钮可以清理搜索框并返回初始搜索界面
-- 新增“下载的歌词文件编码格式”设置，默认下载的歌词编码仍是`UTF-8`，对于某些在设备(如车机)上出现歌词中文乱码的用户可以尝试选择以`GBK`编码格式保存歌词文件
-- 新增设置-桌面歌词-歌词字体设置，此设置可用于设置桌面歌词的字体（已知的问题：Windows 7 下可能会出现字体列表为空的情况，这是当前系统的 Powershell 版本小于5.1导致的，请自行**尝试**看常见解决）
-
-### 优化
-
-- 支持网易源“我喜欢”歌单以注入token的方式打开。由于网易源的“我喜欢”歌单需要登录才能打开（若你看不懂后半句就去阅读 常见问题-无法打开外部歌单），现若想要打开此类歌单，需要在歌单链接后面拼上 `###` 再加上有效的token，拼接格式：`[id|url]###token`，例子（最后面的xxxxxx替换成你的token）：`https://music.163.com/#/playlist?id=123456&userid=123456###xxxxxx`
-- 软件内快捷键的最小化触发时，如果已启用托盘，则隐藏程序，否则最小化程序
-
 ### 修复
 
-- 修复某些情况下同步功能会导致切歌混乱的问题
-- 修复从电脑浏览器复制的企鹅歌单链接无法打开的问题
+- 修复mg排行榜无法加载的问题

src/renderer/utils/music/mg/index.js

@@ -1,5 +1,5 @@
 import { apis } from '../api-source'
-import leaderboard from './leaderboard2'
+import leaderboard from './leaderboard'
 import songList from './songList'
 import musicSearch from './musicSearch'
 import pic from './pic'

src/renderer/utils/music/mg/leaderboard.js

@@ -2,7 +2,9 @@ import { httpFetch } from '../../request'
 import { sizeFormate } from '../../index'
 
 
-const boardList = [{ id: 'mg__27553319', name: '咪咕尖叫新歌榜', bangid: '27553319' }, { id: 'mg__27186466', name: '咪咕尖叫热歌榜', bangid: '27186466' }, { id: 'mg__27553408', name: '咪咕尖叫原创榜', bangid: '27553408' }, { id: 'mg__23189800', name: '咪咕港台榜', bangid: '23189800' }, { id: 'mg__23189399', name: '咪咕内地榜', bangid: '23189399' }, { id: 'mg__19190036', name: '咪咕欧美榜', bangid: '19190036' }, { id: 'mg__23189813', name: '咪咕日韩榜', bangid: '23189813' }, { id: 'mg__23190126', name: '咪咕彩铃榜', bangid: '23190126' }, { id: 'mg__15140045', name: '咪咕KTV榜', bangid: '15140045' }, { id: 'mg__15140034', name: '咪咕网络榜', bangid: '15140034' }, { id: 'mg__23217754', name: 'MV榜', bangid: '23217754' }, { id: 'mg__23218151', name: '新专辑榜', bangid: '23218151' }, { id: 'mg__21958042', name: 'iTunes榜', bangid: '21958042' }, { id: 'mg__21975570', name: 'billboard榜', bangid: '21975570' }, { id: 'mg__22272815', name: '台湾Hito中文榜', bangid: '22272815' }, { id: 'mg__22272904', name: '中国TOP排行榜', bangid: '22272904' }, { id: 'mg__22272943', name: '韩国Melon榜', bangid: '22272943' }, { id: 'mg__22273437', name: '英国UK榜', bangid: '22273437' }]
+// const boardList = [{ id: 'mg__27553319', name: '咪咕尖叫新歌榜', bangid: '27553319' }, { id: 'mg__27186466', name: '咪咕尖叫热歌榜', bangid: '27186466' }, { id: 'mg__27553408', name: '咪咕尖叫原创榜', bangid: '27553408' }, { id: 'mg__23189800', name: '咪咕港台榜', bangid: '23189800' }, { id: 'mg__23189399', name: '咪咕内地榜', bangid: '23189399' }, { id: 'mg__19190036', name: '咪咕欧美榜', bangid: '19190036' }, { id: 'mg__23189813', name: '咪咕日韩榜', bangid: '23189813' }, { id: 'mg__23190126', name: '咪咕彩铃榜', bangid: '23190126' }, { id: 'mg__15140045', name: '咪咕KTV榜', bangid: '15140045' }, { id: 'mg__15140034', name: '咪咕网络榜', bangid: '15140034' }, { id: 'mg__23217754', name: 'MV榜', bangid: '23217754' }, { id: 'mg__23218151', name: '新专辑榜', bangid: '23218151' }, { id: 'mg__21958042', name: 'iTunes榜', bangid: '21958042' }, { id: 'mg__21975570', name: 'billboard榜', bangid: '21975570' }, { id: 'mg__22272815', name: '台湾Hito中文榜', bangid: '22272815' }, { id: 'mg__22272904', name: '中国TOP排行榜', bangid: '22272904' }, { id: 'mg__22272943', name: '韩国Melon榜', bangid: '22272943' }, { id: 'mg__22273437', name: '英国UK榜', bangid: '22273437' }]
+
+const boardList = [{ id: 'mg__27553319', name: '尖叫新歌榜', bangid: '27553319' }, { id: 'mg__27186466', name: '尖叫热歌榜', bangid: '27186466' }, { id: 'mg__27553408', name: '尖叫原创榜', bangid: '27553408' }, { id: 'mg__23189800', name: '港台榜', bangid: '23189800' }, { id: 'mg__23189399', name: '内地榜', bangid: '23189399' }, { id: 'mg__19190036', name: '欧美榜', bangid: '19190036' }, { id: 'mg__23189813', name: '日韩榜', bangid: '23189813' }, { id: 'mg__23190126', name: '彩铃榜', bangid: '23190126' }, { id: 'mg__15140045', name: 'KTV榜', bangid: '15140045' }, { id: 'mg__15140034', name: '网络榜', bangid: '15140034' }, { id: 'mg__21958042', name: '美国iTunes榜', bangid: '21958042' }, { id: 'mg__21975570', name: '美国billboard榜', bangid: '21975570' }, { id: 'mg__22272815', name: '台湾Hito中文榜', bangid: '22272815' }, { id: 'mg__22272943', name: '韩国Melon榜', bangid: '22272943' }, { id: 'mg__22273437', name: '英国UK榜', bangid: '22273437' }]
 
 export default {
   limit: 200,
@@ -59,7 +61,7 @@ export default {
     },
   ],
   getUrl(id, page) {
-    return `https://app.c.nf.migu.cn/MIGUM3.0/v1.0/template/rank-detail/release?columnId=${id}`
+    return `https://app.c.nf.migu.cn/MIGUM2.0/v1.0/content/querycontentbyId.do?columnId=${id}&needAll=0`
     // return `http://m.music.migu.cn/migu/remoting/cms_list_tag?nid=${id}&pageSize=${this.limit}&pageNo=${page - 1}`
   },
   successCode: '000000',
@@ -67,16 +69,12 @@ export default {
   requestObj: null,
   getBoardsData() {
     if (this.requestBoardsObj) this._requestBoardsObj.cancelHttp()
-    this.requestBoardsObj = httpFetch('https://app.c.nf.migu.cn/MIGUM2.0/v2.0/content/indexrank.do?templateVersion=8', {
+    this.requestBoardsObj = httpFetch('https://app.c.nf.migu.cn/MIGUM3.0/v1.0/template/rank-list/release', {
+    // this.requestBoardsObj = httpFetch('https://app.c.nf.migu.cn/MIGUM2.0/v2.0/content/indexrank.do?templateVersion=8', {
       headers: {
-        sign: 'c3b7ae985e2206e97f1b2de8f88691e2',
-        timestamp: 1578225871982,
-        appId: 'yyapp2',
-        mode: 'android',
-        ua: 'Android_migu',
-        version: '6.9.4',
-        osVersion: 'android 7.0',
-        'User-Agent': 'okhttp/3.9.1',
+        Referer: 'https://app.c.nf.migu.cn/',
+        'User-Agent': 'Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Mobile Safari/537.36',
+        channel: '0146921',
       },
     })
     return this.requestBoardsObj.promise
@@ -98,13 +96,13 @@ export default {
     // console.log(rawData)
     let ids = new Set()
     const list = []
-    rawData.forEach(item => {
+    rawData.forEach(({ objectInfo: item }) => {
       if (ids.has(item.copyrightId)) return
       ids.add(item.copyrightId)
 
       const types = []
       const _types = {}
-      item.rateFormats && item.rateFormats.forEach(type => {
+      item.newRateFormats && item.newRateFormats.forEach(type => {
         let size
         switch (type.formatType) {
           case 'PQ':
@@ -131,6 +129,8 @@ export default {
         }
       })
 
+      const intervalTest = /(\d\d:\d\d)$/.test(item.length)
+
       list.push({
         singer: this.getSinger(item.artists),
         name: item.songName,
@@ -140,7 +140,7 @@ export default {
         songId: item.songId,
         copyrightId: item.copyrightId,
         source: 'mg',
-        interval: null,
+        interval: intervalTest ? RegExp.$1 : null,
         img: item.albumImgs && item.albumImgs.length ? item.albumImgs[0].img : null,
         lrc: null,
         lrcUrl: item.lrcUrl,
@@ -197,9 +197,9 @@ export default {
   getList(bangid, page, retryNum = 0) {
     if (++retryNum > 3) return Promise.reject(new Error('try max num'))
     return this.getData(this.getUrl(bangid, page)).then(({ statusCode, body }) => {
-      console.log(body)
+      // console.log(body)
       if (statusCode !== 200 || body.code !== this.successCode) return this.getList(bangid, page, retryNum)
-      const list = this.filterData(body.data.columnInfo.dataList)
+      const list = this.filterData(body.columnInfo.contents)
       return {
         total: list.length,
         list,

src/renderer/utils/music/mg/musicSearch.js

@@ -45,7 +45,7 @@ export default {
       ids.add(item.id)
       const types = []
       const _types = {}
-      item.rateFormats && item.rateFormats.forEach(type => {
+      item.newRateFormats && item.newRateFormats.forEach(type => {
         let size
         switch (type.formatType) {
           case 'PQ':