From 713f5ba3dab0539d711e3c203ed45ff5f0705a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E7=8B=B8=E8=8A=B1=E5=96=B5?= <94218819+helloplhm-qwq@users.noreply.github.com> Date: Sun, 16 Apr 2023 11:15:15 +0800 Subject: [PATCH 1/5] Update songList.js --- src/renderer/utils/musicSdk/kg/songList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/utils/musicSdk/kg/songList.js b/src/renderer/utils/musicSdk/kg/songList.js index 7d8cdc35..1f5f3b04 100644 --- a/src/renderer/utils/musicSdk/kg/songList.js +++ b/src/renderer/utils/musicSdk/kg/songList.js @@ -875,7 +875,7 @@ export default { }) }, } - +// 用于新建branch的注释 // getList // getTags // getListDetail From 9e4c57c2d74a4a5d583bdb85ee3c929372106492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E7=8B=B8=E8=8A=B1=E5=96=B5?= <94218819+helloplhm-qwq@users.noreply.github.com> Date: Sun, 16 Apr 2023 11:18:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=94=B9=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/beta-pack.yml | 63 +++------------------------------ 1 file changed, 5 insertions(+), 58 deletions(-) diff --git a/.github/workflows/beta-pack.yml b/.github/workflows/beta-pack.yml index e58ace3b..62b0a0f0 100644 --- a/.github/workflows/beta-pack.yml +++ b/.github/workflows/beta-pack.yml @@ -4,6 +4,9 @@ on: push: branches: - beta + - master + - dev + - patch-6 jobs: Windows: @@ -59,39 +62,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: lx-music-desktop-x86-Setup - path: build/* x86 Setup.exe - - - name: Build Package 7z x86 - run: npm run pack:win:7z:x86 - - name: Upload Artifact 7z x86 - uses: actions/upload-artifact@v3 - with: - name: lx-music-desktop-win_x86-green - path: build/*win_x86 green.7z - - - name: Build Package Setup arm64 - run: npm run pack:win:setup:arm64 - - name: Upload Artifact Setup arm64 - uses: actions/upload-artifact@v3 - with: - name: lx-music-desktop-arm64-Setup - path: build/* arm64 Setup.exe - - - name: Build Package 7z arm64 - run: npm run pack:win:7z:arm64 - - name: Upload Artifact 7z arm64 - uses: actions/upload-artifact@v3 - with: - name: lx-music-desktop-win_arm64-green - path: build/*win_arm64 green.7z - - - name: Build Package Setup x86_64 - run: npm run pack:win:setup:x86_64 - - name: Upload Artifact Setup x86_64 - uses: actions/upload-artifact@v3 - with: - name: lx-music-desktop-x86_64-Setup - path: build/*x86_64 Setup.exe + path: build/*x86 Setup.exe - name: Generate file MD5 run: | @@ -205,22 +176,6 @@ jobs: name: lx-music-desktop-deb-arm64 path: build/* arm64.deb - - name: Build Package deb armv7l - run: npm run pack:linux:deb:armv7l - - name: Upload Artifact deb armv7l - uses: actions/upload-artifact@v3 - with: - name: lx-music-desktop-deb-armv7l - path: build/* armv7l.deb - - - name: Build Package x64 appImage - run: npm run pack:linux:appImage - - name: Upload Artifact x64 appImage - uses: actions/upload-artifact@v3 - with: - name: lx-music-desktop-x64-appImage - path: build/* x64.AppImage - - name: Build Package x64 rpm run: npm run pack:linux:rpm - name: Upload Artifact x64 rpm @@ -229,15 +184,7 @@ jobs: name: lx-music-desktop-x64-rpm path: build/* x64.rpm - - name: Build Package x64 pacman - run: npm run pack:linux:pacman - - name: Upload Artifact x64 pacman - uses: actions/upload-artifact@v3 - with: - name: lx-music-desktop-x64-pacman - path: build/* x64.pacman - - name: Generate file MD5 run: | cd build - md5sum *.deb *.rpm *.pacman *.AppImage + md5sum *.deb *.rpm From 072c269687cf458d7f2e7d4c5094545c6287bc09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E7=8B=B8=E8=8A=B1=E5=96=B5?= <94218819+helloplhm-qwq@users.noreply.github.com> Date: Sun, 16 Apr 2023 03:47:48 +0000 Subject: [PATCH 3/5] update --- src/renderer/utils/musicSdk/kg/songList.js | 36 ++++++++++------------ 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/src/renderer/utils/musicSdk/kg/songList.js b/src/renderer/utils/musicSdk/kg/songList.js index 1f5f3b04..e971ac5d 100644 --- a/src/renderer/utils/musicSdk/kg/songList.js +++ b/src/renderer/utils/musicSdk/kg/songList.js @@ -53,15 +53,14 @@ export default { listDetailLink: /^.+\/(\d+)\.html(?:\?.*|&.*$|#.*$|$)/, }, async getGlobalSpecialId(specialId) { - return httpFetch(`https://m.kugou.com/plist/list/${specialId}/?json=true`, { + return httpFetch(`http://mobilecdnbj.kugou.com/api/v5/special/info?specialid=${specialId}`, { headers: { 'User-Agent': 'Mozilla/5.0 (Linux; Android 10; HLK-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.102 Mobile Safari/537.36 EdgA/104.0.1293.70', }, - follow_max: 2, }).promise.then(({ body }) => { // console.log(body) - if (!body.info.list.global_specialid) Promise.reject(new Error('Failed to get global collection id.')) - return body.info.list.global_specialid + if (!body.data.list.global_specialid) Promise.reject(new Error('Failed to get global collection id.')) + return body.data.list.global_specialid }) }, // async getListInfoBySpecialId(special_id, retry = 0) { @@ -88,16 +87,16 @@ export default { // } // }) // }, - // async getSongListDetailByGlobalSpecialId(id, page, limit = 100, retry = 0) { - // if (++retry > 2) throw new Error('failed') - // console.log(id) - // const params = `specialid=0&need_sort=1&module=CloudMusic&clientver=11409&pagesize=${limit}&global_collection_id=${id}&userid=0&page=${page}&type=1&area_code=1&appid=1005` - // return httpFetch(`http://pubsongscdn.tx.kugou.com/v2/get_other_list_file?${params}&signature=${signatureParams(params)}`).promise.then(({ body }) => { - // // console.log(body) - // if (body.data?.info == null) return this.getSongListDetailByGlobalSpecialId(id, page, limit, retry) - // return body.data.info - // }) - // }, + async getSongListDetailByGlobalSpecialId(id, page, limit = 100, retry = 0) { + if (++retry > 2) throw new Error('failed') + console.log(id) + const params = `specialid=0&need_sort=1&module=CloudMusic&clientver=11409&pagesize=${limit}&global_collection_id=${id}&userid=0&page=${page}&type=1&area_code=1&appid=1005` + return httpFetch(`http://pubsongscdn.tx.kugou.com/v2/get_other_list_file?${params}&signature=${signatureParams(params)}`).promise.then(({ body }) => { + // console.log(body) + if (body.data?.info == null) return this.getSongListDetailByGlobalSpecialId(id, page, limit, retry) + return body.data.info + }) + }, async getListDetailBySpecialId(id) { const globalSpecialId = await this.getGlobalSpecialId(id) // const limit = 100 @@ -408,14 +407,13 @@ export default { const limit = total > 300 ? 300 : total total -= limit page += 1 - const params = 'appid=1058&global_specialid=' + id + '&specialid=0&plat=0&version=8000&page=' + page + '&pagesize=' + limit + '&srcappid=2919&clientver=20000&clienttime=1586163263991&mid=1586163263991&uuid=1586163263991&dfid=-' - tasks.push(this.createHttp(`https://mobiles.kugou.com/api/v5/special/song_v2?${params}&signature=${signatureParams(params, 5)}`, { + const params = `specialid=0&need_sort=1&module=CloudMusic&clientver=11409&pagesize=${limit}&global_collection_id=${id}&userid=0&page=${page}&type=1&area_code=1&appid=1005` + tasks.push(this.createHttp(`http://pubsongscdn.tx.kugou.com/v2/get_other_list_file?${params}&signature=${signatureParams(params)}`, { headers: { mid: '1586163263991', Referer: 'https://m3ws.kugou.com/share/index.php', 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1', dfid: '-', - clienttime: '1586163263991', }, }).then(data => data.info)) } @@ -446,9 +444,9 @@ export default { info: { name: info.specialname, img: info.imgurl && info.imgurl.replace('{size}', 240), - // desc: body.result.info.list_desc, + desc: info.intro, author: info.nickname, - // play_count: this.formatPlayCount(info.count), + play_count: this.formatPlayCount(info.playcount), }, } }, From 158f2545badb2e628676b3a1edf44117e81a788d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E7=8B=B8=E8=8A=B1=E5=96=B5?= <94218819+helloplhm-qwq@users.noreply.github.com> Date: Sun, 16 Apr 2023 04:21:23 +0000 Subject: [PATCH 4/5] updmo --- src/renderer/utils/musicSdk/kg/songList.js | 33 +++++++++++----------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/renderer/utils/musicSdk/kg/songList.js b/src/renderer/utils/musicSdk/kg/songList.js index e971ac5d..d85315b0 100644 --- a/src/renderer/utils/musicSdk/kg/songList.js +++ b/src/renderer/utils/musicSdk/kg/songList.js @@ -59,8 +59,8 @@ export default { }, }).promise.then(({ body }) => { // console.log(body) - if (!body.data.list.global_specialid) Promise.reject(new Error('Failed to get global collection id.')) - return body.data.list.global_specialid + if (!body.data.global_specialid) Promise.reject(new Error('Failed to get global collection id.')) + return body.data.global_specialid }) }, // async getListInfoBySpecialId(special_id, retry = 0) { @@ -87,16 +87,16 @@ export default { // } // }) // }, - async getSongListDetailByGlobalSpecialId(id, page, limit = 100, retry = 0) { - if (++retry > 2) throw new Error('failed') - console.log(id) - const params = `specialid=0&need_sort=1&module=CloudMusic&clientver=11409&pagesize=${limit}&global_collection_id=${id}&userid=0&page=${page}&type=1&area_code=1&appid=1005` - return httpFetch(`http://pubsongscdn.tx.kugou.com/v2/get_other_list_file?${params}&signature=${signatureParams(params)}`).promise.then(({ body }) => { - // console.log(body) - if (body.data?.info == null) return this.getSongListDetailByGlobalSpecialId(id, page, limit, retry) - return body.data.info - }) - }, + // async getSongListDetailByGlobalSpecialId(id, page, limit = 100, retry = 0) { + // if (++retry > 2) throw new Error('failed') + // console.log(id) + // const params = `specialid=0&need_sort=1&module=CloudMusic&clientver=11409&pagesize=${limit}&global_collection_id=${id}&userid=0&page=${page}&type=1&area_code=1&appid=1005` + // return httpFetch(`http://pubsongscdn.tx.kugou.com/v2/get_other_list_file?${params}&signature=${signatureParams(params)}`).promise.then(({ body }) => { + // // console.log(body) + // if (body.data?.info == null) return this.getSongListDetailByGlobalSpecialId(id, page, limit, retry) + // return body.data.info + // }) + // }, async getListDetailBySpecialId(id) { const globalSpecialId = await this.getGlobalSpecialId(id) // const limit = 100 @@ -407,13 +407,14 @@ export default { const limit = total > 300 ? 300 : total total -= limit page += 1 - const params = `specialid=0&need_sort=1&module=CloudMusic&clientver=11409&pagesize=${limit}&global_collection_id=${id}&userid=0&page=${page}&type=1&area_code=1&appid=1005` - tasks.push(this.createHttp(`http://pubsongscdn.tx.kugou.com/v2/get_other_list_file?${params}&signature=${signatureParams(params)}`, { + const params = 'appid=1058&global_specialid=' + id + '&specialid=0&plat=0&version=8000&page=' + page + '&pagesize=' + limit + '&srcappid=2919&clientver=20000&clienttime=1586163263991&mid=1586163263991&uuid=1586163263991&dfid=-' + tasks.push(this.createHttp(`https://mobiles.kugou.com/api/v5/special/song_v2?${params}&signature=${signatureParams(params, 5)}`, { headers: { mid: '1586163263991', Referer: 'https://m3ws.kugou.com/share/index.php', 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1', dfid: '-', + clienttime: '1586163263991', }, }).then(data => data.info)) } @@ -873,7 +874,7 @@ export default { }) }, } -// 用于新建branch的注释 + // getList // getTags -// getListDetail +// getListDetail \ No newline at end of file From dfba2b43987eb2e27cfb5f63fccc04bd882039a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E7=8B=B8=E8=8A=B1=E5=96=B5?= <94218819+helloplhm-qwq@users.noreply.github.com> Date: Sun, 16 Apr 2023 04:24:05 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=82=A3=E9=A3=9E?= =?UTF-8?q?=E4=BA=86=E7=9A=84=E7=A9=BA=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/utils/musicSdk/kg/songList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/utils/musicSdk/kg/songList.js b/src/renderer/utils/musicSdk/kg/songList.js index d85315b0..0dbc893f 100644 --- a/src/renderer/utils/musicSdk/kg/songList.js +++ b/src/renderer/utils/musicSdk/kg/songList.js @@ -877,4 +877,4 @@ export default { // getList // getTags -// getListDetail \ No newline at end of file +// getListDetail