From cd1a55652f7bbb32ff2da7ec2c879e455b3292f0 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sun, 18 Apr 2021 15:06:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8D=A2=E6=BA=90=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/store/modules/player.js | 32 ++++++++++++++++++----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/renderer/store/modules/player.js b/src/renderer/store/modules/player.js
index d926b204..b4d1798a 100644
--- a/src/renderer/store/modules/player.js
+++ b/src/renderer/store/modules/player.js
@@ -24,9 +24,6 @@ const state = {
   tempPlayList: [],
 }
 
-let urlRequest
-// let picRequest
-// let lrcRequest
 
 const filterList = async({ playedList, listInfo, savePath, commit }) => {
   // if (this.list.listName === null) return
@@ -71,7 +68,13 @@ const filterList = async({ playedList, listInfo, savePath, commit }) => {
 
 const getPic = function(musicInfo, retryedSource = [], originMusic) {
   // console.log(musicInfo.source)
-  return music[musicInfo.source].getPic(musicInfo).promise.catch(err => {
+  let reqPromise
+  try {
+    reqPromise = music[musicInfo.source].getPic(musicInfo).promise
+  } catch (err) {
+    reqPromise = Promise.reject(err)
+  }
+  return reqPromise.promise.catch(err => {
     if (!retryedSource.includes(musicInfo.source)) retryedSource.push(musicInfo.source)
     return this.dispatch('list/getOtherSource', musicInfo).then(otherSource => {
       if (!originMusic) originMusic = musicInfo
@@ -88,7 +91,13 @@ const getPic = function(musicInfo, retryedSource = [], originMusic) {
   })
 }
 const getLyric = function(musicInfo, retryedSource = [], originMusic) {
-  return music[musicInfo.source].getLyric(musicInfo).promise.catch(err => {
+  let reqPromise
+  try {
+    reqPromise = music[musicInfo.source].getLyric(musicInfo).promise
+  } catch (err) {
+    reqPromise = Promise.reject(err)
+  }
+  return reqPromise.promise.catch(err => {
     if (!retryedSource.includes(musicInfo.source)) retryedSource.push(musicInfo.source)
     return this.dispatch('list/getOtherSource', musicInfo).then(otherSource => {
       if (!originMusic) originMusic = musicInfo
@@ -161,19 +170,20 @@ const actions = {
 
       // return Promise.reject(new Error('该歌曲没有可播放的音频'))
     }
-    if (urlRequest && urlRequest.cancelHttp) urlRequest.cancelHttp()
     const cachedUrl = await getMusicUrl(musicInfo, type)
     if (cachedUrl && !isRefresh) return cachedUrl
 
-    urlRequest = music[musicInfo.source].getMusicUrl(musicInfo, type)
-
-    return urlRequest.promise.then(({ url }) => {
+    let reqPromise
+    try {
+      reqPromise = music[musicInfo.source].getMusicUrl(musicInfo, type).promise
+    } catch (err) {
+      reqPromise = Promise.reject(err)
+    }
+    return reqPromise.then(({ url }) => {
       if (originMusic) commit('setUrl', { musicInfo: originMusic, url, type })
       commit('setUrl', { musicInfo, url, type })
-      urlRequest = null
       return url
     }).catch(err => {
-      urlRequest = null
       return Promise.reject(err)
     })
   },