From 1aa9627e4ad7cb10651a1be974eae483e4085751 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Mon, 4 Sep 2023 18:04:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/worker/dbService/modules/dislike_list/index.ts | 2 +- .../components/material/OnlineList/useMusicActions.js | 2 +- src/renderer/core/useApp/usePlayer/usePlayer.ts | 4 +--- src/renderer/store/dislikeList/action.ts | 2 +- src/renderer/views/List/MusicList/useMusicActions.js | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/worker/dbService/modules/dislike_list/index.ts b/src/main/worker/dbService/modules/dislike_list/index.ts index 121ffb7e..f32c9351 100644 --- a/src/main/worker/dbService/modules/dislike_list/index.ts +++ b/src/main/worker/dbService/modules/dislike_list/index.ts @@ -51,7 +51,7 @@ const initDislikeList = () => { } } - dislikeInfo.rules = list.join('\n') + '\n' + dislikeInfo.rules = Array.from(new Set(list)).join('\n') + '\n' return dislikeInfo } diff --git a/src/renderer/components/material/OnlineList/useMusicActions.js b/src/renderer/components/material/OnlineList/useMusicActions.js index fe3f1d12..53a87af6 100644 --- a/src/renderer/components/material/OnlineList/useMusicActions.js +++ b/src/renderer/components/material/OnlineList/useMusicActions.js @@ -30,7 +30,7 @@ export default ({ props }) => { const handleDislikeMusic = async(index) => { const minfo = props.list[index] await addDislikeInfo([{ name: minfo.name, singer: minfo.singer }]) - if (!playMusicInfo.isTempPlay && hasDislike(playMusicInfo.musicInfo)) { + if (hasDislike(playMusicInfo.musicInfo)) { playNext(true) } } diff --git a/src/renderer/core/useApp/usePlayer/usePlayer.ts b/src/renderer/core/useApp/usePlayer/usePlayer.ts index 2c531eb9..0fb0ed30 100644 --- a/src/renderer/core/useApp/usePlayer/usePlayer.ts +++ b/src/renderer/core/useApp/usePlayer/usePlayer.ts @@ -105,9 +105,7 @@ export default () => { if (!playMusicInfo.musicInfo) return const minfo = 'progress' in playMusicInfo.musicInfo ? playMusicInfo.musicInfo.metadata.musicInfo : playMusicInfo.musicInfo await addDislikeInfo([{ name: minfo.name, singer: minfo.singer }]) - if (!playMusicInfo.isTempPlay) { - playNext(true) - } + playNext(true) } watch(() => appSetting['player.togglePlayMethod'], newValue => { diff --git a/src/renderer/store/dislikeList/action.ts b/src/renderer/store/dislikeList/action.ts index fa917ddc..8f508d3f 100644 --- a/src/renderer/store/dislikeList/action.ts +++ b/src/renderer/store/dislikeList/action.ts @@ -45,7 +45,7 @@ const initNameSet = () => { list.push(`${SPLIT_CHAR.DISLIKE_NAME}${singer}`) } } - dislikeInfo.rules = list.join('\n') + '\n' + dislikeInfo.rules = Array.from(new Set(list)).join('\n') + '\n' } export const addDislikeInfo = (infos: LX.Dislike.DislikeMusicInfo[]) => { diff --git a/src/renderer/views/List/MusicList/useMusicActions.js b/src/renderer/views/List/MusicList/useMusicActions.js index 34856935..9135ae26 100644 --- a/src/renderer/views/List/MusicList/useMusicActions.js +++ b/src/renderer/views/List/MusicList/useMusicActions.js @@ -40,7 +40,7 @@ export default ({ props, list, selectedList, removeAllSelect }) => { const handleDislikeMusic = async(index) => { const minfo = list.value[index] await addDislikeInfo([{ name: minfo.name, singer: minfo.singer }]) - if (!playMusicInfo.isTempPlay && hasDislike(playMusicInfo.musicInfo)) { + if (hasDislike(playMusicInfo.musicInfo)) { playNext(true) } }