新增：直接播放QQ音乐排行榜音乐

Author: lyswhut

CHANGELOG.md

@@ -6,6 +6,22 @@ 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/).
 
+## [0.1.1](https://github.com/lyswhut/lx-music-desktop/compare/v0.1.0...v0.1.1) - 2019-08-17
+
+### 新增
+
+- QQ音乐排行榜直接试听与下载（该接口貌似不太稳定，且用且珍惜！）
+
+### 优化
+
+- 优化http请求机制
+- 更新关于本软件说明
+
+### 修复
+
+- 修复当上一个歌曲链接正在获取时切换歌曲请求不会取消的问题
+- 修复切换歌曲时仍然播放上一首歌曲的问题
+
 ## [0.1.0] - 2019-8-16
 
 * 0.1.0版本发布

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "lx-music-desktop",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "一个免费的音乐下载助手",
   "main": "./dist/electron/main.js",
   "scripts": {
@@ -75,6 +75,7 @@
     "babel-preset-minify": "^0.5.0",
     "cfonts": "^2.4.4",
     "chalk": "^2.4.2",
+    "changelog-parser": "^2.8.0",
     "copy-webpack-plugin": "^5.0.4",
     "core-js": "^3.2.1",
     "cos-nodejs-sdk-v5": "^2.5.11",

package.json

@@ -1 +1,13 @@
-* 0.1.0版本发布
+### 新增
+
+- QQ音乐排行榜直接试听与下载（该接口貌似不太稳定，且用且珍惜！）
+
+### 优化
+
+- 优化http请求机制
+- 更新关于本软件说明
+
+### 修复
+
+- 修复当上一个歌曲链接正在获取时切换歌曲请求不会取消的问题
+- 修复切换歌曲时仍然播放上一首歌曲的问题

publish/changeLog.md

@@ -2,11 +2,11 @@ const fs = require('fs')
 const path = require('path')
 const chalk = require('chalk')
 const clearAssets = require('./utils/clearAssets')
-const packAssets = require('./utils/packAssets')
-const compileAssets = require('./utils/compileAssets')
+// const packAssets = require('./utils/packAssets')
+// const compileAssets = require('./utils/compileAssets')
 const updateVersionFile = require('./utils/updateChangeLog')
-const copyFile = require('./utils/copyFile')
-const githubRelease = require('./utils/githubRelease')
+// const copyFile = require('./utils/copyFile')
+// const githubRelease = require('./utils/githubRelease')
 const { parseArgv } = require('./utils')
 
 const run = async() => {

publish/index.js

@@ -1,5 +1,10 @@
 {
-  "version": "0.1.0",
-  "desc": "0.1.0版本发布",
-  "history": []
+  "version": "0.1.1",
+  "desc": "<h3>新增</h3>\n<ul>\n<li>QQ音乐排行榜直接试听与下载（该接口貌似不太稳定，且用且珍惜！）</li>\n</ul>\n<h3>优化</h3>\n<ul>\n<li>优化http请求机制</li>\n<li>更新关于本软件说明</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复当上一个歌曲链接正在获取时切换歌曲请求不会取消的问题</li>\n<li>修复切换歌曲时仍然播放上一首歌曲的问题</li>\n</ul>\n",
+  "history": [
+    {
+      "version": "0.1.0",
+      "desc": "0.1.0版本发布"
+    }
+  ]
 }

publish/version.json

@@ -98,6 +98,8 @@ export default {
   watch: {
     changePlay(n) {
       if (!n) return
+      // console.log('changePlay')
+      this.handleRemoveMusic()
       this.resetChangePlay()
       if (this.playIndex < 0) return
       this.stopPlay()
@@ -112,7 +114,7 @@ export default {
           ? n.findIndex(s => s.musicInfo.songmid === this.musicInfo.songmid)
           : n.findIndex(s => s.songmid === this.musicInfo.songmid)
         if (index < 0) {
-          this.handleRemoveMusic()
+          this.fixPlayIndex(this.playIndex - 1)
           if (n.length) this.handleNext()
         } else {
           this.fixPlayIndex(index)
@@ -362,7 +364,6 @@ export default {
       this.musicInfo.url = null
       this.nowPlayTime = 0
       this.maxPlayTime = 0
-      this.fixPlayIndex(this.playIndex - 1)
     },
     sendProgressEvent(status, mode) {
       // console.log(status)

src/renderer/components/core/Player.vue

@@ -41,7 +41,7 @@ const getExt = type => {
 const checkList = (list, musicInfo, type) => list.some(s => s.musicInfo.songmid === musicInfo.songmid && s.type === type)
 
 const refreshUrl = downloadInfo => {
-  return music[downloadInfo.musicInfo.source].getMusicUrl(downloadInfo.musicInfo, downloadInfo.type)
+  return music[downloadInfo.musicInfo.source].getMusicUrl(downloadInfo.musicInfo, downloadInfo.type).promise
 }
 
 // actions

src/renderer/store/modules/download.js

@@ -19,7 +19,14 @@ const getters = {
 // actions
 const actions = {
   getUrl({ commit, state }, { musicInfo, type }) {
-    return music[musicInfo.source].getMusicUrl(musicInfo, type).then(result => commit('setUrl', { musicInfo, url: result.url, type }))
+    if (state.cancelFn) state.cancelFn()
+    const { promise, cancelHttp } = music[musicInfo.source].getMusicUrl(musicInfo, type)
+    state.cancelFn = cancelHttp
+    return promise.then(result => {
+      return commit('setUrl', { musicInfo, url: result.url, type })
+    }).finally(() => {
+      state.cancelFn = null
+    })
   },
   getPic({ commit, state }, musicInfo) {
     return music[musicInfo.source].getPic(musicInfo).then(url => commit('getPic', { musicInfo, url }))

src/renderer/store/modules/player.js

@@ -68,17 +68,17 @@ export default {
     limit: /pagesize: '(\d+)',/,
     listData: /global\.features = (\[.+\]);/,
   },
-  _cancelIndex: null,
+  _requestObj: null,
   _cancelPromiseCancelFn: null,
   getData(url) {
-    if (this._cancelIndex != null) {
-      cancelHttp(this._cancelIndex)
+    if (this._requestObj != null) {
+      cancelHttp(this._requestObj)
       this._cancelPromiseCancelFn(new Error('取消http请求'))
     }
     return new Promise((resolve, reject) => {
       this._cancelPromiseCancelFn = reject
-      this._cancelIndex = httpGet(url, (err, resp, body) => {
-        this._cancelIndex = null
+      this._requestObj = httpGet(url, (err, resp, body) => {
+        this._requestObj = null
         this._cancelPromiseCancelFn = null
         if (err) {
           console.log(err)