Merge branch 'dev'

CHANGELOG.md

@@ -6,6 +6,13 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [1.10.1](https://github.com/lyswhut/lx-music-desktop/compare/v1.10.0...v1.10.1) - 2021-05-25
+
+### 修复
+
+- 修复企鹅音乐搜索歌曲没有结果的问题
+- 修复播放在空的歌单列表点击播放全部时报错的问题
+
 ## [1.10.0](https://github.com/lyswhut/lx-music-desktop/compare/v1.9.0...v1.10.0) - 2021-05-19
 
 lx music移动端已经发布了，使用习惯仍跟桌面版一样，不过功能、界面仍比较简单，有兴趣的可以去体检一下，项目地址：

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lx-music-desktop",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "一个免费的音乐查找助手",
   "main": "./dist/electron/main.js",
   "productName": "lx-music-desktop",
@@ -65,13 +65,13 @@
     "lint": "eslint --ext .js,.vue -f ./node_modules/eslint-formatter-friendly src",
     "lint:fix": "eslint --ext .js,.vue -f ./node_modules/eslint-formatter-friendly --fix src",
     "dp": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://localhost:1081 npm run pack",
-    "up": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://localhost:1081 npm update"
+    "up": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://localhost:1081 npm i"
   },
   "browserslist": [
-    "Electron 12.0.8"
+    "Electron 12.0.9"
   ],
   "engines": {
-    "node": ">= 12"
+    "node": ">= 14"
   },
   "build": {
     "appId": "cn.toside.music.desktop",
@@ -176,22 +176,22 @@
     "cfonts": "^2.9.2",
     "chalk": "^4.1.1",
     "changelog-parser": "^2.8.0",
-    "copy-webpack-plugin": "^8.1.1",
+    "copy-webpack-plugin": "^9.0.0",
     "core-js": "^3.12.1",
     "cross-env": "^7.0.3",
-    "css-loader": "^5.2.4",
+    "css-loader": "^5.2.6",
     "css-minimizer-webpack-plugin": "^3.0.0",
     "del": "^6.0.0",
-    "electron": "^12.0.8",
+    "electron": "^12.0.9",
     "electron-builder": "^22.11.4",
     "electron-debug": "^3.2.0",
     "electron-devtools-installer": "^3.2.0",
-    "eslint": "^7.26.0",
+    "eslint": "^7.27.0",
     "eslint-config-standard": "^14.1.1",
     "eslint-formatter-friendly": "^7.0.0",
     "eslint-loader": "^4.0.2",
     "eslint-plugin-html": "^6.1.2",
-    "eslint-plugin-import": "^2.23.2",
+    "eslint-plugin-import": "^2.23.3",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-standard": "^4.1.0",
@@ -203,7 +203,7 @@
     "less-plugin-clean-css": "^1.5.1",
     "markdown-it": "^12.0.6",
     "mini-css-extract-plugin": "^1.6.0",
-    "postcss": "^8.2.15",
+    "postcss": "^8.3.0",
     "postcss-loader": "^5.3.0",
     "postcss-pxtorem": "^6.0.0",
     "pug": "^3.0.2",
@@ -218,7 +218,7 @@
     "url-loader": "^4.1.1",
     "vue-loader": "^15.9.7",
     "vue-template-compiler": "^2.6.12",
-    "webpack": "^5.37.0",
+    "webpack": "^5.37.1",
     "webpack-cli": "^4.7.0",
     "webpack-dev-server": "^3.11.2",
     "webpack-hot-middleware": "^2.25.0",
@@ -230,7 +230,7 @@
     "electron-log": "^4.3.5",
     "electron-store": "^8.0.0",
     "electron-updater": "^4.3.9",
-    "iconv-lite": "^0.6.2",
+    "iconv-lite": "^0.6.3",
     "image-size": "^1.0.0",
     "js-htmlencode": "^0.3.0",
     "lrc-file-parser": "^1.0.7",

publish/changeLog.md

@@ -1,21 +1,4 @@
-lx music移动端已经发布了，使用习惯仍跟桌面版一样，不过功能、界面仍比较简单，有兴趣的可以去体检一下，项目地址：
-https://github.com/lyswhut/lx-music-mobile#readme
-
-### 新增
-
-- 排行榜界面添加播放、收藏整个排行榜功能，可以右击排行榜名字后，在弹出的右键菜单中使用。注：收藏、播放存在分页的排行榜时需等待操作完成后才能切换排行榜，不然会导致操作中断。
-- 新增Mac arm64位dmg包的构建
-
 ### 修复
 
-- 修复全局快捷键对桌面歌词无效的问题
-- 修复快捷键设置框内的提示问题
-- 修复在当前正常播放的列表中使用稍后播放功能时，播放完后稍后播放的歌曲后不会恢复原来播放位置播放的问题
-- 修复kw部分歌单无法打开的问题
-- 修复wy源的歌曲音质匹配问题
-- 修复mg源歌单标签、排行榜歌曲列表无法加载的问题
-- 修复了一个歌曲下载失败时不会跳过任务的问题
-
-### 其他
-
-- 更新 Electron 到 12.0.8
+- 修复企鹅音乐搜索歌曲没有结果的问题
+- 修复播放在空的歌单列表点击播放全部时报错的问题

src/renderer/App.vue

@@ -372,7 +372,7 @@ export default {
           if (!list || !list.list[info.index]) return
           info.list = list.list
         }
-
+        if (!info.list || !info.list[info.index]) return
         window.restorePlayInfo = info
         this.setPlayList({
           list: {

src/renderer/store/modules/player.js

@@ -381,6 +381,7 @@ const mutations = {
     })
   },
   setList(state, { list, index }) {
+    if (!(list && list.list && list.list[index])) return
     state.playMusicInfo = {
       musicInfo: list.list[index],
       listId: list.id,

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

@@ -15,7 +15,8 @@ export default {
   musicSearch(str, page, limit, retryNum = 0) {
     if (searchRequest && searchRequest.cancelHttp) searchRequest.cancelHttp()
     if (retryNum > 5) return Promise.reject(new Error('搜索失败'))
-    searchRequest = httpFetch(`https://c.y.qq.com/soso/fcgi-bin/client_search_cp?ct=24&qqmusic_ver=1298&new_json=1&remoteplace=sizer.yqq.song_next&searchid=49252838123499591&t=0&aggr=1&cr=1&catZhida=1&lossless=0&flag_qc=0&p=${page}&n=${limit}&w=${encodeURIComponent(str)}&loginUin=0&hostUin=0&format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq&needNewCode=0`)
+    // searchRequest = httpFetch(`https://c.y.qq.com/soso/fcgi-bin/client_search_cp?ct=24&qqmusic_ver=1298&new_json=1&remoteplace=sizer.yqq.song_next&searchid=49252838123499591&t=0&aggr=1&cr=1&catZhida=1&lossless=0&flag_qc=0&p=${page}&n=${limit}&w=${encodeURIComponent(str)}&loginUin=0&hostUin=0&format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq&needNewCode=0`)
+    searchRequest = httpFetch(`https://c.y.qq.com/soso/fcgi-bin/client_search_cp?ct=24&qqmusic_ver=1298&new_json=1&remoteplace=txt.yqq.top&searchid=1&aggr=1&cr=1&catZhida=1&lossless=0&flag_qc=0&p=${page}&n=${limit}&w=${encodeURIComponent(str)}&cv=4747474&ct=24&format=json&inCharset=utf-8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0&uin=0&hostUin=0&loginUin=0`)
     // searchRequest = httpFetch(`http://ioscdn.kugou.com/api/v3/search/song?keyword=${encodeURIComponent(str)}&page=${page}&pagesize=${this.limit}&showtype=10&plat=2&version=7910&tag=1&correct=1&privilege=1&sver=5`)
     return searchRequest.promise.then(({ body }) => {
       if (body.code !== this.successCode) return this.musicSearch(str, page, limit, ++retryNum)

src/renderer/views/SongList.vue

@@ -433,6 +433,7 @@ export default {
     async playSongListDetail() {
       if (!this.listDetail.info.name) return
       const list = await this.fetchList()
+      if (!list.length) return
       this.setPlayList({
         list: {
           list,