fix: stabilize library paths and subscription matching

2026-09-30 03:36:37 +08:00 · 2026-06-28 12:15:10 +08:00
parent e4abb03ca5
commit a97dc35790
102 changed files with 4582 additions and 1519 deletions
@@ -0,0 +1,204 @@
+import { Link } from 'react-router-dom'
+import { Menu, MessageSquareText, Search, Sparkles } from 'lucide-react'
+
+import type { PlayProfile, User } from '../types'
+import { LayoutSearchBox } from './LayoutSearchBox'
+import { LayoutThemeToggle } from './LayoutThemeToggle'
+import { LayoutUserMenu } from './LayoutUserMenu'
+import type { useLayoutProfiles } from './useLayoutProfiles'
+import type { useLayoutSearch } from './useLayoutSearch'
+import type { ThemeMode, useThemeMode } from './useThemeMode'
+
+type LayoutSearchState = ReturnType<typeof useLayoutSearch>
+type LayoutProfileState = ReturnType<typeof useLayoutProfiles>
+type LayoutThemeState = ReturnType<typeof useThemeMode>
+
+type LayoutPermissionState = {
+  can: (key: string) => boolean
+  isAdmin: boolean
+}
+
+type LayoutHeaderProps = {
+  search: LayoutSearchState
+  permissions: LayoutPermissionState
+  theme: LayoutThemeState
+  onOpenMobileDrawer: () => void
+  user: User | null | undefined
+  activeProfileId: string | null
+  profile: LayoutProfileState
+  onLogout: () => void
+}
+
+export function LayoutHeader({
+  search,
+  permissions,
+  theme,
+  onOpenMobileDrawer,
+  user,
+  activeProfileId,
+  profile,
+  onLogout,
+}: LayoutHeaderProps) {
+  return (
+    <header className="flex h-20 shrink-0 items-center justify-between border-b border-[var(--app-border)] bg-[var(--app-header-bg)] px-4 backdrop-blur-md z-30 md:px-8">
+      <LayoutHeaderSearch search={search} onOpenMobileDrawer={onOpenMobileDrawer} />
+      <LayoutHeaderActions
+        permissions={permissions}
+        themeMode={theme.mode}
+        onThemeChange={theme.setMode}
+        user={user}
+        isProfileOpen={profile.isProfileOpen}
+        profiles={profile.profiles}
+        activeProfileId={activeProfileId}
+        activeProfile={profile.activeProfile}
+        onToggleProfile={() => profile.setIsProfileOpen((open) => !open)}
+        onCloseProfile={() => profile.setIsProfileOpen(false)}
+        onUseDefaultProfile={profile.useDefaultProfile}
+        onSwitchProfile={profile.switchProfile}
+        onLogout={onLogout}
+      />
+    </header>
+  )
+}
+
+function LayoutHeaderSearch({
+  search,
+  onOpenMobileDrawer,
+}: {
+  search: LayoutSearchState
+  onOpenMobileDrawer: () => void
+}) {
+  return (
+    <div className="flex items-center gap-3 flex-1 max-w-lg md:gap-4">
+      <button
+        onClick={onOpenMobileDrawer}
+        className="rounded-xl border border-[var(--app-border)] p-2.5 text-[var(--app-muted)] hover:bg-[var(--app-hover)] hover:text-[var(--app-text)] transition-colors lg:hidden"
+      >
+        <Menu size={18} />
+      </button>
+      <LayoutSearchBox
+        query={search.query}
+        focused={search.focused}
+        loading={search.loading}
+        error={search.error}
+        cards={search.cards}
+        total={search.total}
+        onQueryChange={search.setQuery}
+        onFocusedChange={search.setFocused}
+        onSubmit={search.submit}
+      />
+    </div>
+  )
+}
+
+type LayoutHeaderActionsProps = {
+  permissions: LayoutPermissionState
+  themeMode: ThemeMode
+  onThemeChange: (mode: ThemeMode) => void
+  user: User | null | undefined
+  isProfileOpen: boolean
+  profiles: PlayProfile[]
+  activeProfileId: string | null
+  activeProfile: PlayProfile | null
+  onToggleProfile: () => void
+  onCloseProfile: () => void
+  onUseDefaultProfile: () => void
+  onSwitchProfile: (profile: PlayProfile) => void
+  onLogout: () => void
+}
+
+function LayoutHeaderActions({
+  permissions,
+  themeMode,
+  onThemeChange,
+  user,
+  isProfileOpen,
+  profiles,
+  activeProfileId,
+  activeProfile,
+  onToggleProfile,
+  onCloseProfile,
+  onUseDefaultProfile,
+  onSwitchProfile,
+  onLogout,
+}: LayoutHeaderActionsProps) {
+  return (
+    <div className="flex shrink-0 items-center gap-2 sm:gap-3 md:gap-4">
+      <LayoutQuickActions permissions={permissions} />
+      <LayoutThemeToggle mode={themeMode} onChange={onThemeChange} />
+      <span className="hidden h-6 w-px bg-[var(--app-border)] sm:block" />
+      <LayoutProfileMenu
+        user={user}
+        isProfileOpen={isProfileOpen}
+        profiles={profiles}
+        activeProfileId={activeProfileId}
+        activeProfile={activeProfile}
+        onToggleProfile={onToggleProfile}
+        onCloseProfile={onCloseProfile}
+        onUseDefaultProfile={onUseDefaultProfile}
+        onSwitchProfile={onSwitchProfile}
+        onLogout={onLogout}
+      />
+    </div>
+  )
+}
+
+function LayoutQuickActions({ permissions }: { permissions: LayoutPermissionState }) {
+  return (
+    <>
+      <Link
+        to="/search"
+        className="rounded-xl border border-[var(--app-border)] p-2.5 text-[var(--app-muted)] hover:bg-[var(--app-hover)] hover:text-[var(--app-text)] transition-colors sm:hidden"
+      >
+        <Search size={18} />
+      </Link>
+      {permissions.can('can_view_discover') && (
+        <Link
+          to="/discover"
+          className="hidden md:flex items-center gap-2 rounded-xl border border-[var(--app-border)] px-4 py-2.5 text-xs font-bold text-[var(--app-muted)] hover:bg-[var(--app-hover)] hover:text-[var(--app-text)] transition-all"
+        >
+          <Sparkles size={14} className="text-brand-500" />
+          <span>发现新片</span>
+        </Link>
+      )}
+      {permissions.isAdmin && (
+        <Link
+          to="/notify-channels"
+          title="通知配置"
+          aria-label="打开通知配置"
+          className="relative rounded-xl border border-[var(--app-border)] p-2.5 text-[var(--app-muted)] hover:bg-[var(--app-hover)] hover:text-[var(--app-text)] transition-all"
+        >
+          <MessageSquareText size={18} />
+        </Link>
+      )}
+    </>
+  )
+}
+
+function LayoutProfileMenu({
+  user,
+  isProfileOpen,
+  profiles,
+  activeProfileId,
+  activeProfile,
+  onToggleProfile,
+  onCloseProfile,
+  onUseDefaultProfile,
+  onSwitchProfile,
+  onLogout,
+}: Omit<LayoutHeaderActionsProps, 'permissions' | 'themeMode' | 'onThemeChange'>) {
+  return (
+    <LayoutUserMenu
+      user={user}
+      isOpen={isProfileOpen}
+      profiles={profiles}
+      activeProfileId={activeProfileId}
+      activeProfile={activeProfile}
+      onToggle={onToggleProfile}
+      onClose={onCloseProfile}
+      onUseDefaultProfile={onUseDefaultProfile}
+      onSwitchProfile={onSwitchProfile}
+      onLogout={onLogout}
+    />
+  )
+}
@@ -1,29 +1,12 @@
-import { Link, Outlet } from 'react-router-dom'
+import { Outlet } from 'react-router-dom'
 import { AnimatePresence, motion } from 'framer-motion'
