更换下载库

Author: lyswhut

package-lock.json

@@ -147,7 +147,7 @@
     "chalk": "^3.0.0",
     "changelog-parser": "^2.8.0",
     "copy-webpack-plugin": "^5.0.5",
-    "core-js": "^3.4.0",
+    "core-js": "^3.4.1",
     "cos-nodejs-sdk-v5": "^2.5.14",
     "cross-env": "^6.0.3",
     "css-loader": "^3.2.0",
@@ -203,13 +203,12 @@
     "flac-metadata": "^0.1.1",
     "js-htmlencode": "^0.3.0",
     "lrc-file-parser": "^0.1.14",
-    "node-downloader-helper": "^1.0.10",
     "node-id3": "^0.1.12",
     "request": "^2.88.0",
     "vue": "^2.6.10",
     "vue-electron": "^1.0.6",
     "vue-router": "^3.1.3",
-    "vuex": "^3.1.1",
+    "vuex": "^3.1.2",
     "vuex-electron": "^1.0.3",
     "vuex-router-sync": "^5.0.0"
   }

package.json

@@ -1,9 +1,16 @@
+由于新下载库仍然没有完成，但下载功能已经可用，so 移除之前使用的第三方下载库，暂时把新下载库的下载模块直接加入本程序，若出现下载问题欢迎反馈！
+
 ### 新增
 
-- 新增歌曲缓冲定时器，尝试用于解决网络正常但是歌曲缓冲过久的问题
-- 新增下载管理的任务状态分类
-- 添加**杀毒软件提示有病毒或恶意行为**的说明，可到**常见问题**拉到最后查看（常见问题可在开源地址找到）
+- 新增下载功能对代理设置的支持，现在若在软件设置了代理服务器，下载功能也将会走代理网络了
 
 ### 优化
 
-- 优化更新弹窗机制及其内容描述，对于可以自动更新的版本，现在可以看到软件的下载进度了
+- 新下载模块将对恢复下载的任务进行字节校验，用于解决下载进度超过100%后仍然下载的问题
+- 注意：目前仍然无法暂停处于**链接获取**状态中的任务
+
+### 修复
+
+- 修复下载列表歌曲状态分类列表操作Bug
+- 修复歌曲封面下载失败时仍然执行嵌入封面操作导致报错的问题
+- 跳过重复添加**相同歌曲名与扩展名的歌曲**，例如你之前下载了A歌曲的128k音质，现在想要下载它的320k音质，但由于两者都是MP3格式，会因为重名导致之前的128k音质被覆盖但列表中仍然显示两种音质的问题（但实际上都是指向后面的320k音质）

publish/changeLog.md

@@ -53,7 +53,7 @@ const getExt = type => {
   }
 }
 
-const checkList = (list, musicInfo, type) => list.some(s => s.musicInfo.songmid === musicInfo.songmid && s.type === type)
+const checkList = (list, musicInfo, type, ext) => list.some(s => s.musicInfo.songmid === musicInfo.songmid && (s.type === type || s.ext === ext))
 
 const getStartTask = (list, downloadStatus, maxDownloadNum) => {
   let downloadCount = 0
@@ -121,11 +121,24 @@ const downloadLyric = (downloadInfo, filePath) => {
   })
 }
 
