diff --git a/src/components/TrackListItem.vue b/src/components/TrackListItem.vue index 2140604..76e2a16 100644 --- a/src/components/TrackListItem.vue +++ b/src/components/TrackListItem.vue @@ -131,7 +131,7 @@ export default { }, trackClass() { let trackClass = [this.type]; - if (!this.track.playable && this.settings.showUnavailableSongInGreyStyle) + if (!this.track.playable && this.showUnavailableSongInGreyStyle) trackClass.push("disable"); if (this.isPlaying && this.highlightPlayingTrack) trackClass.push("playing"); @@ -148,7 +148,9 @@ export default { ); }, showUnavailableSongInGreyStyle() { - return this.$store.state.settings.showUnavailableSongInGreyStyle; + return process.env.IS_ELECTRON + ? !this.$store.state.settings.enableUnblockNeteaseMusic + : true; }, }, methods: { diff --git a/src/locale/lang/en.js b/src/locale/lang/en.js index e4aae4b..6968bfa 100644 --- a/src/locale/lang/en.js +++ b/src/locale/lang/en.js @@ -149,8 +149,6 @@ export default { showLyricsTranslation: "Show lyrics translation", showLyricsDynamicBackground: "Show lyrics dynamic background", minimizeToTray: "Minimize to tray", - showGitHubIcon: "Show GitHub icon", - showUnavailableSongInGreyStyle: "Show unavailable song in grey style", showPlaylistsByAppleMusic: "Show playlists by Apple Music", enableDiscordRichPresence: "Enable Discord Rich Presence", enableGlobalShortcut: "Enable Global Shortcut", diff --git a/src/locale/lang/tr.js b/src/locale/lang/tr.js index b85b53b..b399fa7 100644 --- a/src/locale/lang/tr.js +++ b/src/locale/lang/tr.js @@ -149,8 +149,6 @@ export default { showLyricsTranslation: "Müzik sözlerinin çevirilerini göster", showLyricsDynamicBackground: "Dinamik arkaplanda müzik sözlerini gsöter", minimizeToTray: "Küçült", - showGitHubIcon: "GitHub ikonunu göster", - showUnavailableSongInGreyStyle: "Erişilemeyen müzikleri gri stilde göster", showPlaylistsByAppleMusic: "Apple Music'in Çalma Listelerini Göster", enableDiscordRichPresence: "Discord gösterimini aktifleştir", showLibraryDefault: "Kitaplık Varsayılanını göster", diff --git a/src/locale/lang/zh-CN.js b/src/locale/lang/zh-CN.js index 001c79d..640d840 100644 --- a/src/locale/lang/zh-CN.js +++ b/src/locale/lang/zh-CN.js @@ -150,8 +150,6 @@ export default { showLyricsTranslation: "显示歌词翻译", showLyricsDynamicBackground: "显示歌词动态背景", minimizeToTray: "最小化到托盘", - showGitHubIcon: "显示 GitHub 图标", - showUnavailableSongInGreyStyle: "显示不可播放的歌曲为灰色", showPlaylistsByAppleMusic: "首页显示来自 Apple Music 的歌单", enableDiscordRichPresence: "启用 Discord Rich Presence", enableGlobalShortcut: "启用全局快捷键", diff --git a/src/store/initLocalStorage.js b/src/store/initLocalStorage.js index cf43eb9..dcdf421 100644 --- a/src/store/initLocalStorage.js +++ b/src/store/initLocalStorage.js @@ -14,7 +14,7 @@ let localStorage = { lyricFontSize: 28, outputDevice: "default", showPlaylistsByAppleMusic: true, - showUnavailableSongInGreyStyle: true, + enableUnblockNeteaseMusic: true, automaticallyCacheSongs: false, cacheLimit: false, nyancatStyle: false, @@ -36,7 +36,6 @@ let localStorage = { if (process.env.IS_ELECTRON === true) { localStorage.settings.automaticallyCacheSongs = true; - localStorage.settings.showUnavailableSongInGreyStyle = false; } export default localStorage; diff --git a/src/utils/Player.js b/src/utils/Player.js index be1cc7f..99a1e16 100644 --- a/src/utils/Player.js +++ b/src/utils/Player.js @@ -228,7 +228,13 @@ export default class { } } _getAudioSourceFromUnblockMusic(track) { - if (process.env.IS_ELECTRON !== true) return null; + console.debug(`[debug][Player.js] _getAudioSourceFromUnblockMusic`); + if ( + process.env.IS_ELECTRON !== true || + store.state.settings.enableUnblockNeteaseMusic === false + ) { + return null; + } const source = ipcRenderer.sendSync("unblock-music", track); if (store.state.settings.automaticallyCacheSongs && source?.url) { // TODO: 将unblockMusic字样换成真正的来源(比如酷我咪咕等) diff --git a/src/utils/updateApp.js b/src/utils/updateApp.js index 59d5654..836d6e6 100644 --- a/src/utils/updateApp.js +++ b/src/utils/updateApp.js @@ -3,21 +3,8 @@ import pkg from "../../package.json"; const updateSetting = () => { const parsedSettings = JSON.parse(localStorage.getItem("settings")); - const { - showUnavailableSongInGreyStyle, - automaticallyCacheSongs, - nyancatStyle, - showLyricsTranslation, - minimizeToTray, - enabledPlaylistCategories, - } = initLocalStorage.settings; const settings = { - showUnavailableSongInGreyStyle, - automaticallyCacheSongs, - nyancatStyle, - showLyricsTranslation, - minimizeToTray, - enabledPlaylistCategories, + ...initLocalStorage.settings, ...parsedSettings, }; diff --git a/src/views/settings.vue b/src/views/settings.vue index fd014fb..7af2d7a 100644 --- a/src/views/settings.vue +++ b/src/views/settings.vue @@ -1,7 +1,7 @@