mirror of
https://github.com/truewhile/MeBox.git
synced 2026-10-07 05:46:38 +08:00
优化
This commit is contained in:
@@ -47,7 +47,13 @@ func listLibrariesHandler(svc *service.Container) gin.HandlerFunc {
|
|||||||
}
|
}
|
||||||
withPreview := c.Query("with_preview") == "1" || c.Query("with_preview") == "true"
|
withPreview := c.Query("with_preview") == "1" || c.Query("with_preview") == "true"
|
||||||
if withPreview {
|
if withPreview {
|
||||||
previews, err := svc.Media.ListLibrariesWithPreview(c.Request.Context(), libs, mediaVisibilityForRequest(c, svc), 10)
|
limit, _ := strconv.Atoi(c.DefaultQuery("preview_limit", c.DefaultQuery("limit", "10")))
|
||||||
|
if limit <= 0 {
|
||||||
|
limit = 10
|
||||||
|
} else if limit > 100 {
|
||||||
|
limit = 100
|
||||||
|
}
|
||||||
|
previews, err := svc.Media.ListLibrariesWithPreview(c.Request.Context(), libs, mediaVisibilityForRequest(c, svc), limit)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -57,11 +57,18 @@ func (s *MediaService) ListLibrariesWithPreview(ctx context.Context, libraries [
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fetchCount := cardLimit * 4
|
||||||
|
if fetchCount < 60 {
|
||||||
|
fetchCount = 60
|
||||||
|
} else if fetchCount > 200 {
|
||||||
|
fetchCount = 200
|
||||||
|
}
|
||||||
|
|
||||||
for i := range out {
|
for i := range out {
|
||||||
if out[i].Total == 0 {
|
if out[i].Total == 0 {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
items, _, err := s.repo.Media.ListByLibrariesFiltered(ctx, []string{out[i].ID}, 0, 60, filter)
|
items, _, err := s.repo.Media.ListByLibrariesFiltered(ctx, []string{out[i].ID}, 0, fetchCount, filter)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -87,12 +87,13 @@ export interface LibraryWithPreview extends Library {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const libraryAPI = {
|
export const libraryAPI = {
|
||||||
list: (options?: { includeHidden?: boolean; withPreview?: boolean }) =>
|
list: (options?: { includeHidden?: boolean; withPreview?: boolean; previewLimit?: number }) =>
|
||||||
api
|
api
|
||||||
.get<LibraryWithPreview[]>('/libraries', {
|
.get<LibraryWithPreview[]>('/libraries', {
|
||||||
params: {
|
params: {
|
||||||
...(options?.includeHidden ? { include_hidden: 1 } : {}),
|
...(options?.includeHidden ? { include_hidden: 1 } : {}),
|
||||||
...(options?.withPreview ? { with_preview: 1 } : {}),
|
...(options?.withPreview ? { with_preview: 1 } : {}),
|
||||||
|
...(options?.previewLimit ? { preview_limit: options.previewLimit } : {}),
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
.then((r) => r.data),
|
.then((r) => r.data),
|
||||||
|
|||||||
+15
-45
@@ -1,9 +1,9 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react'
|
import { useEffect, useMemo, useState } from 'react'
|
||||||
|
|
||||||
import { libraryAPI } from '../api/library'
|
import { libraryAPI, type LibraryWithPreview } from '../api/library'
|
||||||
import { playbackAPI, type HistoryItem } from '../api/playback'
|
import { playbackAPI, type HistoryItem } from '../api/playback'
|
||||||
import type { Library, Media } from '../types'
|
import type { Library, Media } from '../types'
|
||||||
import { groupSeries, type SeriesCard } from '../utils/groupSeries'
|
import type { SeriesCard } from '../utils/groupSeries'
|
||||||
import {
|
import {
|
||||||
ContinueWatchingSection,
|
ContinueWatchingSection,
|
||||||
HomeCarouselSection,
|
HomeCarouselSection,
|
||||||
@@ -29,56 +29,26 @@ export function HomePage() {
|
|||||||
setLoading(true)
|
setLoading(true)
|
||||||
try {
|
try {
|
||||||
const [libs, hist] = await Promise.all([
|
const [libs, hist] = await Promise.all([
|
||||||
libraryAPI.list().then((rows) => asArray<Library>(rows)).catch(() => [] as Library[]),
|
libraryAPI
|
||||||
playbackAPI.recentHistory().then((rows) => asArray<HistoryItem>(rows)).catch(() => [] as HistoryItem[]),
|
.list({ withPreview: true, previewLimit: 20 })
|
||||||
|
.then((rows) => asArray<LibraryWithPreview>(rows))
|
||||||
|
.catch(() => [] as LibraryWithPreview[]),
|
||||||
|
playbackAPI
|
||||||
|
.recentHistory()
|
||||||
|
.then((rows) => asArray<HistoryItem>(rows))
|
||||||
|
.catch(() => [] as HistoryItem[]),
|
||||||
])
|
])
|
||||||
|
|
||||||
if (cancelled) return
|
if (cancelled) return
|
||||||
setLibraries(libs)
|
setLibraries(libs)
|
||||||
setHistory(hist.filter((h) => h && !h.completed && !!h.media))
|
setHistory(hist.filter((h) => h && !h.completed && !!h.media))
|
||||||
|
|
||||||
// Fetch media items for all libraries in parallel
|
|
||||||
const isSeriesType = (type?: string) => type === 'tv' || type === 'anime' || type === 'variety'
|
|
||||||
const results = await Promise.allSettled(
|
|
||||||
libs.map(async (lib) => {
|
|
||||||
// 剧集类媒体库(tv/anime/variety):后端 /series 已按剧聚合,
|
|
||||||
// 首页若用 episode 级 /media 的前 30 行再 groupSeries,同一部剧的
|
|
||||||
// 多集会折叠成 1 张卡,导致整行只显示 1 个条目。
|
|
||||||
// 改用 /series 分页拉取全部聚合后的剧集卡片。
|
|
||||||
if (isSeriesType(lib.type)) {
|
|
||||||
const cards: SeriesCard[] = []
|
|
||||||
let total = 0
|
|
||||||
const pageSize = 200
|
|
||||||
for (let page = 1; page <= 10; page++) {
|
|
||||||
const data = await libraryAPI.listSeries(lib.id, page, pageSize)
|
|
||||||
const pageItems = asArray<SeriesCard>(data?.items)
|
|
||||||
cards.push(...pageItems)
|
|
||||||
total = data?.total ?? cards.length
|
|
||||||
if (cards.length >= total || pageItems.length < pageSize) break
|
|
||||||
}
|
|
||||||
return { id: lib.id, cards, items: [], total }
|
|
||||||
}
|
|
||||||
const page = await libraryAPI.listMedia(lib.id, 1, 30)
|
|
||||||
const items = asArray<Media>(page?.items)
|
|
||||||
const cards = groupSeries(items)
|
|
||||||
return {
|
|
||||||
id: lib.id,
|
|
||||||
cards,
|
|
||||||
items,
|
|
||||||
total: page?.total ?? items.length,
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
|
|
||||||
if (cancelled) return
|
|
||||||
const mapData: Record<string, { cards: SeriesCard[]; items: Media[]; total: number }> = {}
|
const mapData: Record<string, { cards: SeriesCard[]; items: Media[]; total: number }> = {}
|
||||||
for (const res of results) {
|
for (const lib of libs) {
|
||||||
if (res.status === 'fulfilled' && res.value) {
|
mapData[lib.id] = {
|
||||||
mapData[res.value.id] = {
|
cards: lib.cards ?? [],
|
||||||
cards: res.value.cards,
|
items: [],
|
||||||
items: res.value.items,
|
total: lib.total ?? 0,
|
||||||
total: res.value.total,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
setLibraryData(mapData)
|
setLibraryData(mapData)
|
||||||
|
|||||||
Reference in New Issue
Block a user