From fbe1ff73f153799ad89ea7ad626091da5bd213a0 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Wed, 3 Nov 2021 16:26:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E8=BD=BD=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=97=A0=E6=B3=95=E5=88=87=E4=B8=8B=E4=B8=80=E9=A6=96?=
 =?UTF-8?q?=E6=AD=8C=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/store/modules/player.js | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/renderer/store/modules/player.js b/src/renderer/store/modules/player.js
index e7ea4fad..d1116871 100644
--- a/src/renderer/store/modules/player.js
+++ b/src/renderer/store/modules/player.js
@@ -39,7 +39,7 @@ const filterList = async({ playedList, listInfo, savePath, commit }) => {
       canPlayList.push(item)
 
       // 排除已播放音乐
-      let index = filteredPlayedList.findIndex(m => (m.songmid || m.musicInfo.songmid) == item.musicInfo.songmid)
+      let index = filteredPlayedList.findIndex(m => m.songmid == item.songmid)
       if (index > -1) {
         filteredPlayedList.splice(index, 1)
         continue
@@ -51,7 +51,7 @@ const filterList = async({ playedList, listInfo, savePath, commit }) => {
       // if (!assertApiSupport(s.source)) return false
       canPlayList.push(s)
 
-      let index = filteredPlayedList.findIndex(m => (m.songmid || m.musicInfo.songmid) == s.songmid)
+      let index = filteredPlayedList.findIndex(m => m.songmid == s.songmid)
       if (index > -1) {
         filteredPlayedList.splice(index, 1)
         return false
@@ -164,7 +164,7 @@ const getters = {
           playIndex = window.downloadList.findIndex(m => m.key == currentKey)
         }
       } else {
-        const currentSongmid = state.playMusicInfo.musicInfo.songmid || state.playMusicInfo.musicInfo.musicInfo.songmid
+        const currentSongmid = state.playMusicInfo.musicInfo.songmid
         if (isPlayList) {
           playIndex = state.listInfo.list.findIndex(m => m.songmid == currentSongmid)
           if (!isTempPlay) listPlayIndex = playIndex
@@ -275,16 +275,16 @@ const actions = {
       let currentSongmid
       if (state.playMusicInfo.isTempPlay) {
         const musicInfo = currentList[playInfo.listPlayIndex]
-        if (musicInfo) currentSongmid = musicInfo.songmid || musicInfo.musicInfo.songmid
+        if (musicInfo) currentSongmid = musicInfo.songmid
       } else {
-        currentSongmid = state.playMusicInfo.musicInfo.songmid || state.playMusicInfo.musicInfo.musicInfo.songmid
+        currentSongmid = state.playMusicInfo.musicInfo.songmid
       }
       // 从已播放列表移除播放列表已删除的歌曲
       let index
-      for (index = state.playedList.findIndex(m => (m.musicInfo.songmid || m.musicInfo.musicInfo.songmid) === currentSongmid) - 1; index > -1; index--) {
+      for (index = state.playedList.findIndex(m => m.musicInfo.songmid === currentSongmid) - 1; index > -1; index--) {
         const playMusicInfo = state.playedList[index]
-        const currentSongmid = playMusicInfo.musicInfo.songmid || playMusicInfo.musicInfo.musicInfo.songmid
-        if (playMusicInfo.listId == currentListId && !currentList.some(m => (m.songmid || m.musicInfo.songmid) === currentSongmid)) {
+        const currentSongmid = playMusicInfo.musicInfo.songmid
+        if (playMusicInfo.listId == currentListId && !currentList.some(m => m.songmid === currentSongmid)) {
           commit('removePlayedList', index)
           continue
         }
@@ -351,16 +351,16 @@ const actions = {
       let currentSongmid
       if (state.playMusicInfo.isTempPlay) {
         const musicInfo = currentList[playInfo.listPlayIndex]
-        if (musicInfo) currentSongmid = musicInfo.songmid || musicInfo.musicInfo.songmid
+        if (musicInfo) currentSongmid = musicInfo.songmid
       } else {
-        currentSongmid = state.playMusicInfo.musicInfo.songmid || state.playMusicInfo.musicInfo.musicInfo.songmid
+        currentSongmid = state.playMusicInfo.musicInfo.songmid
       }
       // 从已播放列表移除播放列表已删除的歌曲
       let index
-      for (index = state.playedList.findIndex(m => (m.musicInfo.songmid || m.musicInfo.musicInfo.songmid) === currentSongmid) + 1; index < state.playedList.length; index++) {
+      for (index = state.playedList.findIndex(m => m.musicInfo.songmid === currentSongmid) + 1; index < state.playedList.length; index++) {
         const playMusicInfo = state.playedList[index]
-        const currentSongmid = playMusicInfo.musicInfo.songmid || playMusicInfo.musicInfo.musicInfo.songmid
-        if (playMusicInfo.listId == currentListId && !currentList.some(m => (m.songmid || m.musicInfo.songmid) === currentSongmid)) {
+        const currentSongmid = playMusicInfo.musicInfo.songmid
+        if (playMusicInfo.listId == currentListId && !currentList.some(m => m.songmid === currentSongmid)) {
           commit('removePlayedList', index)
           continue
         }
@@ -483,8 +483,8 @@ const mutations = {
     } else {
       let listId = playMusicInfo.listId
       if (listId != '__temp__' && !playMusicInfo.isTempPlay && listId === state.listInfo.id) {
-        const currentSongmid = playMusicInfo.musicInfo.songmid || playMusicInfo.musicInfo.musicInfo.songmid
-        playIndex = state.listInfo.list.findIndex(m => (m.songmid || m.musicInfo.songmid) == currentSongmid)
+        const currentSongmid = playMusicInfo.musicInfo.songmid
+        playIndex = state.listInfo.list.findIndex(m => m.songmid == currentSongmid)
       }
     }