diff --git a/src/main/set.json b/src/main/set.json index d0c7882..a73356e 100644 --- a/src/main/set.json +++ b/src/main/set.json @@ -23,5 +23,5 @@ "alwaysShowDownloadButton": false, "unlimitedDownload": false, "enableMusicUnblock": true, - "enabledMusicSources": ["migu", "kugou", "pyncmd", "bilibili", "youtube"] + "enabledMusicSources": ["migu", "kugou", "pyncmd", "bilibili", "kuwo"] } diff --git a/src/main/unblockMusic.ts b/src/main/unblockMusic.ts index 938be8c..bc0533d 100644 --- a/src/main/unblockMusic.ts +++ b/src/main/unblockMusic.ts @@ -1,6 +1,6 @@ import match from '@unblockneteasemusic/server'; -type Platform = 'qq' | 'migu' | 'kugou' | 'pyncmd' | 'joox' | 'kuwo' | 'bilibili' | 'youtube'; +type Platform = 'qq' | 'migu' | 'kugou' | 'pyncmd' | 'joox' | 'kuwo' | 'bilibili'; interface SongData { name: string; @@ -30,7 +30,7 @@ interface UnblockResult { } // 所有可用平台 -export const ALL_PLATFORMS: Platform[] = ['migu', 'kugou', 'pyncmd', 'kuwo', 'bilibili', 'youtube']; +export const ALL_PLATFORMS: Platform[] = ['migu', 'kugou', 'pyncmd', 'kuwo', 'bilibili']; /** * 音乐解析函数 @@ -46,12 +46,16 @@ const unblockMusic = async ( retryCount = 1, enabledPlatforms?: Platform[] ): Promise => { - const platforms = enabledPlatforms || ALL_PLATFORMS; + // 过滤 enabledPlatforms,确保只包含 ALL_PLATFORMS 中存在的平台 + const filteredPlatforms = enabledPlatforms + ? enabledPlatforms.filter(platform => ALL_PLATFORMS.includes(platform)) + : ALL_PLATFORMS; + songData.album = songData.album || songData.al; songData.artists = songData.artists || songData.ar; const retry = async (attempt: number): Promise => { try { - const data = await match(parseInt(String(id), 10), platforms,songData); + const data = await match(parseInt(String(id), 10), filteredPlatforms, songData); const result: UnblockResult = { data: { data, diff --git a/src/renderer/components/settings/MusicSourceSettings.vue b/src/renderer/components/settings/MusicSourceSettings.vue index 9d6cfc9..73460f1 100644 --- a/src/renderer/components/settings/MusicSourceSettings.vue +++ b/src/renderer/components/settings/MusicSourceSettings.vue @@ -56,7 +56,7 @@ const props = defineProps({ }, sources: { type: Array as () => Platform[], - default: () => ['migu', 'kugou', 'pyncmd', 'bilibili', 'youtube'] + default: () => ['migu', 'kugou', 'pyncmd', 'bilibili', 'kuwo'] } }); @@ -72,7 +72,6 @@ const musicSourceOptions = ref([ { label: 'pyncmd', value: 'pyncmd' }, { label: '酷我音乐', value: 'kuwo' }, { label: 'Bilibili音乐', value: 'bilibili' }, - { label: 'YouTube', value: 'youtube' }, { label: 'GD音乐台', value: 'gdmusic' } ]); @@ -103,7 +102,7 @@ watch( const handleConfirm = () => { // 确保至少选择一个音源 - const defaultPlatforms = ['migu', 'kugou', 'pyncmd', 'bilibili', 'youtube']; + const defaultPlatforms = ['migu', 'kugou', 'pyncmd', 'bilibili', 'kuwo']; const valuesToEmit = selectedSources.value.length > 0 ? [...new Set(selectedSources.value)] : defaultPlatforms; diff --git a/src/renderer/types/music.ts b/src/renderer/types/music.ts index 83c7028..8166346 100644 --- a/src/renderer/types/music.ts +++ b/src/renderer/types/music.ts @@ -1,5 +1,5 @@ // 音乐平台类型 -export type Platform = 'qq' | 'migu' | 'kugou' | 'pyncmd' | 'joox' | 'kuwo' | 'bilibili' | 'youtube' | 'gdmusic'; +export type Platform = 'qq' | 'migu' | 'kugou' | 'pyncmd' | 'joox' | 'kuwo' | 'bilibili' | 'gdmusic'; // 默认平台列表 -export const DEFAULT_PLATFORMS: Platform[] = ['migu', 'kugou', 'pyncmd', 'bilibili', 'youtube']; \ No newline at end of file +export const DEFAULT_PLATFORMS: Platform[] = ['migu', 'kugou', 'pyncmd', 'bilibili', 'kuwo']; \ No newline at end of file diff --git a/src/renderer/views/set/index.vue b/src/renderer/views/set/index.vue index 5de2ef0..55347c7 100644 --- a/src/renderer/views/set/index.vue +++ b/src/renderer/views/set/index.vue @@ -486,7 +486,7 @@ import { type Platform } from '@/types/music'; import config from '../../../../package.json'; // 所有平台默认值 -const ALL_PLATFORMS: Platform[] = ['migu', 'kugou', 'pyncmd', 'bilibili', 'youtube']; +const ALL_PLATFORMS: Platform[] = ['migu', 'kugou', 'pyncmd', 'bilibili', 'kuwo']; const settingsStore = useSettingsStore(); const userStore = useUserStore();