音乐模块调整

This commit is contained in:
zhongluofeng committed 2026-09-15 17:17:16 +08:00
1 parent 4f574cb5fa
commit 8f853f7ef3
31 files changed
+3819 -936

No files matched your search

+254 -49
View File
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
import { toast } from 'vue-sonner'
import {
Cloud,
@@ -16,7 +16,7 @@ import {
Search,
Trash2
} from '@lucide/vue'
import { useFeiniuStore } from '@/stores/feiniuStore'
import { useFeiniuStore, type PlayableItem } from '@/stores/feiniuStore'
import TrackItem from './TrackItem.vue'
import PlaylistEditorDialog from './PlaylistEditorDialog.vue'
import { Button } from '@/components/ui/button'
@@ -46,21 +46,96 @@ const sourceNav = computed(() => [
{ value: 'playlists' as const, label: '我的歌单', icon: ListMusic, count: store.playlists.length }
])
// ===== 飞牛曲库:搜索(直接绑定 store.searchKeyword,此前绑定的是孤立局部变量,导致搜索完全无效)=====
// ===== 曲库搜索:飞牛 track/list 接口**不支持**关键字过滤(实测忽略该参数),
// 因此搜索框只做**本地筛选**(歌名/歌手/专辑);输入时自动补齐剩余分页,
// 保证筛选覆盖全库而不是已加载的前几页。两个视图(飞牛/本地)共用同一个关键字。
let searchTimer: ReturnType<typeof setTimeout> | undefined
let searchSeq = 0
/** 全量补齐进行中:输入防抖与视图切换可能同时触发,用标志位避免并发重复翻页 */
let fillingAll = false
/** 本组件已完成挂载初始化:此前不触发补齐,避免与 ensureTracksFresh 的首页请求并发 */
let mountedReady = false
/**
* 补齐飞牛曲库的剩余分页。
* 飞牛 `track/list` 不支持关键字过滤,搜索框只做**本地筛选**,
* 因此必须先把剩余分页拉完,否则只能在「已加载的前几页」里找,
* 表现为「曲库里明明有这首歌却搜不到」。
*
* 必须避让任何在途的分页请求:补齐是「按页追加」,而首页刷新是
* `tracks = mapped`(整体替换);两者交错会把刚追加的页直接抹掉,造成曲目缺口。
*/
async function fillRemainingFeiniu() {
if (fillingAll || !store.hasMoreTracks) return
if (store.loading || store.refreshing || store.loadingMore) return
fillingAll = true
const seq = ++searchSeq
try {
await store.loadRemainingTracks()
} catch (e) {
if (seq === searchSeq) toast.error(String(e))
} finally {
fillingAll = false
}
}
/**
* 搜索框输入:仅飞牛曲库需要补齐分页(本地曲库是已全量在内存的数组,输入即筛)。
* 两个视图共用同一个关键字,但按各自的数据来源决定是否发请求。
*/
function onSearchInput() {
clearTimeout(searchTimer)
searchTimer = setTimeout(async () => {
const seq = ++searchSeq
try {
await store.loadTracks(1)
} catch (e) {
if (seq === searchSeq) toast.error(String(e))
}
}, 400)
searchTimer = setTimeout(() => {
if (view.value !== 'feiniu') return
void fillRemainingFeiniu()
}, 300)
}
const isFiltering = computed(() => !!filterKeyword.value)
/** 关键字规范化:全角空格→半角、压缩连续空白、转小写(中文不受影响) */
function normalizeKeyword(s: string) {
return s
.replace(/\u3000/g, ' ')
.trim()
.replace(/\s+/g, ' ')
.toLowerCase()
}
const filterKeyword = computed(() => normalizeKeyword(store.searchKeyword))
/**
* 保证飞牛曲库的筛选覆盖全库。
* 关键字在两个视图之间共享,所以「带着关键字从本地切回飞牛曲库」时
* 也必须补齐分页,否则只会在已加载的前几页里筛,结果数明显偏小。
* 挂载阶段由 onMounted 的串行链负责,此处只在挂载后响应视图 / 关键字变化。
*/
function ensureFeiniuFilterCoverage() {
if (!mountedReady) return
if (view.value !== 'feiniu' || !filterKeyword.value) return
void fillRemainingFeiniu()
}
watch([view, filterKeyword], ensureFeiniuFilterCoverage)
function matchesKeyword(t: PlayableItem, kw: string) {
// 曲库条目(PlayableItem)的字段是 title=歌名 / artistNames=歌手 / album=专辑。
// 千万不要用 musicdl 的 songName/singers——那是「发现音乐」的结构,用错字段
// 会导致 haystack 只剩专辑,表现为"歌名/歌手都搜不到"。
return `${t.title ?? ''} ${t.artistNames ?? ''} ${t.album ?? ''}`.toLowerCase().includes(kw)
}
const filteredTracks = computed(() => {
const kw = filterKeyword.value
if (!kw) return store.tracks
return store.tracks.filter((t) => matchesKeyword(t, kw))
})
const filteredLocalTracks = computed(() => {
const kw = filterKeyword.value
if (!kw) return store.localTracks
return store.localTracks.filter((t) => matchesKeyword(t, kw))
})
function refreshFeiniu() {
store.loadTracks(1).catch((e) => toast.error(String(e)))
}
@@ -69,23 +144,66 @@ function refreshLocal() {
}
function playFeiniu() {
if (store.tracks.length) store.playQueue(store.tracks, 0)
// 有筛选时只播放筛选结果
if (filteredTracks.value.length) store.playQueue(filteredTracks.value, 0)
}
function playLocal() {
if (store.localTracks.length) store.playQueue(store.localTracks, 0)
if (filteredLocalTracks.value.length) store.playQueue(filteredLocalTracks.value, 0)
}
function playActivePlaylist() {
if (activePlaylist.value?.items.length) store.playQueue(activePlaylist.value.items, 0)
}
// ===== 滚动加载更多(飞牛曲库分页)=====
// ===== 列表增量渲染 + 滚动加载更多 =====
/**
* 一次挂载多少行。曲库没有虚拟滚动,补齐分页后行数可达 MAX_QUEUE_TRACKS(4000),
* 一次性挂载 4000 个 TrackItem(每个含封面 <img> 与下拉菜单)会明显卡顿,
* 因此改成「先渲染一屏,滚到底再追加」(与发现音乐页、播放队列同一策略)。
*/
const LIST_STEP = 200
const renderLimit = ref(LIST_STEP)
/** 当前视图正在展示的完整列表 */
const activeList = computed<PlayableItem[]>(() => {
if (view.value === 'feiniu') return filteredTracks.value
if (view.value === 'local') return filteredLocalTracks.value
return activePlaylist.value?.items ?? []
})
const visibleFeiniu = computed(() => filteredTracks.value.slice(0, renderLimit.value))
const visibleLocal = computed(() => filteredLocalTracks.value.slice(0, renderLimit.value))
const visiblePlaylistItems = computed(() => (activePlaylist.value?.items ?? []).slice(0, renderLimit.value))
/** 还有没渲染出来的行 */
const hasMoreRows = computed(() => renderLimit.value < activeList.value.length)
/** 实际渲染出来的行数(提示文案用) */
const shownRows = computed(() => Math.min(renderLimit.value, activeList.value.length))
/** 哨兵是否显示:要么还有行没渲染,要么飞牛曲库还有分页没拉 */
const showSentinel = computed(
() => hasMoreRows.value || (view.value === 'feiniu' && store.hasMoreTracks)
)
// 换视图 / 换关键字 / 换歌单时把渲染窗口收回一屏(监听放在 activePlaylistId 声明之后)
const loadMoreRef = ref<HTMLElement | null>(null)
let loadMoreObserver: IntersectionObserver | null = null
onMounted(() => {
loadMoreObserver = new IntersectionObserver(
(entries) => {
if (!entries.some((e) => e.isIntersecting)) return
store.loadMoreTracks().catch(() => {})
// 先把已加载的数据渲染出来,都渲染完了再向 NAS 要下一页
if (renderLimit.value < activeList.value.length) {
renderLimit.value += LIST_STEP
// 哨兵节点没换位置、仍处于交叉状态时 IntersectionObserver 不会再触发,
// 需要重新 observe 一次才能连续追加
nextTick(() => {
const el = loadMoreRef.value
if (el && loadMoreObserver) {
loadMoreObserver.unobserve(el)
loadMoreObserver.observe(el)
}
})
return
}
if (view.value === 'feiniu' && store.hasMoreTracks) store.loadMoreTracks().catch(() => {})
},
{ rootMargin: '400px' }
)
@@ -118,6 +236,11 @@ const editorOpen = ref(false)
// 切换歌单时关闭编辑器,避免对着已切换的目标继续编辑
watch(activePlaylistId, () => (editorOpen.value = false))
// 换视图 / 换关键字 / 换歌单时把增量渲染窗口收回一屏,避免「切回来看到一屏旧内容」
watch([view, filterKeyword, activePlaylistId], () => {
renderLimit.value = LIST_STEP
})
// 切到歌单视图时自动选中第一个
watch(
[view, () => store.playlists.length],
@@ -159,9 +282,44 @@ function removePlaylist() {
activePlaylistId.value = ''
}
// ===== 视图与筛选持久化:曲库页每次挂载都会重置本地状态,
// 而"搜索结果每次都要重新输"是用户明确反馈的问题 → 存 localStorage(跨重启) =====
const LIB_VIEW_KEY = 'thing.music.library.view'
const LIB_FILTER_KEY = 'thing.music.library.filter'
watch(
() => [view.value, store.searchKeyword] as const,
([v, kw]) => {
try {
localStorage.setItem(LIB_VIEW_KEY, v)
localStorage.setItem(LIB_FILTER_KEY, kw ?? '')
} catch {
/* 存储不可用时静默 */
}
}
)
onMounted(async () => {
await store.init()
if (store.config.loggedIn) store.loadTracks(1).catch(() => {})
try {
// 恢复上次的视图与筛选关键字
const savedView = localStorage.getItem(LIB_VIEW_KEY)
if (savedView === 'feiniu' || savedView === 'local' || savedView === 'playlists') {
view.value = savedView
}
store.searchKeyword = localStorage.getItem(LIB_FILTER_KEY) ?? ''
await store.init()
// 进入曲库页:命中新鲜窗口直接用内存缓存(不请求),过期才后台静默刷新,
// 避免每次切页都清空列表 + 重新拉取 + 重下封面
if (store.config.loggedIn) await store.ensureTracksFresh().catch(() => {})
// 恢复的是本地视图时自动扫描(标签有缓存,通常很快),否则恢复的筛选无内容可筛
if (view.value === 'local') void store.scanLocal().catch(() => {})
} finally {
// 挂载初始化结束才让「视图 / 关键字变化 → 补齐分页」的监听生效,
// 避免它与上面的首页请求并发(并发会因列表整体替换而丢页);
// 随后按同一串行顺序补一次,覆盖「启动时已带关键字」的情况
mountedReady = true
ensureFeiniuFilterCoverage()
}
})
/** 表格表头与 TrackItem 行保持同一条网格 */
@@ -169,10 +327,9 @@ const GRID = { gridTemplateColumns: '28px 36px minmax(0,1fr) 74px 28px' }
const listEmptyHint = computed(() => {
if (view.value === 'feiniu') {
if (store.searchKeyword.trim()) return '没有匹配「' + store.searchKeyword.trim() + '」的曲目'
return store.config.loggedIn ? '曲库为空,试试刷新或检查 NAS 曲库目录' : '请先在「设置 → 飞牛音乐连接」登录'
}
return '暂无本地音乐,点击「扫描本地曲库」或先到「发现音乐」下载'
return '暂无本地音乐,点击「扫描本地曲库」,或到「设置 → 存储与上传」添加本地曲库目录'
})
</script>
@@ -249,15 +406,19 @@ const listEmptyHint = computed(() => {
<!-- ===== 右:内容(key 随来源变化,复用全局 tab-animate 切换动画) ===== -->
<section :key="view" class="tab-animate flex min-w-0 flex-1 flex-col">
<!-- 未登录态 -->
<div v-if="needsLogin" class="flex min-h-0 flex-1 items-center justify-center px-6">
<!-- 未登录态:**只挡飞牛曲库**。本地曲库与「我的歌单」完全不依赖 NAS 登录,
此前把它们一起挡掉,等于让「只用发现音乐 + 本地曲库」的用户点进来只看得到登录提示 -->
<div
v-if="view === 'feiniu' && needsLogin"
class="flex min-h-0 flex-1 items-center justify-center px-6"
>
<Empty>
<EmptyMedia>
<Music2 class="size-8 text-muted-foreground" />
</EmptyMedia>
<EmptyTitle>还没有可用的飞牛音乐连接</EmptyTitle>
<EmptyTitle>飞牛曲库需要一个可用的音乐连接</EmptyTitle>
<EmptyDescription>
到「设置 → 飞牛音乐连接」添加并登录,或先到「发现音乐」下载歌曲到本地曲库。
到「设置 → 飞牛音乐连接」添加并登录。本地曲库与「我的歌单」不依赖 NAS,可直接在左侧切换查看。
</EmptyDescription>
</Empty>
</div>
@@ -266,36 +427,65 @@ const listEmptyHint = computed(() => {
<!-- 工具栏 -->
<header class="flex shrink-0 items-center gap-2 border-b px-4 py-2.5">
<template v-if="view === 'feiniu'">
<div class="relative w-full max-w-sm">
<div class="relative w-full max-w-[280px]">
<Search class="pointer-events-none absolute left-2.5 top-1/2 size-3.5 -translate-y-1/2 text-muted-foreground" />
<Input
v-model="store.searchKeyword"
class="h-8 pl-8"
placeholder="搜索歌名 / 歌手 / 专辑"
placeholder="搜索歌名 / 歌手 / 专辑(本地筛选)"
@input="onSearchInput"
@keydown.enter="onSearchInput"
/>
</div>
<Button variant="outline" size="sm" class="h-8" :disabled="store.loading" @click="refreshFeiniu">
<RefreshCw :class="store.loading ? 'size-3.5 animate-spin' : 'size-3.5'" />
<Button
variant="outline"
size="sm"
class="h-8"
:disabled="store.loading || store.refreshing"
@click="refreshFeiniu"
>
<RefreshCw :class="store.loading || store.refreshing ? 'size-3.5 animate-spin' : 'size-3.5'" />
刷新
</Button>
<span class="ml-1 text-[11.5px] text-muted-foreground">
{{ store.tracks.length }}<template v-if="store.total > store.tracks.length"> / {{ store.total }}</template> 首
<span class="ml-1 shrink-0 whitespace-nowrap text-[11.5px] text-muted-foreground">
<template v-if="isFiltering">
匹配 {{ filteredTracks.length }} / 已加载 {{ store.tracks.length }} 首
</template>
<template v-else>
{{ store.tracks.length }}<template v-if="store.total > store.tracks.length"> / {{ store.total }}</template> 首
</template>
</span>
<Button size="sm" class="ml-auto h-8" :disabled="!store.tracks.length" @click="playFeiniu">
<Button size="sm" class="ml-auto h-8" :disabled="!filteredTracks.length" @click="playFeiniu">
<Play class="size-3.5" /> 播放全部
</Button>
</template>
<template v-else-if="view === 'local'">
<!-- 结构与飞牛曲库完全一致:搜索框 → 操作按钮 → 计数 → 播放全部;
提示语与筛选字段(歌名 / 歌手 / 专辑)也保持一致。
宽度收窄到与飞牛曲库同宽,把余量留给右侧的匹配数与「播放全部」 -->
<div class="relative w-full max-w-[280px]">
<Search class="pointer-events-none absolute left-2.5 top-1/2 size-3.5 -translate-y-1/2 text-muted-foreground" />
<Input
v-model="store.searchKeyword"
class="h-8 pl-8"
placeholder="搜索歌名 / 歌手 / 专辑(本地筛选)"
@input="onSearchInput"
@keydown.enter="onSearchInput"
/>
</div>
<Button variant="outline" size="sm" class="h-8" :disabled="store.localScanBusy" @click="refreshLocal">
<Loader2 v-if="store.localScanBusy" class="size-3.5 animate-spin" />
<FolderOpen v-else class="size-3.5" />
扫描本地曲库
</Button>
<span class="text-[11.5px] text-muted-foreground">{{ store.localTracks.length }} 首</span>
<Button size="sm" class="ml-auto h-8" :disabled="!store.localTracks.length" @click="playLocal">
<span class="ml-1 shrink-0 whitespace-nowrap text-[11.5px] text-muted-foreground">
<template v-if="isFiltering">
匹配 {{ filteredLocalTracks.length }} / 已扫描 {{ store.localTracks.length }} 首
</template>
<template v-else>{{ store.localTracks.length }} 首</template>
</span>
<Button size="sm" class="ml-auto h-8" :disabled="!filteredLocalTracks.length" @click="playLocal">
<Play class="size-3.5" /> 播放全部
</Button>
</template>
@@ -344,8 +534,8 @@ const listEmptyHint = computed(() => {
<!-- 表头 -->
<div
v-if="
(view === 'feiniu' && store.tracks.length) ||
(view === 'local' && store.localTracks.length) ||
(view === 'feiniu' && filteredTracks.length) ||
(view === 'local' && filteredLocalTracks.length) ||
(view === 'playlists' && activePlaylist?.items.length)
"
class="grid h-8 items-center gap-3 px-2 text-[11px] text-muted-foreground"
@@ -365,26 +555,25 @@ const listEmptyHint = computed(() => {
</div>
<Empty v-else-if="!store.tracks.length">
<EmptyMedia><Music2 class="size-8 text-muted-foreground" /></EmptyMedia>
<EmptyTitle>{{ store.searchKeyword.trim() ? '没有匹配的曲目' : '曲库为空' }}</EmptyTitle>
<EmptyTitle>曲库为空</EmptyTitle>
<EmptyDescription>{{ listEmptyHint }}</EmptyDescription>
</Empty>
<Empty v-else-if="!filteredTracks.length">
<EmptyMedia><Search class="size-8 text-muted-foreground" /></EmptyMedia>
<EmptyTitle>没有匹配「{{ store.searchKeyword.trim() }}」的曲目</EmptyTitle>
<EmptyDescription>
已在{{ store.tracks.length }}首曲库中筛选(歌名 / 歌手 / 专辑)。
</EmptyDescription>
</Empty>
<template v-else>
<TrackItem
v-for="(t, i) in store.tracks"
v-for="(t, i) in visibleFeiniu"
:key="t.guid || i"
:item="t"
:index="i"
:context="store.tracks"
:context="filteredTracks"
:active="store.current?.guid === t.guid"
/>
<div
v-if="store.hasMoreTracks"
ref="loadMoreRef"
class="flex items-center justify-center gap-2 py-4 text-[12px] text-muted-foreground"
>
<Loader2 v-if="store.loadingMore" class="size-3.5 animate-spin" />
正在加载更多…
</div>
</template>
</template>
@@ -395,13 +584,18 @@ const listEmptyHint = computed(() => {
<EmptyTitle>暂无本地音乐</EmptyTitle>
<EmptyDescription>{{ listEmptyHint }}</EmptyDescription>
</Empty>
<template v-else>
<Empty v-else-if="store.localTracks.length && !filteredLocalTracks.length">
<EmptyMedia><Search class="size-8 text-muted-foreground" /></EmptyMedia>
<EmptyTitle>没有匹配「{{ store.searchKeyword.trim() }}」的本地曲目</EmptyTitle>
<EmptyDescription>已在扫描到的 {{ store.localTracks.length }} 首中筛选。</EmptyDescription>
</Empty>
<template v-else-if="filteredLocalTracks.length">
<TrackItem
v-for="(t, i) in store.localTracks"
v-for="(t, i) in visibleLocal"
:key="t.guid || i"
:item="t"
:index="i"
:context="store.localTracks"
:context="filteredLocalTracks"
:active="store.current?.guid === t.guid"
/>
</template>
@@ -422,7 +616,7 @@ const listEmptyHint = computed(() => {
</Button>
</Empty>
<TrackItem
v-for="(t, i) in activePlaylist.items"
v-for="(t, i) in visiblePlaylistItems"
:key="`${t.source}:${t.guid}:${i}`"
:item="t"
:index="i"
@@ -439,6 +633,17 @@ const listEmptyHint = computed(() => {
<EmptyDescription>点击左侧「新建歌单」开始整理你的收藏。</EmptyDescription>
</Empty>
</template>
<!-- 增量渲染 / 分页共用哨兵:滚到这里先追加一批行,行渲染完了再向 NAS 要下一页 -->
<div
v-if="showSentinel && activeList.length"
ref="loadMoreRef"
class="flex items-center justify-center gap-2 py-4 text-[12px] text-muted-foreground"
>
<Loader2 v-if="store.loadingMore" class="size-3.5 animate-spin" />
<template v-if="hasMoreRows">已显示 {{ shownRows }} / {{ activeList.length }} 首,继续滚动加载</template>
<template v-else>正在加载更多…</template>
</div>
</div>
</ScrollArea>
</template>