+const refreshUrl = function(commit, downloadInfo) {
+  commit('setStatusText', { downloadInfo, text: '链接失效，正在刷新链接' })
+  getUrl(downloadInfo, true).then(result => {
+    commit('updateUrl', { downloadInfo, url: result.url })
+    commit('setStatusText', { downloadInfo, text: '链接刷新成功' })
+    dls[downloadInfo.key].refreshUrl(result.url)
+    dls[downloadInfo.key].start()
+  }).catch(err => {
+    console.log(err)
+    this.dispatch('download/startTask')
+  })
+}
+
 // actions
 const actions = {
   createDownload({ state, rootState, commit }, { musicInfo, type }) {
-    if (checkList(state.list, musicInfo, type)) return
     let ext = getExt(type)
+    if (checkList(state.list, musicInfo, type, ext)) return
     const downloadInfo = {
       isComplate: false,
       status: state.downloadStatus.WAITING,
@@ -146,6 +159,11 @@ const actions = {
     }
     downloadInfo.filePath = path.join(rootState.setting.download.savePath, downloadInfo.fileName)
     commit('addTask', downloadInfo)
+    try { // 删除同路径下的同名文件
+      fs.unlinkSync(downloadInfo.filePath)
+    } catch (err) {
+      if (err.code !== 'ENOENT') return commit('setStatusText', { downloadInfo, text: '文件删除失败' })
+    }
     if (dls[downloadInfo.key]) {
       dls[downloadInfo.key].stop().finally(() => {
         delete dls[downloadInfo.key]
@@ -167,7 +185,7 @@ const actions = {
     if (!downloadInfo) downloadInfo = result
 
     // 开始任务
-    commit('onDownload', downloadInfo)
+    commit('onStart', downloadInfo)
     commit('setStatusText', { downloadInfo, text: '任务初始化中' })
     let msg = checkPath(rootState.setting.download.savePath)
     if (msg) return commit('setStatusText', '检查下载目录出错: ' + msg)
@@ -178,12 +196,12 @@ const actions = {
       fileName: downloadInfo.fileName,
       method: 'get',
       override: true,
-      onEnd() {
-        if (downloadInfo.progress.progress != '100.00') {
-          delete dls[downloadInfo.key]
-          return this.dispatch('download/startTask', downloadInfo)
-        }
-        commit('onEnd', downloadInfo)
+      onCompleted() {
+        // if (downloadInfo.progress.progress != '100.00') {
+        //   delete dls[downloadInfo.key]
+        //   return this.dispatch('download/startTask', downloadInfo)
+        // }
+        commit('onCompleted', downloadInfo)
         _this.dispatch('download/startTask')
         const filePath = path.join(options.path, options.fileName)
 
@@ -199,54 +217,40 @@ const actions = {
           _this.dispatch('download/startTask')
           return
         }
-        let code
-        if (err.message.includes('Response status was')) {
-          code = err.message.replace(/Response status was (\d+)$/, '$1')
-        } else if (err.code === 'ETIMEDOUT' || err.code == 'ENOTFOUND') {
-          code = err.code
+        if (err.code == 'ENOTFOUND') {
+          refreshUrl.call(_this, commit, downloadInfo)
         } else {
           console.log('Download failed, Attempting Retry')
-          dls[downloadInfo.key].resume()
+          dls[downloadInfo.key].start()
           commit('setStatusText', { downloadInfo, text: '正在重试' })
+        }
+      },
+      onFail(response) {
+        commit('onError', downloadInfo)
+
+        if (++tryNum[downloadInfo.key] > 2) {
+          _this.dispatch('download/startTask')
           return
         }
-        switch (code) {
-          case '401':
-          case '403':
-          case '410':
-          case 'ETIMEDOUT':
-          case 'ENOTFOUND':
-            commit('setStatusText', { downloadInfo, text: '链接失效，正在刷新链接' })
-            getUrl(downloadInfo, true).then(result => {
-              commit('updateUrl', { downloadInfo, url: result.url })
-              commit('setStatusText', { downloadInfo, text: '链接刷新成功' })
-              dls[downloadInfo.key].url = dls[downloadInfo.key].requestURL = result.url
-              dls[downloadInfo.key].__initProtocol(result.url)
-              dls[downloadInfo.key].resume()
-            }).catch(err => {
-              console.log(err)
-              _this.dispatch('download/startTask')
-            })
+        switch (response.statusCode) {
+          case 401:
+          case 403:
+          case 410:
+            refreshUrl.call(_this, commit, downloadInfo)
         }
       },
-      // onStateChanged(state) {
-      //   console.log(state)
-      // },
-      onDownload() {
-        commit('onDownload', downloadInfo)
-        console.log('on download')
+      onStart() {
+        commit('onStart', downloadInfo)
+        console.log('on start')
       },
       onProgress(status) {
         commit('onProgress', { downloadInfo, status })
         console.log(status)
       },
-      onPause() {
+      onStop() {
         commit('pauseTask', downloadInfo)
         _this.dispatch('download/startTask')
       },
-      onResume() {
-        commit('resumeTask', downloadInfo)
-      },
     }
     commit('setStatusText', { downloadInfo, text: '获取URL中...' })
     let p = options.url ? Promise.resolve() : getUrl(downloadInfo).then(result => {
@@ -315,9 +319,6 @@ const mutations = {
     downloadInfo.status = state.downloadStatus.PAUSE
     downloadInfo.statusText = '暂停下载'
   },
-  resumeTask(state, downloadInfo) {
-    downloadInfo.statusText = '开始下载'
-  },
   setStatusText(state, { downloadInfo, index, text }) { // 设置状态文本
     if (downloadInfo) {
       downloadInfo.statusText = text
@@ -352,7 +353,7 @@ const mutations = {
       state.list[index].status = status
     }
   },
-  onEnd(state, downloadInfo) {
+  onCompleted(state, downloadInfo) {
     downloadInfo.isComplate = true
     downloadInfo.status = state.downloadStatus.COMPLETED
     downloadInfo.statusText = '下载完成'
@@ -361,7 +362,7 @@ const mutations = {
     downloadInfo.status = state.downloadStatus.ERROR
     downloadInfo.statusText = '任务出错'
   },
-  onDownload(state, downloadInfo) {
+  onStart(state, downloadInfo) {
     downloadInfo.status = state.downloadStatus.RUN
     downloadInfo.statusText = '正在下载'
   },