-import { Menu, MessageSquareText, Search, Sparkles } from 'lucide-react'
 import clsx from 'clsx'

-import type { PlayProfile, User } from '../types'
 import { AppFooter } from './AppFooter'
-import { LayoutSearchBox } from './LayoutSearchBox'
 import { LayoutSidebarContent, type LayoutSidebarContentProps } from './LayoutSidebarContent'
-import { LayoutThemeToggle } from './LayoutThemeToggle'
-import { LayoutUserMenu } from './LayoutUserMenu'
-import type { ThemeMode } from './useThemeMode'
-import type { useLayoutSearch } from './useLayoutSearch'
-import type { useLayoutProfiles } from './useLayoutProfiles'
 import type { useLayoutSidebar } from './useLayoutSidebar'
-import type { useThemeMode } from './useThemeMode'

-type LayoutSearchState = ReturnType<typeof useLayoutSearch>
-type LayoutProfileState = ReturnType<typeof useLayoutProfiles>
 type LayoutSidebarState = ReturnType<typeof useLayoutSidebar>
-type LayoutThemeState = ReturnType<typeof useThemeMode>
-
-type LayoutPermissionState = {
-  can: (key: string) => boolean
-  isAdmin: boolean
-}

 type LayoutSidebarProps = {
  children: React.ReactNode
@@ -36,17 +19,6 @@ type LayoutMobileSidebarProps = {
  onClose: () => void
 }

-type LayoutHeaderProps = {
-  search: LayoutSearchState
-  permissions: LayoutPermissionState
-  theme: LayoutThemeState
-  onOpenMobileDrawer: () => void
-  user: User | null | undefined
-  activeProfileId: string | null
-  profile: LayoutProfileState
-  onLogout: () => void
-}
-
 type LayoutSidebarsProps = Omit<
  LayoutSidebarContentProps,
  'isSidebarOpen' | 'isMobileDrawerOpen' | 'openGroups' | 'isRouteIn' | 'onToggleGroup' | 'onToggleSidebar' | 'onCloseMobileDrawer'
@@ -58,6 +30,8 @@ type LayoutWorkspaceProps = {
  routeKey: string
 }

+export { LayoutHeader } from './LayoutHeaderSections'
+
 export function LayoutDesktopSidebar({ children, isSidebarOpen }: LayoutSidebarProps) {
  return (
    <aside
@@ -134,38 +108,6 @@ export function LayoutSidebars({
  )
 }

-export function LayoutHeader({
-  search,
-  permissions,
-  theme,
-  onOpenMobileDrawer,
-  user,
-  activeProfileId,
-  profile,
-  onLogout,
-}: LayoutHeaderProps) {
-  return (
-    <header className="flex h-20 shrink-0 items-center justify-between border-b border-[var(--app-border)] bg-[var(--app-header-bg)] px-4 backdrop-blur-md z-30 md:px-8">
-      <LayoutHeaderSearch search={search} onOpenMobileDrawer={onOpenMobileDrawer} />
-      <LayoutHeaderActions
-        permissions={permissions}
-        themeMode={theme.mode}
-        onThemeChange={theme.setMode}
-        user={user}
-        isProfileOpen={profile.isProfileOpen}
-        profiles={profile.profiles}
-        activeProfileId={activeProfileId}
-        activeProfile={profile.activeProfile}
-        onToggleProfile={() => profile.setIsProfileOpen((open) => !open)}
-        onCloseProfile={() => profile.setIsProfileOpen(false)}
-        onUseDefaultProfile={profile.useDefaultProfile}
-        onSwitchProfile={profile.switchProfile}
-        onLogout={onLogout}
-      />
-    </header>
-  )
-}
-
 export function LayoutWorkspace({ routeKey }: LayoutWorkspaceProps) {
  return (
    <main className="flex-1 overflow-y-auto px-4 py-6 md:px-8 md:py-10">
@@ -193,145 +135,3 @@ export function LayoutFrameFooter() {
 }

 export { LayoutSidebarContent }
-
-function LayoutHeaderSearch({
-  search,
-  onOpenMobileDrawer,
-}: {
-  search: LayoutSearchState
-  onOpenMobileDrawer: () => void
-}) {
-  return (
-    <div className="flex items-center gap-3 flex-1 max-w-lg md:gap-4">
-      <button
-        onClick={onOpenMobileDrawer}
-        className="rounded-xl border border-[var(--app-border)] p-2.5 text-[var(--app-muted)] hover:bg-[var(--app-hover)] hover:text-[var(--app-text)] transition-colors lg:hidden"
-      >
-        <Menu size={18} />
-      </button>
-      <LayoutSearchBox
-        query={search.query}
-        focused={search.focused}
-        loading={search.loading}
-        error={search.error}
-        cards={search.cards}
-        total={search.total}
-        onQueryChange={search.setQuery}
-        onFocusedChange={search.setFocused}
-        onSubmit={search.submit}
-      />
-    </div>
-  )
-}
-
-type LayoutHeaderActionsProps = {
-  permissions: LayoutPermissionState
-  themeMode: ThemeMode
-  onThemeChange: (mode: ThemeMode) => void
-  user: User | null | undefined
-  isProfileOpen: boolean
-  profiles: PlayProfile[]
-  activeProfileId: string | null
-  activeProfile: PlayProfile | null
-  onToggleProfile: () => void
-  onCloseProfile: () => void
-  onUseDefaultProfile: () => void
-  onSwitchProfile: (profile: PlayProfile) => void
-  onLogout: () => void
-}
-
-function LayoutHeaderActions({
-  permissions,
-  themeMode,
-  onThemeChange,
-  user,
-  isProfileOpen,
-  profiles,
-  activeProfileId,
-  activeProfile,
-  onToggleProfile,
-  onCloseProfile,
-  onUseDefaultProfile,
-  onSwitchProfile,
-  onLogout,
-}: LayoutHeaderActionsProps) {
-  return (
-    <div className="flex shrink-0 items-center gap-2 sm:gap-3 md:gap-4">
-      <LayoutQuickActions permissions={permissions} />
-      <LayoutThemeToggle mode={themeMode} onChange={onThemeChange} />
-      <span className="hidden h-6 w-px bg-[var(--app-border)] sm:block" />
-      <LayoutProfileMenu
-        user={user}
-        isProfileOpen={isProfileOpen}
-        profiles={profiles}
-        activeProfileId={activeProfileId}
-        activeProfile={activeProfile}
-        onToggleProfile={onToggleProfile}
-        onCloseProfile={onCloseProfile}
-        onUseDefaultProfile={onUseDefaultProfile}
-        onSwitchProfile={onSwitchProfile}
-        onLogout={onLogout}
-      />
-    </div>
-  )
-}
-
-function LayoutQuickActions({ permissions }: { permissions: LayoutPermissionState }) {
-  return (
-    <>
-      <Link
-        to="/search"
-        className="rounded-xl border border-[var(--app-border)] p-2.5 text-[var(--app-muted)] hover:bg-[var(--app-hover)] hover:text-[var(--app-text)] transition-colors sm:hidden"
-      >
-        <Search size={18} />
-      </Link>
-      {permissions.can('can_view_discover') && (
-        <Link
-          to="/discover"
-          className="hidden md:flex items-center gap-2 rounded-xl border border-[var(--app-border)] px-4 py-2.5 text-xs font-bold text-[var(--app-muted)] hover:bg-[var(--app-hover)] hover:text-[var(--app-text)] transition-all"
-        >
-          <Sparkles size={14} className="text-brand-500" />
-          <span>发现新片</span>
-        </Link>
-      )}
-      {permissions.isAdmin && (
-        <Link
-          to="/notify-channels"
-          title="通知配置"
-          aria-label="打开通知配置"
-          className="relative rounded-xl border border-[var(--app-border)] p-2.5 text-[var(--app-muted)] hover:bg-[var(--app-hover)] hover:text-[var(--app-text)] transition-all"
-        >
-          <MessageSquareText size={18} />
-        </Link>
-      )}
-    </>
-  )
-}
-
-function LayoutProfileMenu({
-  user,
-  isProfileOpen,
-  profiles,
-  activeProfileId,
-  activeProfile,
-  onToggleProfile,
-  onCloseProfile,
-  onUseDefaultProfile,
-  onSwitchProfile,
-  onLogout,
-}: Omit<LayoutHeaderActionsProps, 'permissions' | 'themeMode' | 'onThemeChange'>) {
-  return (
-    <LayoutUserMenu
-      user={user}
-      isOpen={isProfileOpen}
-      profiles={profiles}
-      activeProfileId={activeProfileId}
-      activeProfile={activeProfile}
-      onToggle={onToggleProfile}
-      onClose={onCloseProfile}
-      onUseDefaultProfile={onUseDefaultProfile}
-      onSwitchProfile={onSwitchProfile}
-      onLogout={onLogout}
-    />
-  )
-}
@@ -1,6 +1,5 @@
 import type { LucideIcon } from 'lucide-react'
 import {
-  Activity,
  Cast,
  Clock,
  CloudDownload,
@@ -13,15 +12,12 @@ import {
  KeySquare,
  Library,
  ListMusic,
-  MessageSquareText,
  Rss,
  Search,
  Settings,
  Sliders,
  Sparkles,
-  Trash2,
  User,
-  UserCog,
 } from 'lucide-react'

 export type LayoutNavGroupID = 'media' | 'personal' | 'downloads' | 'tools' | 'system'
@@ -69,20 +65,17 @@ export const LAYOUT_NAV_GROUPS: LayoutNavGroup[] = [
      { to: '/favourites', label: '我的收藏', icon: Heart },
      { to: '/playlists', label: '播放列表', icon: ListMusic },
      { to: '/history', label: '观看历史', icon: Clock },
-      { to: '/profile', label: '账号信息', icon: User },
-      { to: '/play-profiles', label: '观影 Profile', icon: UserCog },
    ],
  },
  {
    id: 'downloads',
    label: '下载与订阅',
    icon: CloudDownload,
-    activePaths: ['/downloads', '/download-clients', '/subscriptions', '/site-search'],
+    activePaths: ['/downloads', '/download-clients', '/subscriptions', '/site-search', '/sites'],
    items: [
      { to: '/downloads', label: '下载中心', icon: CloudDownload, permission: 'can_manage_downloads' },
      { to: '/subscriptions', label: '订阅管理', icon: Rss, permission: 'can_manage_subscriptions' },
-      { to: '/site-search', label: '站点检索', icon: Search, permission: 'can_manage_sites' },
-      { to: '/download-clients', label: '下载器管理', icon: Sliders, adminOnly: true },
+      { to: '/sites', label: '站点管理', icon: Globe, permission: 'can_manage_sites' },
    ],
  },
  {
@@ -93,14 +86,6 @@ export const LAYOUT_NAV_GROUPS: LayoutNavGroup[] = [
    adminOnly: true,
    items: [
      { to: '/storage', label: '存储与文件', icon: HardDrive },
-      { to: '/storage-config', label: '外部存储', icon: CloudDownload },
-      { to: '/files', label: '文件管理', icon: Library },
-      { to: '/strm', label: 'STRM 管理', icon: Cast },
-      { to: '/duplicates', label: '重复文件', icon: Image },
-      { to: '/tasks', label: '任务队列', icon: Activity },
-      { to: '/scheduler', label: '计划任务', icon: Clock },
-      { to: '/recycle', label: '回收站', icon: Trash2 },
-      { to: '/stats', label: '运行状态', icon: Activity },
    ],
  },
  {
@@ -111,11 +96,8 @@ export const LAYOUT_NAV_GROUPS: LayoutNavGroup[] = [
    adminOnly: true,
    items: [
      { to: '/admin', label: '媒体与用户', icon: Settings },
-      { to: '/sites', label: '站点管理', icon: Globe },
-      { to: '/notify-channels', label: '通知渠道', icon: MessageSquareText },
-      { to: '/assistant', label: 'AI 会话', icon: Sparkles },
-      { to: '/license', label: '授权许可', icon: KeySquare },
      { to: '/settings', label: '系统设置', icon: Sliders },
+      { to: '/license', label: '授权许可', icon: KeySquare },
    ],
  },
 ]