mirror of
https://github.com/truewhile/MeBox.git
synced 2026-10-05 04:56:37 +08:00
bug处理
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { useEffect, useMemo } from 'react'
|
||||
import { useEffect, useMemo, useState } from 'react'
|
||||
|
||||
import type { Media } from '../types'
|
||||
import {
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
specialSectionForMedia,
|
||||
type SeriesCard,
|
||||
} from '../utils/groupSeries'
|
||||
import { resolveSeriesCardByKey } from '../utils/seriesCardResolve'
|
||||
|
||||
type SeasonEpisodes = {
|
||||
season: number
|
||||
@@ -16,6 +17,7 @@ type SeasonEpisodes = {
|
||||
}
|
||||
|
||||
type UseLibrarySeriesSelectionOptions = {
|
||||
libraryID: string
|
||||
items: Media[]
|
||||
seriesEpisodeItems: Media[]
|
||||
isSeriesLibrary: boolean
|
||||
@@ -32,6 +34,7 @@ type UseLibrarySeriesSelectionOptions = {
|
||||
}
|
||||
|
||||
export function useLibrarySeriesSelection({
|
||||
libraryID,
|
||||
items,
|
||||
seriesEpisodeItems,
|
||||
isSeriesLibrary,
|
||||
@@ -46,6 +49,14 @@ export function useLibrarySeriesSelection({
|
||||
setSelectedSeason,
|
||||
onClearSeriesState,
|
||||
}: UseLibrarySeriesSelectionOptions) {
|
||||
// 深链(首页最新条目 / 海报墙 ?series=<key>)指向的剧集不在已加载的
|
||||
// 一页卡片里时,需要单独按 key 解析;resolvingSeries 让页面在这段时间
|
||||
// 显示加载态,而不是先闪一下整个媒体库列表。
|
||||
const [resolvingSeries, setResolvingSeries] = useState(false)
|
||||
const [pendingSeriesKey, setPendingSeriesKey] = useState('')
|
||||
// 当前 URL 请求的剧集 key(非剧集库 / 加载中 / 没带参数时为空)。
|
||||
const requestedSeriesKey = !loading && isSeries ? (searchParams.get('series') ?? '') : ''
|
||||
|
||||
const selectedEpisodes = useMemo(() => {
|
||||
const sourceItems = isSeriesLibrary ? seriesEpisodeItems : items
|
||||
if (!selectedSeries || sourceItems.length === 0) return []
|
||||
@@ -92,20 +103,53 @@ export function useLibrarySeriesSelection({
|
||||
useEffect(() => {
|
||||
if (loading) return
|
||||
if (!isSeries) {
|
||||
setPendingSeriesKey('')
|
||||
setSelectedSeries(null)
|
||||
setSelectedSeason(null)
|
||||
return
|
||||
}
|
||||
|
||||
const key = searchParams.get('series')
|
||||
if (!key) {
|
||||
if (!requestedSeriesKey) {
|
||||
setPendingSeriesKey('')
|
||||
setSelectedSeries(null)
|
||||
return
|
||||
}
|
||||
|
||||
const next = seriesCards.find((card) => card.key === key)
|
||||
setSelectedSeries(next ?? null)
|
||||
}, [isSeries, loading, searchParams, seriesCards, setSelectedSeason, setSelectedSeries])
|
||||
const next = seriesCards.find((card) => card.key === requestedSeriesKey)
|
||||
if (next) {
|
||||
setPendingSeriesKey('')
|
||||
setSelectedSeries(next)
|
||||
return
|
||||
}
|
||||
|
||||
// 目标剧集尚未加载到(远程库分页 / 大库分页):登记待解析 key。
|
||||
setPendingSeriesKey((prev) => (prev === requestedSeriesKey ? prev : requestedSeriesKey))
|
||||
}, [isSeries, loading, requestedSeriesKey, seriesCards, setSelectedSeason, setSelectedSeries])
|
||||
|
||||
useEffect(() => {
|
||||
// pendingSeriesKey 必须仍然是 URL 上请求的 key:切换媒体库/清空参数
|
||||
// 时直接丢弃待解析状态,避免把别的库的剧集解析进来。
|
||||
if (!pendingSeriesKey || pendingSeriesKey !== requestedSeriesKey) {
|
||||
setResolvingSeries(false)
|
||||
return
|
||||
}
|
||||
let cancelled = false
|
||||
setResolvingSeries(true)
|
||||
resolveSeriesCardByKey(libraryID, pendingSeriesKey)
|
||||
.then((card) => {
|
||||
if (cancelled) return
|
||||
setResolvingSeries(false)
|
||||
setSelectedSeries(card)
|
||||
})
|
||||
.catch(() => {
|
||||
if (cancelled) return
|
||||
setResolvingSeries(false)
|
||||
setSelectedSeries(null)
|
||||
})
|
||||
return () => {
|
||||
cancelled = true
|
||||
}
|
||||
}, [libraryID, pendingSeriesKey, requestedSeriesKey, setSelectedSeries])
|
||||
|
||||
useEffect(() => {
|
||||
if (!selectedSeries || selectedEpisodes.length === 0) {
|
||||
@@ -135,6 +179,7 @@ export function useLibrarySeriesSelection({
|
||||
}
|
||||
|
||||
return {
|
||||
resolvingSeries,
|
||||
selectedEpisodes,
|
||||
visibleEpisodes,
|
||||
selectedSeriesEpisodes,
|
||||
|
||||
Reference in New Issue
Block a user