bug处理

Merge branch 'main' of https://github.com/truewhile/MeBox
优化，添加滚动记忆
2026-09-28 03:06:38 +08:00 · 2026-09-15 09:58:47 +08:00 · 2026-09-15 00:00:54 +08:00 · 2026-09-15 00:00:35 +08:00 · 2026-09-14 22:55:16 +08:00 · 2026-09-14 22:54:09 +08:00
27 changed files with 969 additions and 457 deletions
@@ -112,7 +112,8 @@ func TestGetDanmakuConfigIncludesPerUserMergePreference(t *testing.T) {
 		t.Fatalf("status = %d, want 200", w.Code)
 	}
 	var cfg struct {
-		MergeSources bool `json:"merge_sources"`
+		MergeSources bool    `json:"merge_sources"`
+		PlaybackRate float64 `json:"playback_rate"`
 	}
 	if err := json.Unmarshal(w.Body.Bytes(), &cfg); err != nil {
 		t.Fatalf("decode: %v", err)
@@ -120,6 +121,9 @@ func TestGetDanmakuConfigIncludesPerUserMergePreference(t *testing.T) {
 	if cfg.MergeSources {
 		t.Fatal("default merge preference should be false")
 	}
+	if cfg.PlaybackRate != 1 {
+		t.Fatalf("default playback rate = %v, want 1", cfg.PlaybackRate)
+	}

 	if err := svc.Danmaku.SetMergeSources(t.Context(), "user-1", true); err != nil {
 		t.Fatalf("set: %v", err)
@@ -137,7 +141,7 @@ func TestGetDanmakuConfigIncludesPerUserMergePreference(t *testing.T) {
 func TestUpdateDanmakuSettingsPersistsAllPlayerPreferences(t *testing.T) {
 	svc := newDanmakuSettingsService(t)

-	body := "{\"enabled\":false,\"opacity\":0.6,\"font_size\":32,\"area\":0.7,\"merge_sources\":true,\"volume\":0.35,\"source\":\"https://dm.example/base/\",\"app_id\":\"my-app-id\",\"app_key\":\"my-app-secret\"}"
+	body := "{\"enabled\":false,\"opacity\":0.6,\"font_size\":32,\"area\":0.7,\"merge_sources\":true,\"volume\":0.35,\"playback_rate\":1.5,\"source\":\"https://dm.example/base/\",\"app_id\":\"my-app-id\",\"app_key\":\"my-app-secret\"}"
 	c, w := newDanmakuSettingsContext(t, svc, http.MethodPut, "/danmaku/settings", body, "user-1")
 	updateDanmakuSettingsHandler(svc)(c)

@@ -154,7 +158,7 @@ func TestUpdateDanmakuSettingsPersistsAllPlayerPreferences(t *testing.T) {
 	if cfg.Enabled || cfg.Opacity != "0.6" || cfg.FontSize != "32" || cfg.Area != "0.7" {
 		t.Fatalf("unexpected render config: %+v", cfg)
 	}
-	if !cfg.MergeSources || cfg.Volume != 0.35 {
+	if !cfg.MergeSources || cfg.Volume != 0.35 || cfg.PlaybackRate != 1.5 {
 		t.Fatalf("unexpected user preferences: %+v", cfg)
 	}
 	if cfg.Source != "https://dm.example/base" || cfg.AppID != "my-app-id" || !cfg.AppKeyConfigured {
@@ -165,11 +169,30 @@ func TestUpdateDanmakuSettingsPersistsAllPlayerPreferences(t *testing.T) {
 	if err != nil || user == nil {
 		t.Fatalf("read persisted user: %v", err)
 	}
-	if user.DanmakuAppKey != "my-app-secret" || user.PlayerVolume != 0.35 || user.DanmakuSource != "https://dm.example/base" {
+	if user.DanmakuAppKey != "my-app-secret" || user.PlayerVolume != 0.35 || user.PlayerPlaybackRate != 1.5 || user.DanmakuSource != "https://dm.example/base" {
 		t.Fatalf("preferences not persisted: %+v", user)
 	}
 }

+func TestUpdateDanmakuSettingsRejectsInvalidPlaybackRate(t *testing.T) {
+	svc := newDanmakuSettingsService(t)
+
+	c, w := newDanmakuSettingsContext(t, svc, http.MethodPut, "/danmaku/settings",
+		`{"playback_rate":4}`, "user-1")
+	updateDanmakuSettingsHandler(svc)(c)
+
+	if w.Code != http.StatusBadRequest {
+		t.Fatalf("status = %d, want 400 (body=%s)", w.Code, w.Body.String())
+	}
+	user, err := svc.Repo.User.FindByID(t.Context(), "user-1")
+	if err != nil || user == nil {
+		t.Fatalf("read user: %v", err)
+	}
+	if user.PlayerPlaybackRate != 1 {
+		t.Fatalf("invalid playback rate was persisted: %v", user.PlayerPlaybackRate)
+	}
+}
+
 func TestUpdateDanmakuSettingsRejectsInvalidSource(t *testing.T) {
 	svc := newDanmakuSettingsService(t)

@@ -89,7 +89,7 @@ func listLibrarySeriesHandler(svc *service.Container) gin.HandlerFunc {
 				writeInternalOrCanceled(c, err)
 				return
 			}
-			cards = service.SortSeriesCards(cards, sortSpec.Field, sortSpec.Order, history)
+			cards = sortRemoteSeriesCards(cards, sortSpec, history)
 			page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
 			size, _ := strconv.Atoi(c.DefaultQuery("page_size", "500"))
 			if page < 1 {
@@ -0,0 +1,23 @@
+package handler
+
+import (
+	"slices"
+	"time"
+
+	"github.com/truewhile/MeBox/internal/service"
+)
+
+// sortRemoteSeriesCards keeps the DateLastContentAdded order returned by the
+// remote Emby server when LastAddedAt is not exposed in the Series DTO.
+func sortRemoteSeriesCards(cards []service.SeriesCard, spec service.MediaSortSpec, history map[string]time.Time) []service.SeriesCard {
+	if spec.Field != "updated_at" {
+		return service.SortSeriesCards(cards, spec.Field, spec.Order, history)
+	}
+
+	out := append([]service.SeriesCard(nil), cards...)
+	// RemoteSeriesCards always fetches DateLastContentAdded in descending order.
+	if spec.Order == "asc" {
+		slices.Reverse(out)
+	}
+	return service.SortSeriesCards(out, spec.Field, spec.Order, history)
+}
@@ -0,0 +1,21 @@
+package handler
+
+import (
+	"testing"
+
+	"github.com/truewhile/MeBox/internal/service"
+)
+
+func TestSortRemoteSeriesCardsUpdatedAtUsesRemoteOrder(t *testing.T) {
+	cards := []service.SeriesCard{{Key: "newest"}, {Key: "middle"}, {Key: "oldest"}}
+
+	desc := sortRemoteSeriesCards(cards, service.MediaSortSpec{Field: "updated_at", Order: "desc"}, nil)
+	if desc[0].Key != "newest" || desc[1].Key != "middle" || desc[2].Key != "oldest" {
+		t.Fatalf("descending order = %q, %q, %q", desc[0].Key, desc[1].Key, desc[2].Key)
+	}
+
+	asc := sortRemoteSeriesCards(cards, service.MediaSortSpec{Field: "updated_at", Order: "asc"}, nil)
+	if asc[0].Key != "oldest" || asc[1].Key != "middle" || asc[2].Key != "newest" {
+		t.Fatalf("ascending order = %q, %q, %q", asc[0].Key, asc[1].Key, asc[2].Key)
+	}
+}
@@ -33,6 +33,7 @@ type User struct {
 	SubtitleChineseMode string `gorm:"size:16;not null;default:original" json:"subtitle_chinese_mode"`
 	// 网页播放器偏好按用户存储，切换媒体对象后继续沿用。
 	PlayerVolume        float64 `gorm:"not null;default:1" json:"player_volume"`
+	PlayerPlaybackRate  float64 `gorm:"not null;default:1" json:"player_playback_rate"`
 	DanmakuEnabled      bool    `gorm:"not null;default:true" json:"danmaku_enabled"`
 	DanmakuOpacity      float64 `gorm:"not null;default:1" json:"danmaku_opacity"`
 	DanmakuFontSize     int     `gorm:"not null;default:24" json:"danmaku_font_size"`
@@ -49,6 +49,12 @@ const (
 // dandanplay protocol (search/episodes + comment/{episodeId}) may be used.
 const DanmakuDefaultSource = "https://api.dandanplay.net"

+const (
+	minPlayerPlaybackRate     = 0.5
+	maxPlayerPlaybackRate     = 3.0
+	defaultPlayerPlaybackRate = 1.0
+)
+
 // danmakuOfficialBase is where identification (/api/v2/match) and the
 // comment/search fallback always go, regardless of the configured source.
 // A package var (not a const) so tests can point it at a local server.
@@ -63,6 +69,8 @@ type DanmakuRenderConfig struct {
 	FontSize string  `json:"font_size"`
 	Area     string  `json:"area"`
 	Volume   float64 `json:"volume"`
+	// PlaybackRate 是当前用户的播放倍速偏好（按用户存储）。
+	PlaybackRate float64 `json:"playback_rate"`
 	// MergeSources 是当前用户的弹幕合并偏好（按用户存储）。
 	MergeSources bool `json:"merge_sources"`
 	// AppKeyConfigured 只表明用户是否保存了应用密钥，不回传密钥明文。
@@ -89,6 +97,7 @@ type DanmakuSettingsPatch struct {
 	Area         *float64 `json:"area"`
 	MergeSources *bool    `json:"merge_sources"`
 	Volume       *float64 `json:"volume"`
+	PlaybackRate *float64 `json:"playback_rate"`
 }

 type danmakuUserContextKey struct{}
@@ -345,10 +354,11 @@ func cloneDanmakuAnimeList(in []DanmakuAnime) []DanmakuAnime {
 // Config reads danmaku settings from the runtime settings table.
 func (s *DanmakuService) Config(ctx context.Context) DanmakuRenderConfig {
 	cfg := DanmakuRenderConfig{
-		Opacity:  "1",
-		FontSize: "24",
-		Area:     "1",
-		Volume:   1,
+		Opacity:      "1",
+		FontSize:     "24",
+		Area:         "1",
+		Volume:       1,
+		PlaybackRate: defaultPlayerPlaybackRate,
 	}
 	if s == nil || s.repo == nil || s.repo.Setting == nil {
 		return cfg
@@ -399,7 +409,14 @@ func (s *DanmakuService) findUser(ctx context.Context, userID string) (*model.Us

 func danmakuConfigFromUser(user *model.User) DanmakuRenderConfig {
 	if user == nil {
-		return DanmakuRenderConfig{Enabled: true, Opacity: "1", FontSize: "24", Area: "1", Volume: 1}
+		return DanmakuRenderConfig{
+			Enabled:      true,
+			Opacity:      "1",
+			FontSize:     "24",
+			Area:         "1",
+			Volume:       1,
+			PlaybackRate: defaultPlayerPlaybackRate,
+		}
 	}
 	opacity := user.DanmakuOpacity
 	if opacity < 0.1 || opacity > 1 {
@@ -417,6 +434,10 @@ func danmakuConfigFromUser(user *model.User) DanmakuRenderConfig {
 	if volume < 0 || volume > 1 {
 		volume = 1
 	}
+	playbackRate := user.PlayerPlaybackRate
+	if playbackRate < minPlayerPlaybackRate || playbackRate > maxPlayerPlaybackRate {
+		playbackRate = defaultPlayerPlaybackRate
+	}
 	return DanmakuRenderConfig{
 		Enabled:          user.DanmakuEnabled,
 		Source:           strings.TrimSpace(user.DanmakuSource),
@@ -425,6 +446,7 @@ func danmakuConfigFromUser(user *model.User) DanmakuRenderConfig {
 		FontSize:         strconv.Itoa(fontSize),
 		Area:             strconv.FormatFloat(area, 'f', -1, 64),
 		Volume:           volume,
+		PlaybackRate:     playbackRate,
 		MergeSources:     user.DanmakuMergeSources,
 		AppKeyConfigured: strings.TrimSpace(user.DanmakuAppKey) != "",
 	}
@@ -495,6 +517,17 @@ func (s *DanmakuService) UpdateUserSettings(ctx context.Context, userID string,
 		}
 		updates["player_volume"] = *patch.Volume
 	}
+	if patch.PlaybackRate != nil {
+		if *patch.PlaybackRate < minPlayerPlaybackRate || *patch.PlaybackRate > maxPlayerPlaybackRate {
+			return DanmakuRenderConfig{}, fmt.Errorf(
+				"%w: playback_rate must be between %.2f and %.2f",
+				ErrInvalidDanmakuSettings,
+				minPlayerPlaybackRate,
+				maxPlayerPlaybackRate,
+			)
+		}
+		updates["player_playback_rate"] = *patch.PlaybackRate
+	}
 	if len(updates) == 0 {
 		return DanmakuRenderConfig{}, ErrNoDanmakuSettings
 	}
@@ -422,6 +422,7 @@ func TestDanmakuFetchUsesPerUserSourceAndCredentials(t *testing.T) {
 	user.DanmakuFontSize = 30
 	user.DanmakuArea = 0.7
 	user.PlayerVolume = 0.42
+	user.PlayerPlaybackRate = 1.25
 	require.NoError(t, svc.repo.User.Create(ctx, &user))
 	seedDanmakuMedia(t, svc, "per-user-media", "测试动画", "", 0)

@@ -430,6 +431,7 @@ func TestDanmakuFetchUsesPerUserSourceAndCredentials(t *testing.T) {
 	require.Contains(t, res.Raw, "弹幕A")
 	require.Equal(t, srv.URL(), res.Source)
 	require.Equal(t, 0.42, res.Volume)
+	require.Equal(t, 1.25, res.PlaybackRate)
 	require.Equal(t, "0.65", res.Opacity)
 	require.Equal(t, "30", res.FontSize)
 	require.Equal(t, srv.lastHeaders.Get("X-AppId"), "user-app-id")
@@ -70,7 +70,9 @@ func SortSeriesCards(cards []SeriesCard, field, order string, history map[string
 	}
 	sort.SliceStable(out, func(i, j int) bool {
 		cmp := compareSeriesByField(out[i], out[j], spec, history)
-		if cmp == 0 {
+		// updated_at 表示最后一集添加日期。远程卡片可能没有该字段，此时
+		// 保持调用方给定的顺序，不要用 ID 再次打乱。
+		if cmp == 0 && spec.Field != "updated_at" {
 			cmp = compareID(out[i].Key, out[j].Key)
 		}
 		return cmp < 0
@@ -173,7 +175,7 @@ func seriesUpdatedTime(card SeriesCard) (time.Time, bool) {
 	if card.LastAddedAt != nil && !card.LastAddedAt.IsZero() {
 		return *card.LastAddedAt, true
 	}
-	return mediaUpdatedTime(card.Rep)
+	return time.Time{}, false
 }

 func seriesLastPlayed(card SeriesCard, history map[string]time.Time) (time.Time, bool) {
@@ -2,6 +2,7 @@ package service

 import (
 	"testing"
+	"time"

 	"github.com/truewhile/MeBox/internal/model"
 )
@@ -40,3 +41,45 @@ func TestSortSeriesCardsTitleAsc(t *testing.T) {
 		t.Fatalf("series order = %q, %q", got[0].Key, got[1].Key)
 	}
 }
+
+func TestSortSeriesCardsUpdatedAtDoesNotFallbackToMediaDate(t *testing.T) {
+	olderMediaDate := time.Date(2023, time.January, 1, 0, 0, 0, 0, time.UTC)
+	newerMediaDate := time.Date(2025, time.January, 1, 0, 0, 0, 0, time.UTC)
+	cards := []SeriesCard{
+		{
+			Key: "remote-first",
+			Rep: model.Media{Base: model.Base{
+				ID:        "remote-first",
+				CreatedAt: olderMediaDate,
+				UpdatedAt: olderMediaDate,
+			}},
+		},
+		{
+			Key: "remote-second",
+			Rep: model.Media{Base: model.Base{
+				ID:        "remote-second",
+				CreatedAt: newerMediaDate,
+				UpdatedAt: newerMediaDate,
+			}},
+		},
+	}
+
+	got := SortSeriesCards(cards, "updated_at", "desc", nil)
+	if got[0].Key != "remote-first" || got[1].Key != "remote-second" {
+		t.Fatalf("series order = %q, %q, want remote-provided order", got[0].Key, got[1].Key)
+	}
+}
+
+func TestSortSeriesCardsUpdatedAtSortsKnownLastEpisodeDates(t *testing.T) {
+	older := time.Date(2024, time.January, 1, 0, 0, 0, 0, time.UTC)
+	newer := time.Date(2025, time.January, 1, 0, 0, 0, 0, time.UTC)
+	cards := []SeriesCard{
+		{Key: "older", LastAddedAt: &older},
+		{Key: "newer", LastAddedAt: &newer},
+	}
+
+	got := SortSeriesCards(cards, "updated_at", "desc", nil)
+	if got[0].Key != "newer" || got[1].Key != "older" {
+		t.Fatalf("series order = %q, %q", got[0].Key, got[1].Key)
+	}
+}
@@ -71,6 +71,7 @@ export interface DanmakuConfig {
  font_size: string
  area: string
  volume: number
+  playback_rate: number
  /** Per-user preference: merge the same episode's multiple sources. */
  merge_sources: boolean
 }
@@ -87,6 +88,7 @@ export interface DanmakuSettingsPatch {
  area?: number
  merge_sources?: boolean
  volume?: number
+  playback_rate?: number
 }

 // danmakuAPI fetches danmaku comments for a media item. The backend resolves
@@ -87,7 +87,11 @@ export function Layout() {
            pathname={location.pathname}
          />
        )}
-        <LayoutWorkspace routeKey={location.pathname} showMobileBottomNav={showMobileBottomNav} />
+        <LayoutWorkspace
+          routeKey={location.pathname}
+          userKey={user?.id}
+          showMobileBottomNav={showMobileBottomNav}
+        />
        {showMobileBottomNav && (
          <MobileBottomNav onOpenMenu={() => sidebar.setIsMobileDrawerOpen(true)} />
        )}
@@ -4,6 +4,7 @@ import clsx from 'clsx'
 import { LayoutSidebarContent, type LayoutSidebarContentProps } from './LayoutSidebarContent'
 import { isPlayerRoute } from './layoutNavigation'
 import { RouteErrorBoundary } from './RouteErrorBoundary'
+import { useScrollMemory } from '../hooks/useScrollMemory'
 import type { useLayoutSidebar } from './useLayoutSidebar'

 type LayoutSidebarState = ReturnType<typeof useLayoutSidebar>
@@ -30,6 +31,7 @@ type LayoutSidebarsProps = Omit<

 type LayoutWorkspaceProps = {
  routeKey: string
+  userKey?: string
  showMobileBottomNav?: boolean
 }

@@ -109,7 +111,13 @@ export function LayoutSidebars({
  )
 }

-export function LayoutWorkspace({ routeKey, showMobileBottomNav = false }: LayoutWorkspaceProps) {
+export function LayoutWorkspace({
+  routeKey,
+  userKey = 'anonymous',
+  showMobileBottomNav = false,
+}: LayoutWorkspaceProps) {
+  useScrollMemory(routeKey, userKey)
+
  const bottomPad = showMobileBottomNav
    ? 'pb-[calc(3.75rem+env(safe-area-inset-bottom,0px))] lg:pb-10'
    : ''
@@ -18,11 +18,18 @@ import {
  Rewind,
  SkipBack,
  SkipForward,
+  Timer,
  Volume2,
  VolumeX,
 } from 'lucide-react'
 import type { SubtitleTrack } from '../api/subtitles'
 import type { PlaybackQuality } from '../types'
+import {
+  formatPlaybackRate,
+  normalizePlaybackRate,
+  PLAYBACK_RATE_OPTIONS,
+  stepPlaybackRate,
+} from '../utils/playbackRate'
 import type { SubtitleChineseMode } from '../utils/subtitleChinese'
 import {
  SUBTITLE_POSITION_OPTIONS,
@@ -47,18 +54,28 @@ const SEEK_STEP_SEC = 10
 const SEEK_REPEAT_MS = 160
 const SEEK_APPLY_MS = 220
 const SEEK_HINT_MS = 700
+const PLAYBACK_RATE_REPEAT_MS = 140
+const PLAYBACK_RATE_HINT_MS = 900

 type SeekHint = {
  dir: 'back' | 'forward'
  seconds: number
 }

-function isEditableTarget(target: EventTarget | null): boolean {
+function isPlayerSeekRange(target: EventTarget | null): boolean {
+  return target instanceof HTMLInputElement && target.dataset.playerSeekRange === 'true'
+}
+
+function shouldIgnorePlayerSeekShortcut(target: EventTarget | null): boolean {
  if (!(target instanceof HTMLElement)) return false
-  return Boolean(
-    target.closest('input, textarea, select, [contenteditable="true"]') ||
-      target.isContentEditable,
+  const control = target.closest<HTMLElement>(
+    'input, textarea, select, [contenteditable="true"]',
  )
+  if (control instanceof HTMLInputElement) {
+    // 进度条需要继续走播放器的 10 秒快捷键；其它输入控件保留原生键盘行为。
+    return !isPlayerSeekRange(control)
+  }
+  return Boolean(control || target.isContentEditable)
 }

 type PlayerControlsProps = {
@@ -67,6 +84,10 @@ type PlayerControlsProps = {
  volume?: number
  onVolumeChange?: (volume: number) => void
  onVolumeCommit?: (volume: number) => void
+  /** 用户级播放倍速，由播放页从数据库读取。 */
+  playbackRate?: number
+  onPlaybackRateChange?: (rate: number) => void
+  onPlaybackRateCommit?: (rate: number) => void
  uiVisible: boolean
  onUiVisibleChange: (visible: boolean) => void
  subs: SubtitleTrack[]
@@ -108,6 +129,9 @@ export function PlayerControls({
  volume: volumeProp = 1,
  onVolumeChange,
  onVolumeCommit,
+  playbackRate: playbackRateProp = 1,
+  onPlaybackRateChange,
+  onPlaybackRateCommit,
  uiVisible,
  onUiVisibleChange,
  subs,
@@ -159,11 +183,14 @@ export function PlayerControls({
  const subtitleMenuRef = useRef<HTMLDivElement | null>(null)
  const [qualityMenuOpen, setQualityMenuOpen] = useState(false)
  const qualityMenuRef = useRef<HTMLDivElement | null>(null)
+  const [speedMenuOpen, setSpeedMenuOpen] = useState(false)
+  const speedMenuRef = useRef<HTMLDivElement | null>(null)
  const hideTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
  const controlsHoveredRef = useRef(false)
  const isScrubbingRef = useRef(false)
  const subtitleMenuOpenRef = useRef(false)
  const qualityMenuOpenRef = useRef(false)
+  const speedMenuOpenRef = useRef(false)
  const danmakuOpenRef = useRef(false)
  const playlistOpenRef = useRef(false)
  const pendingSeekRef = useRef<number | null>(null)
@@ -173,7 +200,11 @@ export function PlayerControls({
  const seekApplyTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
  const seekHintTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
  const lastSeekAtRef = useRef(0)
+  const playbackRateRef = useRef(normalizePlaybackRate(playbackRateProp))
+  const playbackRateHintTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
+  const lastPlaybackRateAtRef = useRef(0)
  const [seekHint, setSeekHint] = useState<SeekHint | null>(null)
+  const [playbackRateHint, setPlaybackRateHint] = useState<number | null>(null)
  const [stageEl, setStageEl] = useState<HTMLElement | null>(null)

  useEffect(() => {
@@ -192,6 +223,10 @@ export function PlayerControls({
    qualityMenuOpenRef.current = qualityMenuOpen
  }, [qualityMenuOpen])

+  useEffect(() => {
+    speedMenuOpenRef.current = speedMenuOpen
+  }, [speedMenuOpen])
+
  useEffect(() => {
    danmakuOpenRef.current = danmakuOpen
  }, [danmakuOpen])
@@ -204,6 +239,10 @@ export function PlayerControls({
    durationRef.current = duration
  }, [duration])

+  useEffect(() => {
+    playbackRateRef.current = normalizePlaybackRate(playbackRateProp)
+  }, [playbackRateProp])
+
  useEffect(() => {
    setStageEl(container())
  }, [container])
@@ -219,9 +258,19 @@ export function PlayerControls({
    setMuted(next === 0)
  }, [video, volumeProp])

-  // 点击控制栏外部时关闭字幕/画质菜单
+  // 倍速由播放页按用户持久化；配置加载、切换剧集或切换播放源后同步到当前 video。
  useEffect(() => {
-    if (!subtitleMenuOpen && !qualityMenuOpen) return
+    const el = video()
+    if (!el) return
+    const next = normalizePlaybackRate(playbackRateProp)
+    if (Math.abs(el.playbackRate - next) > 0.001) {
+      el.playbackRate = next
+    }
+  }, [video, playbackRateProp])
+
+  // 点击控制栏外部时关闭字幕/画质/倍速菜单
+  useEffect(() => {
+    if (!subtitleMenuOpen && !qualityMenuOpen && !speedMenuOpen) return
    const onDocClick = (e: MouseEvent) => {
      if (subtitleMenuRef.current && !subtitleMenuRef.current.contains(e.target as Node)) {
        setSubtitleMenuOpen(false)
@@ -229,10 +278,13 @@ export function PlayerControls({
      if (qualityMenuRef.current && !qualityMenuRef.current.contains(e.target as Node)) {
        setQualityMenuOpen(false)
      }
+      if (speedMenuRef.current && !speedMenuRef.current.contains(e.target as Node)) {
+        setSpeedMenuOpen(false)
+      }
    }
    document.addEventListener('mousedown', onDocClick)
    return () => document.removeEventListener('mousedown', onDocClick)
-  }, [subtitleMenuOpen, qualityMenuOpen])
+  }, [subtitleMenuOpen, qualityMenuOpen, speedMenuOpen])

  // 播放时 3 秒无操作自动隐藏控制栏；暂停/悬停/拖动进度条/打开菜单时保持显示。
  // 监听挂在整个播放器舞台容器（data-player-stage）上，避免光标移到控制栏时因离开视频画面而误触发 mouseleave。
@@ -249,6 +301,7 @@ export function PlayerControls({
        !isScrubbingRef.current &&
        !subtitleMenuOpenRef.current &&
        !qualityMenuOpenRef.current &&
+        !speedMenuOpenRef.current &&
        !danmakuOpenRef.current &&
        !playlistOpenRef.current
      ) {
@@ -258,6 +311,7 @@ export function PlayerControls({
            !isScrubbingRef.current &&
            !subtitleMenuOpenRef.current &&
            !qualityMenuOpenRef.current &&
+            !speedMenuOpenRef.current &&
            !danmakuOpenRef.current &&
            !playlistOpenRef.current
          ) {
@@ -360,7 +414,7 @@ export function PlayerControls({

  // 当悬停或菜单状态改变时，更新控制栏计时器
  useEffect(() => {
-    if (controlsHovered || isScrubbing || subtitleMenuOpen || qualityMenuOpen || danmakuOpen || playlistOpen) {
+    if (controlsHovered || isScrubbing || subtitleMenuOpen || qualityMenuOpen || speedMenuOpen || danmakuOpen || playlistOpen) {
      onUiVisibleChange(true)
      if (hideTimerRef.current) clearTimeout(hideTimerRef.current)
    } else {
@@ -370,7 +424,7 @@ export function PlayerControls({
        hideTimerRef.current = setTimeout(() => onUiVisibleChange(false), 3000)
      }
    }
-  }, [controlsHovered, isScrubbing, subtitleMenuOpen, qualityMenuOpen, danmakuOpen, playlistOpen, onUiVisibleChange, video])
+  }, [controlsHovered, isScrubbing, subtitleMenuOpen, qualityMenuOpen, speedMenuOpen, danmakuOpen, playlistOpen, onUiVisibleChange, video])

  const togglePlay = () => {
    const el = video()
@@ -379,6 +433,30 @@ export function PlayerControls({
    else el.pause()
  }

+  const changePlaybackRate = useCallback((next: number) => {
+    const normalized = normalizePlaybackRate(next)
+    playbackRateRef.current = normalized
+    onPlaybackRateChange?.(normalized)
+    setPlaybackRateHint(normalized)
+    if (playbackRateHintTimerRef.current) {
+      clearTimeout(playbackRateHintTimerRef.current)
+    }
+    playbackRateHintTimerRef.current = setTimeout(() => {
+      setPlaybackRateHint(null)
+      playbackRateHintTimerRef.current = null
+    }, PLAYBACK_RATE_HINT_MS)
+  }, [onPlaybackRateChange])
+
+  const commitPlaybackRate = useCallback(() => {
+    onPlaybackRateCommit?.(playbackRateRef.current)
+  }, [onPlaybackRateCommit])
+
+  const selectPlaybackRate = useCallback((next: number) => {
+    const normalized = normalizePlaybackRate(next)
+    changePlaybackRate(normalized)
+    onPlaybackRateCommit?.(normalized)
+  }, [changePlaybackRate, onPlaybackRateCommit])
+
  const applyAbsoluteSeek = useCallback(
    (absolute: number) => {
      const el = video()
@@ -454,7 +532,7 @@ export function PlayerControls({
    }, 3000)
  }, [onUiVisibleChange, video])

-  const queueRelativeSeek = useCallback((delta: number) => {
+  const queueRelativeSeek = useCallback((delta: number, immediate: boolean) => {
    const el = video()
    if (!el) return
    if (!seekBurstRef.current) {
@@ -489,6 +567,16 @@ export function PlayerControls({

    if (seekHintTimerRef.current) clearTimeout(seekHintTimerRef.current)
    seekHintTimerRef.current = setTimeout(() => setSeekHint(null), SEEK_HINT_MS)
+    if (immediate) {
+      if (seekApplyTimerRef.current) {
+        clearTimeout(seekApplyTimerRef.current)
+        seekApplyTimerRef.current = null
+      }
+      const burst = seekBurstRef.current
+      seekBurstRef.current = null
+      applySeekRef.current(burst.base + burst.delta)
+      return
+    }
    if (seekApplyTimerRef.current) clearTimeout(seekApplyTimerRef.current)
    seekApplyTimerRef.current = setTimeout(() => {
      const burst = seekBurstRef.current
@@ -502,23 +590,47 @@ export function PlayerControls({
  useEffect(() => {
    const onKey = (e: KeyboardEvent) => {
      if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) return
-      if (isEditableTarget(e.target)) return
+      if (shouldIgnorePlayerSeekShortcut(e.target)) return
+      if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
+        e.preventDefault()
+        const now = Date.now()
+        if (e.repeat && now - lastPlaybackRateAtRef.current < PLAYBACK_RATE_REPEAT_MS) return
+        lastPlaybackRateAtRef.current = now
+        changePlaybackRate(
+          stepPlaybackRate(playbackRateRef.current, e.key === 'ArrowUp' ? 1 : -1),
+        )
+        return
+      }
      if (e.key !== 'ArrowLeft' && e.key !== 'ArrowRight') return
      e.preventDefault()
      const now = Date.now()
      if (e.repeat && now - lastSeekAtRef.current < SEEK_REPEAT_MS) return
+      const immediate = !e.repeat && now - lastSeekAtRef.current >= SEEK_APPLY_MS
      lastSeekAtRef.current = now
      e.preventDefault()
-      queueRelativeSeek(e.key === 'ArrowLeft' ? -SEEK_STEP_SEC : SEEK_STEP_SEC)
+      queueRelativeSeek(e.key === 'ArrowLeft' ? -SEEK_STEP_SEC : SEEK_STEP_SEC, immediate)
    }
-    window.addEventListener('keydown', onKey)
-    return () => window.removeEventListener('keydown', onKey)
-  }, [queueRelativeSeek])
+    window.addEventListener('keydown', onKey, true)
+    return () => window.removeEventListener('keydown', onKey, true)
+  }, [changePlaybackRate, queueRelativeSeek])
+
+  useEffect(() => {
+    const onKeyUp = (e: KeyboardEvent) => {
+      if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) return
+      if (e.key !== 'ArrowUp' && e.key !== 'ArrowDown') return
+      if (shouldIgnorePlayerSeekShortcut(e.target)) return
+      e.preventDefault()
+      commitPlaybackRate()
+    }
+    window.addEventListener('keyup', onKeyUp, true)
+    return () => window.removeEventListener('keyup', onKeyUp, true)
+  }, [commitPlaybackRate])

  useEffect(() => {
    return () => {
      if (seekApplyTimerRef.current) clearTimeout(seekApplyTimerRef.current)
      if (seekHintTimerRef.current) clearTimeout(seekHintTimerRef.current)
+      if (playbackRateHintTimerRef.current) clearTimeout(playbackRateHintTimerRef.current)
    }
  }, [])

@@ -612,9 +724,24 @@ export function PlayerControls({
      )
    : null

+  const playbackRateOverlay = playbackRateHint && stageEl
+    ? createPortal(
+        <div className="pointer-events-none absolute inset-0 z-30 flex items-center justify-center">
+          <div className="flex items-center gap-2 rounded-full bg-black/65 px-5 py-3 text-white shadow-lg backdrop-blur-sm">
+            <Timer size={22} />
+            <span className="text-sm font-semibold tabular-nums">
+              {formatPlaybackRate(playbackRateHint)} 倍速
+            </span>
+          </div>
+        </div>,
+        stageEl,
+      )
+    : null
+
  return (
    <>
    {seekOverlay}
+    {playbackRateOverlay}
    <div
      className={`pointer-events-auto absolute inset-x-0 bottom-0 z-20 bg-gradient-to-t from-black/80 via-black/40 to-transparent px-3 pb-3 pt-14 transition-opacity duration-300 ${
        uiVisible ? 'opacity-100' : 'pointer-events-none opacity-0'
@@ -665,6 +792,7 @@ export function PlayerControls({
        <div className="order-2 flex min-w-0 basis-full items-center gap-2 sm:order-none sm:basis-auto sm:flex-1">
          <input
            type="range"
+            data-player-seek-range="true"
            min={0}
            max={duration || 0}
            step={0.1}
@@ -697,6 +825,7 @@ export function PlayerControls({
            <button
              onClick={() => {
                setSubtitleMenuOpen(false)
+                setSpeedMenuOpen(false)
                setQualityMenuOpen((v) => !v)
              }}
              className="flex items-center gap-1 rounded-full p-1.5 transition hover:bg-white/15"
@@ -754,11 +883,55 @@ export function PlayerControls({
          </div>
        )}

+        <div className="relative" ref={speedMenuRef}>
+          <button
+            onClick={() => {
+              setSubtitleMenuOpen(false)
+              setQualityMenuOpen(false)
+              setSpeedMenuOpen((v) => !v)
+            }}
+            className="flex items-center gap-1 rounded-full p-1.5 transition hover:bg-white/15"
+            title="播放速度（↑/↓ 调节）"
+          >
+            <Timer size={18} className={speedMenuOpen ? 'text-rose-400' : 'text-white/80'} />
+            <span className="text-[10px] font-semibold tabular-nums text-white/80">
+              {formatPlaybackRate(playbackRateProp)}
+            </span>
+          </button>
+          {speedMenuOpen && (
+            <div className="absolute bottom-11 right-0 z-30 min-w-36 overflow-hidden rounded-xl border border-white/15 bg-black/85 p-1 shadow-2xl backdrop-blur">
+              <p className="px-3 pb-1 pt-2 text-[10px] uppercase tracking-wide text-white/40">
+                播放速度
+              </p>
+              {PLAYBACK_RATE_OPTIONS.map((rate) => {
+                const current = normalizePlaybackRate(playbackRateProp) === rate
+                return (
+                  <button
+                    key={rate}
+                    type="button"
+                    onClick={() => {
+                      selectPlaybackRate(rate)
+                      setSpeedMenuOpen(false)
+                    }}
+                    className={`flex w-full items-center gap-2 rounded-lg px-3 py-1.5 text-left text-xs transition ${
+                      current ? 'text-rose-400 hover:bg-white/10' : 'text-white/85 hover:bg-white/10'
+                    }`}
+                  >
+                    <span className="tabular-nums">{formatPlaybackRate(rate)}</span>
+                    {current && <Check size={13} className="ml-auto text-rose-400" />}
+                  </button>
+                )
+              })}
+            </div>
+          )}
+        </div>
+
        {subs.length > 0 && (
          <div className="relative" ref={subtitleMenuRef}>
            <button
              onClick={() => {
                setQualityMenuOpen(false)
+                setSpeedMenuOpen(false)
                setSubtitleMenuOpen((v) => !v)
              }}
              className="rounded-full p-1.5 transition hover:bg-white/15"
@@ -0,0 +1,51 @@
+import { shouldPersistScrollSample, shouldRememberScroll } from './useScrollMemory.ts'
+
+function check(name: string, condition: boolean) {
+  if (!condition) throw new Error(`useScrollMemory: ${name}`)
+}
+
+check('home remembers scroll', shouldRememberScroll('/'))
+check('library list remembers scroll', shouldRememberScroll('/libraries'))
+check('library detail remembers scroll', shouldRememberScroll('/library/lib-1'))
+check('media detail remembers scroll', shouldRememberScroll('/media/media-1'))
+check('settings does not remember scroll', !shouldRememberScroll('/settings'))
+check('player does not remember scroll', !shouldRememberScroll('/play/media-1'))
+
+check(
+  'route transition collapse is ignored',
+  !shouldPersistScrollSample({
+    current: 0,
+    lastSaved: 1800,
+    height: 400,
+    lastHeight: 4200,
+  }),
+)
+check(
+  'intentional scroll to top is persisted',
+  shouldPersistScrollSample({
+    current: 0,
+    lastSaved: 1800,
+    height: 4200,
+    lastHeight: 4200,
+  }),
+)
+check(
+  'normal downward scroll is persisted',
+  shouldPersistScrollSample({
+    current: 1900,
+    lastSaved: 1800,
+    height: 4200,
+    lastHeight: 4200,
+  }),
+)
+check(
+  'content growth still allows persist',
+  shouldPersistScrollSample({
+    current: 1800,
+    lastSaved: 1800,
+    height: 5200,
+    lastHeight: 4200,
+  }),
+)
+
+console.log('useScrollMemory.test.ts ok')
@@ -0,0 +1,212 @@
+import { useLayoutEffect } from 'react'
+
+const SCROLL_STORAGE_PREFIX = 'mebox.scroll.'
+const scrollPositions = new Map<string, number>()
+
+function readScrollPosition(key: string): number {
+  const cached = scrollPositions.get(key)
+  if (cached !== undefined) return cached
+  if (typeof window === 'undefined') return 0
+  try {
+    const value = Number(window.sessionStorage.getItem(SCROLL_STORAGE_PREFIX + key))
+    if (Number.isFinite(value) && value >= 0) {
+      scrollPositions.set(key, value)
+      return value
+    }
+  } catch {
+    // sessionStorage 不可用时仍可使用内存缓存。
+  }
+  return 0
+}
+
+function writeScrollPosition(key: string, value: number): void {
+  const next = Math.max(0, Math.round(value))
+  scrollPositions.set(key, next)
+  if (typeof window === 'undefined') return
+  try {
+    window.sessionStorage.setItem(SCROLL_STORAGE_PREFIX + key, String(next))
+  } catch {
+    // 私密模式等场景忽略存储失败，不影响页面滚动。
+  }
+}
+
+export function shouldRememberScroll(pathname: string): boolean {
+  return (
+    pathname === '/' ||
+    pathname === '/libraries' ||
+    pathname.startsWith('/library/') ||
+    pathname.startsWith('/media/')
+  )
+}
+
+/**
+ * 路由切换时 Outlet 内容变矮，浏览器会把共享滚动容器的 scrollTop 钳低，
+ * 并可能同步触发 scroll 事件。这种“假滚动”不能写入存储，否则返回时永远回到顶部。
+ */
+export function shouldPersistScrollSample(input: {
+  current: number
+  lastSaved: number
+  height: number
+  lastHeight: number
+}): boolean {
+  const { current, lastSaved, height, lastHeight } = input
+  if (height + 1 < lastHeight && current < lastSaved) {
+    return false
+  }
+  return true
+}
+
+/**
+ * 记住列表页的滚动位置。页面内容会异步长高，因此恢复期间会监听内容高度，
+ * 直到目标位置可达；期间用户主动滚动会立即接管，避免和恢复逻辑抢滚动条。
+ */
+export function useScrollMemory(pathname: string, userKey = 'anonymous'): void {
+  useLayoutEffect(() => {
+    const el = document.getElementById('app-main-scroll')
+    if (!el) return
+
+    if (!shouldRememberScroll(pathname)) {
+      el.scrollTop = 0
+      return
+    }
+
+    const key = `${userKey}:${pathname}`
+    const saved = readScrollPosition(key)
+    let restoring = saved > 0
+    let observer: ResizeObserver | null = null
+    let restoreTimer: number | null = null
+    let restoreFrame = 0
+    let restorePumpUntil = 0
+    let lastSaved = saved
+    let lastHeight = el.scrollHeight
+
+    const stopRestore = () => {
+      if (restoreFrame) {
+        window.cancelAnimationFrame(restoreFrame)
+        restoreFrame = 0
+      }
+      if (restoreTimer != null) {
+        window.clearTimeout(restoreTimer)
+        restoreTimer = null
+      }
+      observer?.disconnect()
+      observer = null
+    }
+
+    const finishRestore = () => {
+      if (!restoring) return
+      restoring = false
+      stopRestore()
+      lastSaved = Math.round(el.scrollTop)
+      lastHeight = el.scrollHeight
+      writeScrollPosition(key, lastSaved)
+    }
+
+    const tryRestore = () => {
+      if (!restoring) return
+      const max = Math.max(0, el.scrollHeight - el.clientHeight)
+      const target = Math.min(saved, max)
+      if (target > 0 && Math.abs(el.scrollTop - target) > 1) {
+        el.scrollTop = target
+      }
+      if (target >= saved - 1) {
+        finishRestore()
+      }
+    }
+
+    const pumpRestore = () => {
+      if (!restoring) return
+      tryRestore()
+      if (restoring && performance.now() < restorePumpUntil) {
+        restoreFrame = window.requestAnimationFrame(pumpRestore)
+      } else {
+        restoreFrame = 0
+      }
+    }
+
+    const saveNow = () => {
+      if (restoring) return
+      const current = Math.round(el.scrollTop)
+      const height = el.scrollHeight
+      if (
+        !shouldPersistScrollSample({
+          current,
+          lastSaved,
+          height,
+          lastHeight,
+        })
+      ) {
+        lastHeight = height
+        return
+      }
+      lastHeight = height
+      if (current === lastSaved) return
+      lastSaved = current
+      writeScrollPosition(key, current)
+    }
+
+    const cancelRestore = () => {
+      if (!restoring) return
+      restoring = false
+      stopRestore()
+      lastSaved = Math.round(el.scrollTop)
+      lastHeight = el.scrollHeight
+      writeScrollPosition(key, lastSaved)
+    }
+
+    if (saved <= 0) {
+      el.scrollTop = 0
+    } else {
+      tryRestore()
+      if (restoring) {
+        const content = el.firstElementChild
+        if (typeof ResizeObserver !== 'undefined' && content instanceof HTMLElement) {
+          observer = new ResizeObserver(() => tryRestore())
+          observer.observe(content)
+        }
+        restorePumpUntil = performance.now() + 1000
+        restoreFrame = window.requestAnimationFrame(pumpRestore)
+        restoreTimer = window.setTimeout(finishRestore, 10000)
+      }
+    }
+
+    const onPointerDown = (event: PointerEvent) => {
+      if (event.target === el) {
+        cancelRestore()
+      }
+      saveNow()
+    }
+
+    const onKeyDown = (event: KeyboardEvent) => {
+      if (
+        event.key === 'PageDown' ||
+        event.key === 'PageUp' ||
+        event.key === 'Home' ||
+        event.key === 'End' ||
+        event.key === 'ArrowDown' ||
+        event.key === 'ArrowUp' ||
+        event.key === ' '
+      ) {
+        cancelRestore()
+      }
+      saveNow()
+    }
+
+    el.addEventListener('scroll', saveNow, { passive: true })
+    el.addEventListener('pointerdown', onPointerDown, true)
+    window.addEventListener('wheel', cancelRestore, { passive: true, capture: true })
+    window.addEventListener('touchstart', cancelRestore, { passive: true, capture: true })
+    window.addEventListener('keydown', onKeyDown, true)
+
+    return () => {
+      el.removeEventListener('scroll', saveNow)
+      el.removeEventListener('pointerdown', onPointerDown, true)
+      window.removeEventListener('wheel', cancelRestore, true)
+      window.removeEventListener('touchstart', cancelRestore, true)
+      window.removeEventListener('keydown', onKeyDown, true)
+      stopRestore()
+      // 清理时写入最后一次有效位置，避免依赖已被钳制的 el.scrollTop。
+      writeScrollPosition(key, lastSaved)
+    }
+  }, [pathname, userKey])
+}
@@ -430,7 +430,8 @@ video::cue(*) {

 .animate-overlay-in { animation: overlay-in 0.15s ease-out both; }
 .animate-drawer-in { animation: drawer-in 0.22s ease-out both; }
-.animate-page-in { animation: page-in 0.25s ease-out both; }
+/* 播放完成后不能保留 transform，否则长页面会成为 fixed 弹框的包含块。 */
+.animate-page-in { animation: page-in 0.25s ease-out backwards; }
 .animate-accordion-in { animation: accordion-in 0.18s ease-out both; }
 .animate-fade-slide-in { animation: fade-slide-in 0.2s ease-out both; }
 .animate-menu-in { animation: menu-in 0.15s ease-out both; }
@@ -151,33 +151,30 @@ export function HomePage() {
    )
  }, [])

-  // 3. 首屏只预取轮播和前三行所需的预览；入口卡片进入视口后再按批加载。
+  // 3. 首屏只预取轮播和前三行所需的预览；入口卡片进入视口后自行按批加载。
  useEffect(() => {
    if (sortedLibraries.length === 0) return
    const carouselLibIds = sortedLibraries
      .filter((l) => l.carousel_enabled === true)
      .map((l) => l.id)
    const topRowLibIds = sortedLibraries.slice(0, 3).map((l) => l.id)
-    // 入口网格仍然是一次展示 20 个库；没有自定义封面的库必须在首屏
-    // 立即拉预览，否则会先出现占位图标再补图，体感反而更慢。
-    const topGridLibIds = sortedLibraries
-      .slice(0, 20)
-      .filter((l) => !l.cover_url)
-      .map((l) => l.id)
    const shelfTargets = Array.from(new Set([...carouselLibIds, ...topRowLibIds]))
-    const shelfTargetSet = new Set(shelfTargets)
-    const gridTargets = topGridLibIds.filter((id) => !shelfTargetSet.has(id))
-    // 入口网格只需要 2 张封面，横向货架才需要 10 张。分开请求可以避免
-    // 为暂时不会出现的货架预取完整卡片窗口。
    void fetchPreviews(shelfTargets, 10)
-    void fetchPreviews(gridTargets, 2)
  }, [sortedLibraries, fetchPreviews])

  // 4. 媒体库展示行渐进流式加载：默认先检视前 3 个库，随向下滚动逐步检视后续库
  const INITIAL_ROWS = 3
  const STEP_ROWS = 2
  const [visibleTargetCount, setVisibleTargetCount] = useState(INITIAL_ROWS)
-  const sentinelRef = useRef<HTMLDivElement | null>(null)
+  const sentinelRef = useRef<HTMLButtonElement | null>(null)
+  const userScrolledRef = useRef(false)
+
+  const revealMoreLibraries = useCallback(() => {
+    setVisibleTargetCount((prev) => {
+      if (prev >= sortedLibraries.length) return prev
+      return Math.min(prev + STEP_ROWS, sortedLibraries.length)
+    })
+  }, [sortedLibraries.length])

  // 随 visibleTargetCount 增加，按需触发后续库的预览加载
  useEffect(() => {
@@ -201,12 +198,11 @@ export function HomePage() {
    if (!scrollParent) return

    const handleCheckBottom = () => {
+      if (scrollParent.scrollTop <= 0) return
+      userScrolledRef.current = true
      const remaining = scrollParent.scrollHeight - scrollParent.scrollTop - scrollParent.clientHeight
      if (remaining < 600) {
-        setVisibleTargetCount((prev) => {
-          if (prev >= sortedLibraries.length) return prev
-          return Math.min(prev + STEP_ROWS, sortedLibraries.length)
-        })
+        revealMoreLibraries()
      }
    }

@@ -218,11 +214,8 @@ export function HomePage() {
      observer = new IntersectionObserver(
        (entries) => {
          const [entry] = entries
-          if (entry?.isIntersecting) {
-            setVisibleTargetCount((prev) => {
-              if (prev >= sortedLibraries.length) return prev
-              return Math.min(prev + STEP_ROWS, sortedLibraries.length)
-            })
+          if (entry?.isIntersecting && userScrolledRef.current) {
+            revealMoreLibraries()
          }
        },
        {
@@ -234,15 +227,13 @@ export function HomePage() {
      observer.observe(sentinel)
    }

-    handleCheckBottom()
-
    return () => {
      scrollParent.removeEventListener('scroll', handleCheckBottom)
      if (observer) {
        observer.disconnect()
      }
    }
-  }, [visibleLibraries.length, hasMoreLibraries, sortedLibraries.length])
+  }, [hasMoreLibraries, revealMoreLibraries, visibleLibraries.length])

  // Quick lookup map for libraries
  const libraryMap = useMemo(() => {
@@ -333,7 +324,7 @@ export function HomePage() {
      )}

      {/* 4. 各媒体库内容展示行（向下滑动渐进流式加载，不受上方20个分页限制） */}
-      {visibleLibraries.length > 0 && (
+      {(visibleLibraries.length > 0 || hasMoreLibraries) && (
        <div className="space-y-10">
          {visibleLibraries.map((lib) => {
            const cards = libraryData[lib.id]?.cards || []
@@ -346,12 +337,17 @@ export function HomePage() {
            )
          })}
          {hasMoreLibraries && (
-            <div ref={sentinelRef} className="flex h-10 w-full items-center justify-center py-2 opacity-60">
+            <button
+              ref={sentinelRef}
+              type="button"
+              onClick={revealMoreLibraries}
+              className="flex h-10 w-full items-center justify-center py-2 opacity-60 transition-opacity hover:opacity-100"
+            >
              <div className="flex items-center gap-2 text-xs text-[var(--app-muted)]">
                <div className="h-1.5 w-1.5 animate-ping rounded-full bg-brand-500" />
                <span>加载更多媒体库…</span>
              </div>
-            </div>
+            </button>
          )}
        </div>
      )}
@@ -9,6 +9,7 @@ import {
  FolderOpen,
  Library as LibraryIcon,
  Music,
+  Pin,
  Play,
  PlayCircle,
  Sparkles,
@@ -355,11 +356,19 @@ export function HomeLibrariesSection({
  libraryData,
  libraryCounts,
  onNeedPreviews,
+  pinnedIds = [],
+  onTogglePin,
+  showAllLink = true,
+  title = '媒体库',
 }: {
  libraries: Library[]
  libraryData?: Record<string, { cards: SeriesCard[]; items: Media[]; total: number }>
  libraryCounts: Record<string, number>
  onNeedPreviews?: (ids: string[], limit?: number) => void
+  pinnedIds?: string[]
+  onTogglePin?: (libraryId: string) => void
+  showAllLink?: boolean
+  title?: string
 }) {
  const PAGE_SIZE = 20
  const [currentPage, setCurrentPage] = useState(1)
@@ -382,7 +391,7 @@ export function HomeLibrariesSection({
          <div>
            <div className="flex items-center gap-2">
              <h2 className="font-display text-xl font-extrabold tracking-tight text-[var(--app-text)]">
-                媒体库
+                {title}
              </h2>
              {libraries.length > PAGE_SIZE && (
                <span className="rounded-md border border-[var(--app-border)] bg-[var(--app-panel-soft)] px-1.5 py-0.5 text-[11px] font-semibold text-[var(--app-muted)]">
@@ -396,41 +405,45 @@ export function HomeLibrariesSection({
          </div>
        </div>

-        <div className="flex items-center gap-3">
-          {totalPages > 1 && (
-            <div className="flex items-center gap-2 rounded-xl border border-[var(--app-border)] bg-[var(--app-panel-soft)] px-2 py-1 text-xs">
-              <button
-                type="button"
-                onClick={() => setCurrentPage((p) => Math.max(1, p - 1))}
-                disabled={effectivePage <= 1}
-                className="rounded-lg p-1 text-[var(--app-muted)] hover:bg-[var(--app-hover)] hover:text-[var(--app-text)] disabled:opacity-30 disabled:hover:bg-transparent disabled:hover:text-[var(--app-muted)] transition-colors"
-                title="上一页"
-              >
-                <ChevronLeft size={14} />
-              </button>
-              <span className="font-mono text-xs font-semibold text-[var(--app-subtle)]">
-                {effectivePage} / {totalPages}
-              </span>
-              <button
-                type="button"
-                onClick={() => setCurrentPage((p) => Math.min(totalPages, p + 1))}
-                disabled={effectivePage >= totalPages}
-                className="rounded-lg p-1 text-[var(--app-muted)] hover:bg-[var(--app-hover)] hover:text-[var(--app-text)] disabled:opacity-30 disabled:hover:bg-transparent disabled:hover:text-[var(--app-muted)] transition-colors"
-                title="下一页"
-              >
-                <ChevronRight size={14} />
-              </button>
-            </div>
-          )}
+        {(totalPages > 1 || showAllLink) && (
+          <div className="flex items-center gap-3">
+            {totalPages > 1 && (
+              <div className="flex items-center gap-2 rounded-xl border border-[var(--app-border)] bg-[var(--app-panel-soft)] px-2 py-1 text-xs">
+                <button
+                  type="button"
+                  onClick={() => setCurrentPage((p) => Math.max(1, p - 1))}
+                  disabled={effectivePage <= 1}
+                  className="rounded-lg p-1 text-[var(--app-muted)] hover:bg-[var(--app-hover)] hover:text-[var(--app-text)] disabled:opacity-30 disabled:hover:bg-transparent disabled:hover:text-[var(--app-muted)] transition-colors"
+                  title="上一页"
+                >
+                  <ChevronLeft size={14} />
+                </button>
+                <span className="font-mono text-xs font-semibold text-[var(--app-subtle)]">
+                  {effectivePage} / {totalPages}
+                </span>
+                <button
+                  type="button"
+                  onClick={() => setCurrentPage((p) => Math.min(totalPages, p + 1))}
+                  disabled={effectivePage >= totalPages}
+                  className="rounded-lg p-1 text-[var(--app-muted)] hover:bg-[var(--app-hover)] hover:text-[var(--app-text)] disabled:opacity-30 disabled:hover:bg-transparent disabled:hover:text-[var(--app-muted)] transition-colors"
+                  title="下一页"
+                >
+                  <ChevronRight size={14} />
+                </button>
+              </div>
+            )}

-          <Link
-            to="/libraries"
-            className="group inline-flex items-center gap-1 text-xs font-bold text-[var(--app-subtle)] transition-colors hover:text-brand-500"
-          >
-            <span>全部媒体库</span>
-            <ArrowRight size={14} className="transition-transform group-hover:translate-x-0.5" />
-          </Link>
-        </div>
+            {showAllLink && (
+              <Link
+                to="/libraries"
+                className="group inline-flex items-center gap-1 text-xs font-bold text-[var(--app-subtle)] transition-colors hover:text-brand-500"
+              >
+                <span>全部媒体库</span>
+                <ArrowRight size={14} className="transition-transform group-hover:translate-x-0.5" />
+              </Link>
+            )}
+          </div>
+        )}
      </div>

      <div className="grid grid-cols-2 gap-4 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 xl:grid-cols-5 2xl:grid-cols-6">
@@ -440,6 +453,8 @@ export function HomeLibrariesSection({
            library={lib}
            count={libraryCounts[lib.id] ?? 0}
            cards={libraryData?.[lib.id]?.cards ?? []}
+            pinned={pinnedIds.includes(lib.id)}
+            onTogglePin={onTogglePin ? () => onTogglePin(lib.id) : undefined}
            onVisible={() => {
              if (!lib.cover_url) {
                queuePreview(lib.id)
@@ -452,73 +467,100 @@ export function HomeLibrariesSection({
  )
 }

-function HomeLibraryCard({
+export function HomeLibraryCard({
  library,
  count,
  cards,
+  pinned = false,
+  onTogglePin,
  onVisible,
 }: {
  library: Library
  count: number
  cards: SeriesCard[]
+  pinned?: boolean
+  onTogglePin?: () => void
  onVisible: () => void
 }) {
-  const ref = useInViewOnce<HTMLAnchorElement>(onVisible)
+  const ref = useInViewOnce<HTMLDivElement>(onVisible)
  const artwork = getLibraryArtworks(library, cards)

  return (
-    <Link
+    <div
      ref={ref}
-      to={`/library/${library.id}`}
-      className="group relative flex flex-col justify-between overflow-hidden rounded-2xl border border-[var(--app-border)] bg-[var(--app-panel)] p-3 transition-all duration-300 hover:-translate-y-1 hover:border-brand-500/50 hover:bg-[var(--app-hover)]/40 hover:shadow-lg hover:shadow-brand-500/10"
-      title={library.name}
+      className={`group relative h-full overflow-hidden rounded-2xl border bg-[var(--app-panel)] transition-all duration-300 hover:-translate-y-1 hover:border-brand-500/50 hover:bg-[var(--app-hover)]/40 hover:shadow-lg hover:shadow-brand-500/10 ${
+        pinned ? 'border-brand-500/60 ring-1 ring-brand-500/20' : 'border-[var(--app-border)]'
+      }`}
    >
-      <div
-        className={`relative h-28 w-full overflow-hidden rounded-xl bg-[linear-gradient(135deg,var(--app-panel-soft),var(--app-panel))] shadow-inner ${
-          artwork.length > 1 ? 'grid grid-cols-2 gap-0.5' : ''
-        }`}
+      <Link
+        to={`/library/${library.id}`}
+        className="flex h-full flex-col justify-between p-3"
+        title={library.name}
      >
-        {artwork.length > 0 ? (
-          artwork.map(({ src, version }, index) => (
-            <img
-              key={`${src}-${index}`}
-              src={imageURL(
-                src,
-                version,
-                library.cover_url ? undefined : { maxWidth: 480, maxHeight: 320, quality: 78 },
-              )}
-              alt=""
-              loading="lazy"
-              referrerPolicy="no-referrer"
-              className="h-full w-full object-cover transition-transform duration-500 group-hover:scale-105"
-              onError={(event) => {
-                event.currentTarget.style.visibility = 'hidden'
-              }}
-            />
-          ))
-        ) : (
-          <div className="flex h-full w-full items-center justify-center text-brand-500">
-            {TYPE_ICONS[library.type] || <FolderOpen size={28} />}
-          </div>
-        )}
-
-        <div className="absolute top-2 right-2 rounded-lg border border-white/20 bg-black/60 px-2 py-0.5 text-[10px] font-bold text-white backdrop-blur-md shadow-sm">
-          {TYPE_LABELS[library.type] || '自定义'}
-        </div>
-      </div>
-
-      <div className="mt-3 flex flex-col justify-between">
-        <h3
-          className="line-clamp-2 break-words font-display text-sm font-bold text-[var(--app-text)] group-hover:text-brand-500"
-          title={library.name}
+        <div
+          className={`relative h-28 w-full overflow-hidden rounded-xl bg-[linear-gradient(135deg,var(--app-panel-soft),var(--app-panel))] shadow-inner ${
+            artwork.length > 1 ? 'grid grid-cols-2 gap-0.5' : ''
+          }`}
        >
-          {library.name}
-        </h3>
-        <p className="mt-0.5 text-xs text-[var(--app-muted)]">
-          {count > 0 ? `${count} 部媒体` : '暂无条目'}
-        </p>
-      </div>
-    </Link>
+          {artwork.length > 0 ? (
+            artwork.map(({ src, version }, index) => (
+              <img
+                key={`${src}-${index}`}
+                src={imageURL(
+                  src,
+                  version,
+                  library.cover_url ? undefined : { maxWidth: 480, maxHeight: 320, quality: 78 },
+                )}
+                alt=""
+                loading="lazy"
+                referrerPolicy="no-referrer"
+                className="h-full w-full object-cover transition-transform duration-500 group-hover:scale-105"
+                onError={(event) => {
+                  event.currentTarget.style.visibility = 'hidden'
+                }}
+              />
+            ))
+          ) : (
+            <div className="flex h-full w-full items-center justify-center text-brand-500">
+              {TYPE_ICONS[library.type] || <FolderOpen size={28} />}
+            </div>
+          )}
+
+          <div className="absolute top-2 right-2 rounded-lg border border-white/20 bg-black/60 px-2 py-0.5 text-[10px] font-bold text-white backdrop-blur-md shadow-sm">
+            {TYPE_LABELS[library.type] || '自定义'}
+          </div>
+        </div>
+
+        <div className="mt-3 flex flex-col justify-between">
+          <h3
+            className="line-clamp-2 break-words font-display text-sm font-bold text-[var(--app-text)] group-hover:text-brand-500"
+            title={library.name}
+          >
+            {library.name}
+          </h3>
+          <p className="mt-0.5 text-xs text-[var(--app-muted)]">
+            {count > 0 ? `${count} 部媒体` : '暂无条目'}
+          </p>
+        </div>
+      </Link>
+
+      {onTogglePin && (
+        <button
+          type="button"
+          onClick={onTogglePin}
+          className={`absolute left-2 top-2 z-10 rounded-lg border p-1.5 shadow-sm backdrop-blur-md transition-all duration-200 opacity-100 sm:pointer-events-none sm:opacity-0 sm:group-hover:pointer-events-auto sm:group-hover:opacity-100 sm:group-focus-within:pointer-events-auto sm:group-focus-within:opacity-100 sm:focus-visible:pointer-events-auto sm:focus-visible:opacity-100 ${
+            pinned
+              ? 'border-brand-400/50 bg-brand-500 text-white'
+              : 'border-white/20 bg-black/60 text-white hover:bg-black/75'
+          }`}
+          title={pinned ? '取消置顶' : '置顶媒体库'}
+          aria-label={pinned ? '取消置顶' : '置顶媒体库'}
+          aria-pressed={pinned}
+        >
+          <Pin size={13} className={pinned ? 'fill-current' : ''} />
+        </button>
+      )}
+    </div>
  )
 }

@@ -1,33 +1,10 @@
-import { useEffect, useMemo, useRef, useState, type ReactNode } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { Link } from 'react-router-dom'
-import { ArrowRight, ChevronLeft, ChevronRight, Film, FolderOpen, Library as LibraryIcon, Music, Pin, PlayCircle, RefreshCw, Sparkles, Tv } from 'lucide-react'
+import { Library as LibraryIcon, RefreshCw, Sparkles } from 'lucide-react'

-import { imageURL } from '../api/client'
 import { EpisodeArtworkToggle } from '../components/EpisodeArtworkToggle'
-import { MediaCard } from '../components/MediaCard'
-import { useInViewOnce } from '../hooks/useInViewOnce'
-import { useLazyPreviewBatch } from '../hooks/useLazyPreviewBatch'
-import { seriesCardLink } from '../utils/groupSeries'
-import { libraryDisplayPath } from './libraryDisplayModel'
-import { libraryArtworkItems, type LibraryPreview } from './librariesPageModel'
-import { isLibraryPinned } from '../utils/pinnedLibraries'
-
-const TYPE_ICONS: Record<string, ReactNode> = {
-  movie: <Film size={18} />,
-  tv: <Tv size={18} />,
-  anime: <PlayCircle size={18} />,
-  variety: <Tv size={18} />,
-  music: <Music size={18} />,
-  adult: <Film size={18} />,
-}
-const TYPE_LABELS: Record<string, string> = {
-  movie: '电影',
-  tv: '剧集',
-  anime: '动漫',
-  variety: '综艺',
-  music: '音乐',
-  adult: '成人',
-}
+import { HomeLibrariesSection, HomeLibraryRowSection } from './HomePageSections'
+import type { LibraryPreview } from './librariesPageModel'

 export function LibrariesHeader({
  previewCount,
@@ -96,9 +73,9 @@ export function LibrariesHeader({

 export function LibrariesEmptyState() {
  return (
-    <div className="flex flex-col items-center justify-center rounded-3xl border border-dashed border-sand-200 bg-white py-24 text-center">
-      <LibraryIcon className="mb-4 h-12 w-12 text-gray-400" />
-      <p className="text-sm text-ink-50">暂无媒体库，请到管理后台添加目录。</p>
+    <div className="flex flex-col items-center justify-center rounded-3xl border border-dashed border-[var(--app-border)] bg-[var(--app-panel)] py-24 text-center">
+      <LibraryIcon className="mb-4 h-12 w-12 text-[var(--app-muted)]" />
+      <p className="text-sm text-[var(--app-muted)]">暂无媒体库，请到管理后台添加目录。</p>
    </div>
  )
 }
@@ -114,33 +91,35 @@ export function LibrariesContent({
  onTogglePin: (libraryId: string) => void
  onNeedPreviews?: (ids: string[], limit?: number) => void
 }) {
-  const pinnedCount = previews.filter((preview) => isLibraryPinned(preview.library.id, pinnedIds)).length
-  const queuePreview = useLazyPreviewBatch((ids) => onNeedPreviews?.(ids, 2))
-
-  // 下方媒体库货架支持向下滑动渐进流式加载：默认先展示前 3 个库货架，
-  // 随着用户向下滑动接近底部，通过 IntersectionObserver 动态解锁后续媒体库货架。
+  // 下方媒体库货架继续按需解锁：首屏先展示前 3 个，滚动接近底部再加载 2 个。
  const INITIAL_SHELVES = 3
  const STEP_SHELVES = 2
  const [visibleCount, setVisibleCount] = useState(INITIAL_SHELVES)
-  const sentinelRef = useRef<HTMLDivElement | null>(null)
+  const sentinelRef = useRef<HTMLButtonElement | null>(null)
+  const userScrolledRef = useRef(false)
+
+  const revealMoreShelves = useCallback(() => {
+    setVisibleCount((prev) => {
+      if (prev >= previews.length) return prev
+      return Math.min(prev + STEP_SHELVES, previews.length)
+    })
+  }, [previews.length])

  useEffect(() => {
-    const currentTargets = previews.slice(0, visibleCount).map((p) => p.library.id)
+    const currentTargets = previews.slice(0, visibleCount).map((preview) => preview.library.id)
    onNeedPreviews?.(currentTargets, 10)
  }, [previews, visibleCount, onNeedPreviews])

-  // 底部哨兵监听与滚动双保险（触底解锁后续媒体库货架）
  useEffect(() => {
    const scrollParent = document.getElementById('app-main-scroll')
    if (!scrollParent) return

    const handleCheckBottom = () => {
+      if (scrollParent.scrollTop <= 0) return
+      userScrolledRef.current = true
      const remaining = scrollParent.scrollHeight - scrollParent.scrollTop - scrollParent.clientHeight
      if (remaining < 600) {
-        setVisibleCount((prev) => {
-          if (prev >= previews.length) return prev
-          return Math.min(prev + STEP_SHELVES, previews.length)
-        })
+        revealMoreShelves()
      }
    }

@@ -152,11 +131,8 @@ export function LibrariesContent({
      observer = new IntersectionObserver(
        (entries) => {
          const [entry] = entries
-          if (entry?.isIntersecting) {
-            setVisibleCount((prev) => {
-              if (prev >= previews.length) return prev
-              return Math.min(prev + STEP_SHELVES, previews.length)
-            })
+          if (entry?.isIntersecting && userScrolledRef.current) {
+            revealMoreShelves()
          }
        },
        {
@@ -168,286 +144,74 @@ export function LibrariesContent({
      observer.observe(sentinel)
    }

-    handleCheckBottom()
-
    return () => {
      scrollParent.removeEventListener('scroll', handleCheckBottom)
-      if (observer) {
-        observer.disconnect()
-      }
+      if (observer) observer.disconnect()
    }
-  }, [visibleCount, previews.length])
-
-  const visiblePreviews = useMemo(() => {
-    return previews.slice(0, visibleCount)
-  }, [previews, visibleCount])
-
-  const ENTRY_PAGE_SIZE = 20
-  const [entryPage, setEntryPage] = useState(1)
-  const totalEntryPages = Math.max(1, Math.ceil(previews.length / ENTRY_PAGE_SIZE))
-  const effectiveEntryPage = Math.min(entryPage, totalEntryPages)
-
-  const pagedPreviews = useMemo<LibraryPreview[]>(() => {
-    const start = (effectiveEntryPage - 1) * ENTRY_PAGE_SIZE
-    return previews.slice(start, start + ENTRY_PAGE_SIZE)
-  }, [previews, effectiveEntryPage])
-
-  // 入口网格首屏展示前 20 个库；没有自定义封面的库需要立即拉预览，否则卡片会先渲染占位图标再补图。
-  useEffect(() => {
-    const ids = pagedPreviews.filter((preview) => !preview.library.cover_url).map((preview) => preview.library.id)
-    if (ids.length > 0) {
-      onNeedPreviews?.(ids, 2)
-    }
-  }, [pagedPreviews, onNeedPreviews])
+  }, [revealMoreShelves, visibleCount, previews.length])

+  const visiblePreviews = useMemo(
+    () => previews.slice(0, visibleCount),
+    [previews, visibleCount],
+  )
+  const libraries = useMemo(() => previews.map((preview) => preview.library), [previews])
+  const libraryData = useMemo(
+    () =>
+      Object.fromEntries(
+        previews.map((preview) => [
+          preview.library.id,
+          { cards: preview.cards, items: [], total: preview.total },
+        ]),
+      ),
+    [previews],
+  )
+  const libraryCounts = useMemo(
+    () =>
+      Object.fromEntries(
+        previews.map((preview) => [preview.library.id, preview.total]),
+      ),
+    [previews],
+  )

  return (
    <>
-      <section className="space-y-4">
-        <div className="flex flex-wrap items-center justify-between gap-3">
-          <div>
-            <div className="flex items-center gap-2">
-              <h2 className="font-display text-2xl font-bold text-ink-600">媒体库入口</h2>
-              {previews.length > ENTRY_PAGE_SIZE && (
-                <span className="rounded-md border border-sand-200 bg-sand-50 px-2 py-0.5 text-xs font-semibold text-sand-700">
-                  共 {previews.length} 个 · 每页 {ENTRY_PAGE_SIZE} 个
-                </span>
-              )}
-            </div>
-            <p className="text-sm text-ink-50">
-              按目录进入完整媒体库；下方每个目录也会直接展示最新内容。
-              {pinnedCount > 0 ? ` 已置顶 ${pinnedCount} 个媒体库。` : ' 点击卡片右上角图钉可置顶常用媒体库。'}
-            </p>
-          </div>
-
-          {totalEntryPages > 1 && (
-            <div className="flex items-center gap-2 rounded-xl border border-sand-200 bg-white px-2.5 py-1 text-xs shadow-sm">
-              <button
-                type="button"
-                onClick={() => setEntryPage((p) => Math.max(1, p - 1))}
-                disabled={effectiveEntryPage <= 1}
-                className="rounded-lg p-1 text-ink-50 hover:bg-sand-100 hover:text-ink-600 disabled:opacity-30 disabled:hover:bg-transparent disabled:hover:text-ink-50 transition-colors"
-                title="上一页"
-              >
-                <ChevronLeft size={14} />
-              </button>
-              <span className="font-mono text-xs font-semibold text-ink-600">
-                {effectiveEntryPage} / {totalEntryPages}
-              </span>
-              <button
-                type="button"
-                onClick={() => setEntryPage((p) => Math.min(totalEntryPages, p + 1))}
-                disabled={effectiveEntryPage >= totalEntryPages}
-                className="rounded-lg p-1 text-ink-50 hover:bg-sand-100 hover:text-ink-600 disabled:opacity-30 disabled:hover:bg-transparent disabled:hover:text-ink-50 transition-colors"
-                title="下一页"
-              >
-                <ChevronRight size={14} />
-              </button>
-            </div>
-          )}
-        </div>
-        <div className="grid grid-cols-1 gap-3 sm:grid-cols-2 sm:gap-4 xl:grid-cols-3">
-          {pagedPreviews.map((preview) => (
-            <div
-              key={preview.library.id}
-              className="animate-page-in"
-            >
-              <LibraryEntryCard
-                preview={preview}
-                pinned={isLibraryPinned(preview.library.id, pinnedIds)}
-                onTogglePin={() => onTogglePin(preview.library.id)}
-                onVisible={() => {
-                  if (!preview.library.cover_url) {
-                    queuePreview(preview.library.id)
-                  }
-                }}
-              />
-            </div>
-          ))}
-        </div>
-      </section>
+      <HomeLibrariesSection
+        libraries={libraries}
+        libraryData={libraryData}
+        libraryCounts={libraryCounts}
+        onNeedPreviews={onNeedPreviews}
+        pinnedIds={pinnedIds}
+        onTogglePin={onTogglePin}
+        showAllLink={false}
+        title="媒体库入口"
+      />

      {visiblePreviews.length > 0 && (
-        <section className="space-y-6">
+        <section className="space-y-10">
          {visiblePreviews.map((preview) => (
-            <div
-              key={preview.library.id}
-              className="animate-page-in"
-            >
-              <LibraryShelf
-                preview={preview}
-                pinned={isLibraryPinned(preview.library.id, pinnedIds)}
+            <div key={preview.library.id} className="animate-page-in">
+              <HomeLibraryRowSection
+                library={preview.library}
+                cards={preview.cards}
              />
            </div>
          ))}

          {visibleCount < previews.length && (
-            <div ref={sentinelRef} className="flex h-10 w-full items-center justify-center py-2 opacity-60">
+            <button
+              ref={sentinelRef}
+              type="button"
+              onClick={revealMoreShelves}
+              className="flex h-10 w-full items-center justify-center py-2 opacity-60 transition-opacity hover:opacity-100"
+            >
              <div className="flex items-center gap-2 text-xs text-[var(--app-muted)]">
                <div className="h-1.5 w-1.5 animate-ping rounded-full bg-brand-500" />
                <span>加载更多媒体库货架…</span>
              </div>
-            </div>
+            </button>
          )}
        </section>
      )}
    </>
  )
 }
-
-function LibraryEntryCard({
-  preview,
-  pinned,
-  onTogglePin,
-  onVisible,
-}: {
-  preview: LibraryPreview
-  pinned: boolean
-  onTogglePin: () => void
-  onVisible?: () => void
-}) {
-  const library = preview.library
-  const ref = useInViewOnce<HTMLDivElement>(onVisible ?? (() => {}))
-  const artwork = library.cover_url
-    ? [{ src: library.cover_url, version: library.updated_at }]
-    : libraryArtworkItems(preview.cards)
-  const displayPath = libraryDisplayPath(library.path)
-
-  return (
-    <div
-      ref={ref}
-      className={
-        'group relative flex overflow-hidden rounded-2xl sm:rounded-3xl border bg-white p-2.5 sm:p-3 shadow-card transition-all hover:-translate-y-0.5 hover:shadow-card-hover ' +
-        (pinned ? 'border-brand-300 ring-1 ring-brand-100' : 'border-sand-200 hover:border-brand-200')
-      }
-    >
-      <button
-        type="button"
-        onClick={(event) => {
-          event.preventDefault()
-          event.stopPropagation()
-          onTogglePin()
-        }}
-        className={
-          'absolute right-2 top-2 z-10 rounded-full border p-1.5 transition ' +
-          (pinned
-            ? 'border-brand-200 bg-brand-50 text-brand-600 hover:bg-brand-100'
-            : 'border-sand-200 bg-white/95 text-sand-500 opacity-0 hover:bg-gray-50 hover:text-brand-600 group-hover:opacity-100')
-        }
-        title={pinned ? '取消置顶' : '置顶媒体库'}
-        aria-label={pinned ? '取消置顶' : '置顶媒体库'}
-        aria-pressed={pinned}
-      >
-        <Pin size={14} className={pinned ? 'fill-current' : ''} />
-      </button>
-      <Link
-        to={`/library/${library.id}`}
-        className="flex min-w-0 flex-1"
-        title={library.name}
-      >
-      <div className={`grid h-20 w-24 sm:h-24 sm:w-36 shrink-0 gap-1 overflow-hidden rounded-xl sm:rounded-2xl bg-[linear-gradient(135deg,#fff7ed,#f8fafc)] ${artwork.length > 1 ? 'grid-cols-2' : 'grid-cols-1'}`}>
-        {artwork.length > 0 ? (
-          artwork.map(({ src, version }, index) => (
-            <img
-              key={`${src}-${index}`}
-              src={imageURL(
-                src,
-                version,
-                library.cover_url ? undefined : { maxWidth: 400, maxHeight: 300, quality: 78 },
-              )}
-              alt=""
-              loading="lazy"
-              referrerPolicy="no-referrer"
-              className="h-full w-full object-cover"
-              onError={(event) => { event.currentTarget.style.visibility = 'hidden' }}
-            />
-          ))
-        ) : (
-          <div className="col-span-2 flex h-full items-center justify-center text-brand-500">
-            {TYPE_ICONS[library.type] ?? <FolderOpen size={28} className="sm:h-8 sm:w-8" />}
-          </div>
-        )}
-      </div>
-      <div className="flex min-w-0 flex-1 flex-col justify-between px-3 sm:px-4 py-0.5 sm:py-1">
-        <div>
-          <div className="mb-1 flex items-center justify-between gap-1.5 pr-8">
-            <span className="inline-flex rounded-full bg-sand-100 px-2 py-0.5 text-[10px] font-bold text-sand-600">
-              {TYPE_LABELS[library.type] ?? library.type}
-            </span>
-            <span className="text-[11px] font-semibold text-sand-500 sm:hidden">
-              {preview.total.toLocaleString()} 个条目
-            </span>
-          </div>
-          <h2
-            className="line-clamp-2 break-words font-display text-sm font-bold leading-snug text-ink-600 group-hover:text-brand-600 sm:text-base lg:text-lg sm:font-black"
-            title={library.name}
-          >
-            {library.name}
-            {pinned ? <span className="ml-1.5 align-middle text-[10px] font-bold text-brand-600">置顶</span> : null}
-          </h2>
-          <p className="mt-0.5 line-clamp-1 break-all text-[11px] text-ink-50 sm:mt-1 sm:text-xs" title={library.path}>
-            {displayPath}
-          </p>
-        </div>
-        <div className="mt-1 flex items-center justify-between text-xs font-bold sm:mt-0">
-          <span className="hidden text-sand-600 sm:inline">{preview.total.toLocaleString()} 个条目</span>
-          <span className="ml-auto inline-flex items-center gap-0.5 text-[11px] text-brand-600 sm:text-xs">
-            浏览全部 <ArrowRight size={12} />
-          </span>
-        </div>
-      </div>
-      </Link>
-    </div>
-  )
-}
-
-function LibraryShelf({ preview, pinned }: { preview: LibraryPreview; pinned?: boolean }) {
-  const library = preview.library
-  const cards = preview.cards.slice(0, 10)
-  const displayPath = libraryDisplayPath(library.path)
-
-  return (
-    <section className="rounded-2xl sm:rounded-[1.7rem] border border-sand-200 bg-white/75 p-3.5 sm:p-4 shadow-card">
-      <div className="mb-3 sm:mb-4 flex flex-wrap items-end justify-between gap-2 sm:gap-3">
-        <div className="min-w-0">
-          <div className="mb-1 inline-flex items-center gap-1.5 sm:gap-2 rounded-full bg-brand-50 px-2 sm:px-2.5 py-0.5 sm:py-1 text-[10px] sm:text-[11px] font-bold text-brand-700">
-            {TYPE_ICONS[library.type] ?? <LibraryIcon size={14} />}
-            {TYPE_LABELS[library.type] ?? library.type}
-          </div>
-          <h2
-            className="line-clamp-2 break-words font-display text-xl sm:text-2xl font-black text-ink-600"
-            title={library.name}
-          >
-            {library.name}
-            {pinned ? <span className="ml-2 align-middle text-xs font-bold text-brand-600">置顶</span> : null}
-          </h2>
-          <p className="mt-1 line-clamp-1 break-all text-xs text-ink-50">
-            <span title={library.path}>{displayPath}</span> · {preview.total.toLocaleString()} 个条目 · 最新 {cards.length} 部
-          </p>
-        </div>
-        <Link to={`/library/${library.id}`} className="btn-outline !px-3 !py-1.5 text-xs sm:!px-4 sm:!py-2.5 sm:text-sm shrink-0">
-          浏览全部
-          <ArrowRight size={14} />
-        </Link>
-      </div>
-
-      {cards.length > 0 ? (
-        <div className="flex gap-4 overflow-x-auto pb-2 pr-1">
-          {cards.map((card) => (
-            <div key={card.key} className="w-[9.5rem] shrink-0 lg:w-[10rem] 2xl:w-[10.5rem]">
-              <MediaCard
-                media={card.rep}
-                count={card.count}
-                linkTo={seriesCardLink(card)}
-              />
-            </div>
-          ))}
-        </div>
-      ) : (
-        <div className="rounded-2xl border border-dashed border-sand-200 bg-white px-6 py-10 text-center text-sm text-ink-50">
-          该目录暂无可展示内容，扫描媒体库后会出现在这里。
-        </div>
-      )}
-    </section>
-  )
-}
@@ -19,6 +19,7 @@ import { profileAPI } from '../api/profile'
 import { useAuthStore } from '../stores/auth'
 import type { Media, PlaybackInfo, PlaybackQuality } from '../types'
 import { getSeriesKey, seriesTitleFromPath } from '../utils/groupSeries'
+import { normalizePlaybackRate } from '../utils/playbackRate'
 import { isRemoteEmbyID } from '../utils/remoteEmby'
 import {
  normalizeSubtitleChineseMode,
@@ -109,8 +110,13 @@ export function PlayerPage() {
  const [playerVolume, setPlayerVolume] = useState(() =>
    normalizePlayerVolume(authUser?.player_volume),
  )
+  const [playerPlaybackRate, setPlayerPlaybackRate] = useState(() =>
+    normalizePlaybackRate(authUser?.player_playback_rate),
+  )
  const persistedSubtitleChineseModeRef = useRef(subtitleChineseMode)
  const playerVolumeTouchedRef = useRef(false)
+  const playerPlaybackRateTouchedRef = useRef(false)
+  const playerPlaybackRateSaveSeqRef = useRef(0)
  const subtitlePreferenceTouchedRef = useRef(false)
  const subtitlePreferenceSaveQueueRef = useRef<Promise<void>>(Promise.resolve())
  const [hlsUnavailable, setHlsUnavailable] = useState(false)
@@ -245,6 +251,10 @@ export function PlayerPage() {
        if (!playerVolumeTouchedRef.current) {
          setPlayerVolume(volume)
        }
+        const playbackRate = normalizePlaybackRate(cfg.playback_rate)
+        if (!playerPlaybackRateTouchedRef.current) {
+          setPlayerPlaybackRate(playbackRate)
+        }
        setDanmakuEnabled(cfg.enabled)
        setDanmakuOpacity(Number(cfg.opacity) || 1)
        setDanmakuFontSize(Number(cfg.font_size) || 24)
@@ -255,6 +265,10 @@ export function PlayerPage() {
          const current = useAuthStore.getState().user
          if (current) setAuthUser({ ...current, player_volume: volume })
        }
+        if (!playerPlaybackRateTouchedRef.current) {
+          const current = useAuthStore.getState().user
+          if (current) setAuthUser({ ...current, player_playback_rate: playbackRate })
+        }
      })
      .catch(() => {
        // 配置读取失败时保持本地默认值，不影响播放。
@@ -289,6 +303,34 @@ export function PlayerPage() {
    [setAuthUser],
  )

+  const changePlayerPlaybackRate = useCallback((next: number) => {
+    playerPlaybackRateTouchedRef.current = true
+    setPlayerPlaybackRate(normalizePlaybackRate(next))
+  }, [])
+
+  const commitPlayerPlaybackRate = useCallback(
+    (next: number) => {
+      playerPlaybackRateTouchedRef.current = true
+      const playbackRate = normalizePlaybackRate(next)
+      setPlayerPlaybackRate(playbackRate)
+      const saveSeq = ++playerPlaybackRateSaveSeqRef.current
+      void danmakuAPI
+        .updateSettings({ playback_rate: playbackRate })
+        .then((cfg) => {
+          if (saveSeq !== playerPlaybackRateSaveSeqRef.current) return
+          const saved = normalizePlaybackRate(cfg.playback_rate)
+          setPlayerPlaybackRate(saved)
+          const current = useAuthStore.getState().user
+          if (current) setAuthUser({ ...current, player_playback_rate: saved })
+        })
+        .catch(() => {
+          if (saveSeq !== playerPlaybackRateSaveSeqRef.current) return
+          toast.error('倍速保存失败，请重试')
+        })
+    },
+    [setAuthUser],
+  )
+
  const saveDanmakuAdvanced = useCallback(
    async (values: { source: string; appId: string; appKey: string; clearAppKey: boolean }) => {
      const patch: DanmakuSettingsPatch = {
@@ -1424,6 +1466,9 @@ export function PlayerPage() {
        playerVolume={playerVolume}
        onPlayerVolumeChange={changePlayerVolume}
        onPlayerVolumeCommit={commitPlayerVolume}
+        playerPlaybackRate={playerPlaybackRate}
+        onPlayerPlaybackRateChange={changePlayerPlaybackRate}
+        onPlayerPlaybackRateCommit={commitPlayerPlaybackRate}
        danmakuEnabled={danmakuEnabled}
        danmakuOpacity={danmakuOpacity}
        danmakuFontSize={danmakuFontSize}
@@ -151,6 +151,9 @@ type PlayerVideoStageProps = {
  playerVolume: number
  onPlayerVolumeChange: (volume: number) => void
  onPlayerVolumeCommit: (volume: number) => void
+  playerPlaybackRate: number
+  onPlayerPlaybackRateChange: (rate: number) => void
+  onPlayerPlaybackRateCommit: (rate: number) => void
  danmakuEnabled: boolean
  danmakuOpacity: number
  danmakuFontSize: number
@@ -205,6 +208,9 @@ export function PlayerVideoStage({
  playerVolume,
  onPlayerVolumeChange,
  onPlayerVolumeCommit,
+  playerPlaybackRate,
+  onPlayerPlaybackRateChange,
+  onPlayerPlaybackRateCommit,
  danmakuEnabled,
  danmakuOpacity,
  danmakuFontSize,
@@ -653,6 +659,9 @@ export function PlayerVideoStage({
            volume={playerVolume}
            onVolumeChange={onPlayerVolumeChange}
            onVolumeCommit={onPlayerVolumeCommit}
+            playbackRate={playerPlaybackRate}
+            onPlaybackRateChange={onPlayerPlaybackRateChange}
+            onPlaybackRateCommit={onPlayerPlaybackRateCommit}
            uiVisible={controlsVisible}
            onUiVisibleChange={setControlsVisible}
            subs={subs}
@@ -86,7 +86,7 @@ export function useLibraryData(

      const seriesMode = isSeriesLibraryType(lib.type)
      modeRef.current = seriesMode ? 'series' : 'media'
-      const pageSize = pageSizeFor(lib, seriesMode)
+      const pageSize = pageSizeFor(lib)
      try {
        if (seriesMode) {
          const data = await libraryAPI.listSeries(libraryID, 1, pageSize, { sort: sortField, order: sortOrder })
@@ -155,7 +155,7 @@ export function useLibraryData(
    try {
      const page = nextPageRef.current
      if (modeRef.current === 'series') {
-        const data = await libraryAPI.listSeries(libraryID, page, pageSizeFor(lib, true), {
+        const data = await libraryAPI.listSeries(libraryID, page, pageSizeFor(lib), {
          sort: sortField,
          order: sortOrder,
        })
@@ -167,7 +167,7 @@ export function useLibraryData(
        nextPageRef.current = page + 1
        hasMoreRef.current = pageItems.length > 0 && loadedCountRef.current < totalRef.current
      } else {
-        const data = await libraryAPI.listMedia(libraryID, page, pageSizeFor(lib, false), {
+        const data = await libraryAPI.listMedia(libraryID, page, pageSizeFor(lib), {
          sort: sortField,
          order: sortOrder,
        })
@@ -238,9 +238,11 @@ function isSeriesLibraryType(type?: string) {
  return type === 'tv' || type === 'anime' || type === 'variety'
 }

-function pageSizeFor(lib: Library, seriesMode: boolean): number {
-  if (lib.is_remote_emby) return 100
-  return seriesMode ? 500 : 2000
+function pageSizeFor(lib: Library): number {
+  // 首屏保持一屏多一点，后续统一由底部哨兵按页追加。此前沿用旧的
+  // 500/2000 批量值，会让中小型媒体库在第一次请求时就等于全量加载。
+  if (lib.is_remote_emby) return 50
+  return 60
 }

 function yieldToBrowser(): Promise<void> {
@@ -251,4 +253,4 @@ function yieldToBrowser(): Promise<void> {
      setTimeout(resolve, 0)
    }
  })
-}
+}
@@ -10,6 +10,8 @@ export interface User {
  subtitle_chinese_mode?: 'original' | 'simplified' | 'traditional'
  /** 本地缓存的播放器音量，服务端配置接口会刷新。 */
  player_volume?: number
+  /** 本地缓存的播放倍速，服务端配置接口会刷新。 */
+  player_playback_rate?: number
  force_password_reset: boolean
  is_active: boolean
  allowed_library_ids?: string[]
@@ -460,7 +460,7 @@ export function groupSeries(items: Media[] = []): SeriesCard[] {
            ? compactSeriesKey(externalKey)
            : getSeriesKey(m)

-    const mAddedAt = m.created_at || m.updated_at || ''
+    const mAddedAt = m.updated_at || m.created_at || ''
    const g = groups.get(key)
    if (!g) {
      groups.set(key, { key, rep: m, linkMedia: m, count: 1, last_added_at: mAddedAt })
@@ -114,7 +114,7 @@ export function sortMediaList(
      case 'created_at':
        return compareDates(a.created_at, b.created_at, order) || compareStrings(a.title, b.title, 'asc')
      case 'updated_at':
-        return compareDates(a.created_at || a.updated_at, b.created_at || b.updated_at, order) || compareStrings(a.title, b.title, 'asc')
+        return compareDates(a.updated_at || a.created_at, b.updated_at || b.created_at, order) || compareStrings(a.title, b.title, 'asc')
      case 'rating':
      case 'imdb_rating': {
        const cmp = compareNumbers(a.rating || 0, b.rating || 0, order)
@@ -0,0 +1,22 @@
+import {
+  formatPlaybackRate,
+  normalizePlaybackRate,
+  stepPlaybackRate,
+} from './playbackRate.ts'
+
+function check(name: string, condition: boolean) {
+  if (!condition) throw new Error(`playbackRate: ${name}`)
+}
+
+check('invalid value falls back to 1x', normalizePlaybackRate(undefined) === 1)
+check('value snaps to nearest selectable rate', normalizePlaybackRate(1.2) === 1.25)
+check('value below range clamps to the minimum', normalizePlaybackRate(0.1) === 0.5)
+check('value above range clamps to the maximum', normalizePlaybackRate(9) === 3)
+check('up steps to the next rate', stepPlaybackRate(1, 1) === 1.25)
+check('down steps to the previous rate', stepPlaybackRate(1, -1) === 0.75)
+check('up stops at the maximum', stepPlaybackRate(3, 1) === 3)
+check('down stops at the minimum', stepPlaybackRate(0.5, -1) === 0.5)
+check('integer formatting', formatPlaybackRate(1) === '1x')
+check('decimal formatting', formatPlaybackRate(1.25) === '1.25x')
+
+console.log('playbackRate.test.ts ok')
@@ -0,0 +1,31 @@
+export const PLAYBACK_RATE_OPTIONS = [0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 2.5, 3] as const
+
+export const MIN_PLAYBACK_RATE = PLAYBACK_RATE_OPTIONS[0]
+export const MAX_PLAYBACK_RATE = PLAYBACK_RATE_OPTIONS[PLAYBACK_RATE_OPTIONS.length - 1]
+
+export function normalizePlaybackRate(value: unknown): number {
+  const parsed = Number(value)
+  if (!Number.isFinite(parsed)) return 1
+  let closest: number = PLAYBACK_RATE_OPTIONS[0]
+  let closestDistance = Number.POSITIVE_INFINITY
+  for (const option of PLAYBACK_RATE_OPTIONS) {
+    const distance = Math.abs(option - parsed)
+    if (distance < closestDistance) {
+      closest = option
+      closestDistance = distance
+    }
+  }
+  return closest
+}
+
+export function stepPlaybackRate(current: unknown, direction: 1 | -1): number {
+  const normalized = normalizePlaybackRate(current)
+  const index = PLAYBACK_RATE_OPTIONS.indexOf(normalized as (typeof PLAYBACK_RATE_OPTIONS)[number])
+  const next = Math.min(PLAYBACK_RATE_OPTIONS.length - 1, Math.max(0, index + direction))
+  return PLAYBACK_RATE_OPTIONS[next]
+}
+
+export function formatPlaybackRate(rate: unknown): string {
+  const normalized = normalizePlaybackRate(rate)
+  return `${Number.isInteger(normalized) ? normalized.toFixed(0) : String(normalized)}x`
+}
Author	SHA1	Message	Date
truewhile	c911a57467	bug处理	2026-09-15 09:58:47 +08:00
truewhile	1dbc3f8fe7	Merge branch 'main' of https://github.com/truewhile/MeBox	2026-09-15 00:00:54 +08:00
truewhile	a563ee11d6	优化，添加滚动记忆	2026-09-15 00:00:35 +08:00
truewhile	215ebf6942	Merge pull request #33 from truewhile/cursor/fix-library-scrape-dialog-position 优化	2026-09-14 22:55:16 +08:00
truewhile	e4c0e85eaa	优化	2026-09-14 22:54:09 +08:00
truewhile	60f05129c9	优化	2026-09-14 21:56:47 +08:00
truewhile	fa4c90d47a	bug处理	2026-09-14 21:40:13 +08:00