fix media organize and subscription workflows

2026-09-29 11:36:36 +08:00 · 2026-06-30 20:18:02 +08:00
parent b41f62d572
commit 941bb273b9
107 changed files with 5420 additions and 526 deletions
@@ -33,6 +33,11 @@ export interface DiscoverSection {
 export interface DiscoverFeedMeta {
  page: number
  has_next: boolean
+  duration_ms?: number
+  error?: string
+  warning?: string
+  stale?: boolean
+  disabled?: boolean
 }

 export interface DiscoverFeedResult {
@@ -7,6 +7,7 @@ export type GenerateSTRMInput = {
  enabled?: boolean
  overwrite?: boolean
  include_local?: boolean
+  preserve_tree?: boolean
 }

 export type GenerateSTRMResult = {
@@ -27,6 +28,18 @@ export type GenerateSTRMResult = {
  }>
 }

+export type GenerateSTRMTreeInput = {
+  provider: string
+  tree_text?: string
+  paths?: string[]
+  source_root?: string
+  output_prefix?: string
+  output_dir: string
+  base_url?: string
+  overwrite?: boolean
+  cleanup?: boolean
+}
+
 export const strmAPI = {
  set: (mediaID: string, url: string) =>
    api.put(`/media/${mediaID}/strm`, { url }).then((r) => r.data),
@@ -37,4 +50,8 @@ export const strmAPI = {
    api
      .post<GenerateSTRMResult>('/strm/generate', input, { timeout: BATCH_REQUEST_TIMEOUT })
      .then((r) => r.data),
+  generateFromTree: (input: GenerateSTRMTreeInput) =>
+    api
+      .post<GenerateSTRMResult>('/strm/generate-from-tree', input, { timeout: BATCH_REQUEST_TIMEOUT })
+      .then((r) => r.data),
 }
@@ -71,6 +71,11 @@ export const subscriptionsAPI = {
    effects?: string
    release_groups?: string
    exclude_words?: string
+    min_seeders?: number
+    max_seeders?: number
+    min_size_gb?: number
+    max_size_gb?: number
+    free_only?: boolean
    wash_enabled?: boolean
    wash_priority?: string
    total_episodes?: number
@@ -7,8 +7,10 @@ import { DiscoverEmptySelection, DiscoverHeader, DiscoverResults } from './Disco
 import {
  defaultSections,
  discoverStorageKey,
+  readCachedDiscoverRows,
  readSavedSections,
  serializeSavedSections,
+  writeCachedDiscoverRow,
 } from './discoverPageModel'

 export function DiscoverPage() {
@@ -38,8 +40,11 @@ export function DiscoverPage() {
        const available = new Set(items.map((item) => item.key))
        const fallback = defaultSections.filter((key) => available.has(key))
        const nextSelected = saved.length > 0 ? saved : fallback
+        const cached = readCachedDiscoverRows(nextSelected)
        setSelected(nextSelected)
        setRowPages(Object.fromEntries(nextSelected.map((key) => [key, 1])))
+        setRows(cached.rows)
+        setRowCanNext(cached.rowCanNext)
        setSectionsReady(true)
      })
      .catch(() => {
@@ -93,14 +98,31 @@ export function DiscoverPage() {
        .feed([key], page)
        .then((feed) => {
          if (cancelled) return
-          setRows((current) => ({ ...current, [key]: feed.items[key] ?? [] }))
-          setRowCanNext((current) => ({ ...current, [key]: Boolean(feed.meta[key]?.has_next) }))
+          const error = feed.meta[key]?.error
+          const nextItems = feed.items[key] ?? []
+          const nextCanNext = Boolean(feed.meta[key]?.has_next)
+          setRows((current) => {
+            if (error && nextItems.length === 0 && (current[key]?.length ?? 0) > 0) {
+              return current
+            }
+            return { ...current, [key]: nextItems }
+          })
+          setRowCanNext((current) => {
+            if (error && nextItems.length === 0 && key in current) {
+              return current
+            }
+            return { ...current, [key]: nextCanNext }
+          })
+          if (!error) {
+            writeCachedDiscoverRow(key, page, nextItems, nextCanNext)
+          }
+          setRowErrors((current) => updateDiscoverRowError(current, key, error))
        })
        .catch((err) => {
          if (cancelled) return
-          const message = err instanceof Error ? err.message : String(err)
-          setRows((current) => ({ ...current, [key]: [] }))
-          setRowCanNext((current) => ({ ...current, [key]: false }))
+          const message = discoverRequestErrorMessage(err)
+          setRows((current) => ((current[key]?.length ?? 0) > 0 ? current : { ...current, [key]: [] }))
+          setRowCanNext((current) => (key in current ? current : { ...current, [key]: false }))
          setRowErrors((current) => ({ ...current, [key]: message }))
        })
        .finally(() => {
@@ -191,3 +213,27 @@ export function DiscoverPage() {
    </div>
  )
 }
+
+function updateDiscoverRowError(
+  current: Record<string, string>,
+  key: string,
+  error?: string,
+): Record<string, string> {
+  if (error) return { ...current, [key]: error }
+  if (!(key in current)) return current
+  const next = { ...current }
+  delete next[key]
+  return next
+}
+
+function discoverRequestErrorMessage(err: unknown): string {
+  const raw = err instanceof Error ? err.message : String(err)
+  const lower = raw.toLowerCase()
+  if (lower.includes('timeout') || lower.includes('deadline')) {
+    return '推荐源请求超时，已跳过本次加载'
+  }
+  if (lower.includes('network')) {
+    return '推荐源网络不可用，已跳过本次加载'
+  }
+  return '推荐源暂时不可用，已跳过本次加载'
+}
@@ -152,9 +152,10 @@ function DiscoverRowErrors({
  sectionLabel: SectionLabel
 }) {
  return (
-    <div className="flex items-start gap-3 rounded-2xl border border-amber-500/20 bg-amber-500/10 p-4">
-      <AlertTriangle className="mt-0.5 h-5 w-5 flex-shrink-0 text-amber-400" />
-      <div className="space-y-1 text-sm text-amber-200">
+    <div className="flex items-start gap-3 rounded-lg border border-amber-300/70 bg-amber-50 px-3 py-2 text-amber-800 dark:border-amber-500/30 dark:bg-amber-500/10 dark:text-amber-100">
+      <AlertTriangle className="mt-0.5 h-4 w-4 flex-shrink-0 text-amber-500" />
+      <div className="space-y-1 text-xs">
+        <p className="font-semibold">部分推荐源暂不可用，其他已加载内容不受影响。</p>
        {Object.entries(rowErrors).map(([key, message]) => (
          <p key={key}>{sectionLabel(key)}：{message}</p>
        ))}
@@ -23,6 +23,8 @@ export type StrmGenerateSectionProps = {
  autoGenerate: boolean
  savingSettings: boolean
  overwrite: boolean
+  includeLocal: boolean
+  preserveTree: boolean
  generating: boolean
  generateResult: GenerateSTRMResult | null
  playbackStatus: string
@@ -36,6 +38,8 @@ export type StrmGenerateSectionProps = {
  setRedirectProxyEnabled: (value: boolean) => void
  setAutoGenerate: (value: boolean) => void
  setOverwrite: (value: boolean) => void
+  setIncludeLocal: (value: boolean) => void
+  setPreserveTree: (value: boolean) => void
 }

 export function StrmGenerateSection(props: StrmGenerateSectionProps) {
@@ -142,12 +142,16 @@ type StrmGenerateFormProps = Pick<
  | 'baseURL'
  | 'outputDir'
  | 'overwrite'
+  | 'includeLocal'
+  | 'preserveTree'
  | 'generating'
  | 'onGenerate'
  | 'setGenerateLibraryID'
  | 'setBaseURL'
  | 'setOutputDir'
  | 'setOverwrite'
+  | 'setIncludeLocal'
+  | 'setPreserveTree'
 >

 export function StrmGenerateForm({
@@ -156,12 +160,16 @@ export function StrmGenerateForm({
  baseURL,
  outputDir,
  overwrite,
+  includeLocal,
+  preserveTree,
  generating,
  onGenerate,
  setGenerateLibraryID,
  setBaseURL,
  setOutputDir,
  setOverwrite,
+  setIncludeLocal,
+  setPreserveTree,
 }: StrmGenerateFormProps) {
  return (
    <form onSubmit={onGenerate} className="grid gap-3 md:grid-cols-4">
@@ -180,16 +188,13 @@ export function StrmGenerateForm({
      >
        使用当前访问地址
      </button>
-      <label className="flex items-center gap-2 rounded-2xl border border-gray-200 bg-white/70 px-3 py-2 text-sm text-ink-50">
-        <input
-          type="checkbox"
-          checked={overwrite}
-          onChange={(e) => setOverwrite(e.target.checked)}
-        />
-        覆盖已存在
-      </label>
+      <div className="grid gap-2 md:col-span-4 md:grid-cols-3">
+        <CompactOption checked={overwrite} label="覆盖已存在" onChange={setOverwrite} />
+        <CompactOption checked={includeLocal} label="包含本地媒体" onChange={setIncludeLocal} />
+        <CompactOption checked={preserveTree} label="保留目录树" onChange={setPreserveTree} />
+      </div>
      <input
-        className="input-base md:col-span-3"
+        className="input-base md:col-span-4"
        placeholder="输出目录可留空，默认写入 data/strm/分类/子分类"
        value={outputDir}
        onChange={(e) => setOutputDir(e.target.value)}
@@ -202,6 +207,25 @@ export function StrmGenerateForm({
  )
 }

+type CompactOptionProps = {
+  checked: boolean
+  label: string
+  onChange: (value: boolean) => void
+}
+
+function CompactOption({ checked, label, onChange }: CompactOptionProps) {
+  return (
+    <label className="flex min-h-10 items-center gap-2 rounded-2xl border border-gray-200 bg-white/70 px-3 py-2 text-sm text-ink-50">
+      <input
+        type="checkbox"
+        checked={checked}
+        onChange={(e) => onChange(e.target.checked)}
+      />
+      {label}
+    </label>
+  )
+}
+
 type LibrarySelectProps = {
  libraries: Library[]
  value: string
@@ -2,6 +2,7 @@ import { StrmAttachSection } from './StrmAttachSection'
 import { StrmGenerateSection } from './StrmGenerateSection'
 import { StrmImportSection } from './StrmImportSection'
 import { StrmPageHeader } from './StrmPageHeader'
+import { StrmTreeGenerateSection } from './StrmTreeGenerateSection'
 import { useStrmPage } from './useStrmPage'

 // StrmPage exposes the URL-as-file admin tooling backed by the Go server:
@@ -28,6 +29,8 @@ export function StrmPage() {
        autoGenerate={strm.generate.autoGenerate}
        savingSettings={strm.generate.savingSettings}
        overwrite={strm.generate.overwrite}
+        includeLocal={strm.generate.includeLocal}
+        preserveTree={strm.generate.preserveTree}
        generating={strm.generate.generating}
        generateResult={strm.generate.generateResult}
        playbackStatus={strm.generate.playbackStatus}
@@ -41,8 +44,12 @@ export function StrmPage() {
        setRedirectProxyEnabled={strm.generate.setRedirectProxyEnabled}
        setAutoGenerate={strm.generate.setAutoGenerate}
        setOverwrite={strm.generate.setOverwrite}
+        setIncludeLocal={strm.generate.setIncludeLocal}
+        setPreserveTree={strm.generate.setPreserveTree}
      />

+      <StrmTreeGenerateSection {...strm.treeGenerate} />
+
      <StrmImportSection
        libraries={strm.libraries}
        libraryID={strm.importForm.libraryID}
@@ -0,0 +1,182 @@
+import { FolderTree, Loader2, Upload, X } from 'lucide-react'
+
+import { currentOrigin } from './strmPageModel'
+import { StrmGenerateResultPanel } from './StrmGenerateSectionParts'
+import type { useStrmTreeGenerateForm } from './useStrmTreeGenerateForm'
+
+type StrmTreeGenerateSectionProps = ReturnType<typeof useStrmTreeGenerateForm>
+
+const outputPrefixPresets = [
+  '电影/演唱会',
+  '电影/纪录片',
+  '电影/动画电影',
+  '电影/华语电影',
+  '电影/日韩电影',
+  '电影/欧美电影',
+  '电视剧/纪录片',
+  '电视剧/儿童',
+  '电视剧/综艺',
+  '电视剧/国产剧',
+  '电视剧/日韩剧',
+  '电视剧/欧美剧',
+  '动漫/日番',
+  '动漫/国漫',
+  '动漫/韩漫',
+  '动漫/美漫',
+  '动漫/其他',
+  '成人',
+]
+
+export function StrmTreeGenerateSection({
+  baseURL,
+  cleanup,
+  generating,
+  onGenerate,
+  onImportTreeFile,
+  outputDir,
+  outputPrefix,
+  overwrite,
+  pathsText,
+  provider,
+  result,
+  setBaseURL,
+  setCleanup,
+  setOutputDir,
+  setOutputPrefix,
+  setOverwrite,
+  setPathsText,
+  setProvider,
+  setSourceRoot,
+  setTreeText,
+  sourceRoot,
+  treeText,
+}: StrmTreeGenerateSectionProps) {
+  return (
+    <section className="glass-panel space-y-4">
+      <div>
+        <h2 className="font-display text-lg font-semibold text-ink-600">目录树生成 STRM</h2>
+        <p className="text-sm text-ink-50">从网盘目录树或路径列表直接生成 .strm 文件。</p>
+      </div>
+      <form onSubmit={onGenerate} className="grid gap-3 md:grid-cols-4">
+        <select className="input-base" value={provider} onChange={(e) => setProvider(e.target.value)}>
+          <option value="openlist">OpenList</option>
+          <option value="alist">Alist</option>
+          <option value="cloud115">115</option>
+          <option value="webdav">WebDAV</option>
+          <option value="clouddrive2">CloudDrive2</option>
+        </select>
+        <input
+          className="input-base"
+          placeholder="/电视剧"
+          value={sourceRoot}
+          onChange={(e) => setSourceRoot(e.target.value)}
+        />
+        <input
+          required
+          className="input-base"
+          placeholder="输出目录"
+          value={outputDir}
+          onChange={(e) => setOutputDir(e.target.value)}
+        />
+        <select
+          className="input-base"
+          value={outputPrefixPresets.includes(outputPrefix) ? outputPrefix : ''}
+          onChange={(e) => setOutputPrefix(e.target.value)}
+        >
+          <option value="">选择输出分类</option>
+          <optgroup label="电影">
+            <option value="电影/演唱会">演唱会</option>
+            <option value="电影/纪录片">纪录片</option>
+            <option value="电影/动画电影">动画电影</option>
+            <option value="电影/华语电影">华语电影</option>
+            <option value="电影/日韩电影">日韩电影</option>
+            <option value="电影/欧美电影">欧美电影</option>
+          </optgroup>
+          <optgroup label="电视剧">
+            <option value="电视剧/纪录片">纪录片</option>
+            <option value="电视剧/儿童">儿童</option>
+            <option value="电视剧/综艺">综艺</option>
+            <option value="电视剧/国产剧">国产剧</option>
+            <option value="电视剧/日韩剧">日韩剧</option>
+            <option value="电视剧/欧美剧">欧美剧</option>
+          </optgroup>
+          <optgroup label="动漫">
+            <option value="动漫/日番">日番</option>
+            <option value="动漫/国漫">国漫</option>
+            <option value="动漫/韩漫">韩漫</option>
+            <option value="动漫/美漫">美漫</option>
+            <option value="动漫/其他">其他</option>
+          </optgroup>
+          <option value="成人">成人</option>
+        </select>
+        <input
+          className="input-base md:col-span-2"
+          placeholder="输出分类，如 电影/欧美电影"
+          value={outputPrefix}
+          onChange={(e) => setOutputPrefix(e.target.value)}
+        />
+        <input
+          className="input-base md:col-span-3"
+          placeholder="http://NAS-IP:18080 或 https://media.example.com"
+          value={baseURL}
+          onChange={(e) => setBaseURL(e.target.value)}
+        />
+        <button
+          type="button"
+          className="rounded-2xl border border-primary-400/40 px-3 py-2 text-sm text-brand-500 transition hover:bg-primary-400/10"
+          onClick={() => setBaseURL(currentOrigin())}
+        >
+          使用当前访问地址
+        </button>
+        <textarea
+          className="input-base min-h-44 md:col-span-4"
+          placeholder={'电视剧\n├── 国产剧\n│   └── 南部档案\n│       └── Archives.S01E01.mkv'}
+          value={treeText}
+          onChange={(e) => setTreeText(e.target.value)}
+        />
+        <textarea
+          className="input-base min-h-32 md:col-span-4"
+          placeholder={'/电视剧/国产剧/南部档案/Season 01/Archives.S01E01.mkv\ncloud://openlist/电影/欧美电影/Dune.Part.Two.2024.mkv'}
+          value={pathsText}
+          onChange={(e) => setPathsText(e.target.value)}
+        />
+        <div className="flex flex-wrap items-center gap-2 md:col-span-4">
+          <label className="inline-flex min-h-10 cursor-pointer items-center gap-2 rounded-2xl border border-gray-200 bg-white/70 px-3 py-2 text-sm font-medium text-ink-500 transition hover:border-primary-300 hover:text-brand-500">
+            <Upload size={16} />
+            导入文本
+            <input className="sr-only" type="file" accept=".txt,.tree,text/plain" onChange={onImportTreeFile} />
+          </label>
+          <button
+            type="button"
+            className="inline-flex min-h-10 items-center gap-2 rounded-2xl border border-gray-200 bg-white/70 px-3 py-2 text-sm font-medium text-ink-500 transition hover:border-red-200 hover:text-red-500 disabled:cursor-not-allowed disabled:opacity-50"
+            disabled={!treeText.trim() && !pathsText.trim()}
+            onClick={() => {
+              setTreeText('')
+              setPathsText('')
+            }}
+          >
+            <X size={16} />
+            清空
+          </button>
+        </div>
+        <label className="flex min-h-10 items-center gap-2 rounded-2xl border border-gray-200 bg-white/70 px-3 py-2 text-sm text-ink-50 md:col-span-4">
+          <input type="checkbox" checked={overwrite} onChange={(e) => setOverwrite(e.target.checked)} />
+          覆盖已存在
+        </label>
+        <label className="flex min-h-10 items-center gap-2 rounded-2xl border border-gray-200 bg-white/70 px-3 py-2 text-sm text-ink-50 md:col-span-4">
+          <input type="checkbox" checked={cleanup} onChange={(e) => setCleanup(e.target.checked)} />
+          清理不在当前目录树中的旧 STRM
+        </label>
+        <button
+          type="submit"
+          disabled={generating || (!treeText.trim() && !pathsText.trim()) || !outputDir.trim()}
+          className="neon-button md:col-span-4"
+        >
+          {generating ? <Loader2 size={16} className="animate-spin" /> : <FolderTree size={16} />}
+          {generating ? '生成中...' : '按目录树生成'}
+        </button>
+      </form>
+      <StrmGenerateResultPanel result={result} />
+    </section>
+  )
+}
@@ -114,6 +114,42 @@ export function SubscriptionForm({ values, editing, onSubmit, onCancelEdit, onCh
        value={values.excludeWords}
        onChange={(e) => onChange('excludeWords', e.target.value)}
      />
+      <input
+        className="input-base"
+        inputMode="numeric"
+        placeholder="最少做种数"
+        value={values.minSeeders}
+        onChange={(e) => onChange('minSeeders', e.target.value)}
+      />
+      <input
+        className="input-base"
+        inputMode="numeric"
+        placeholder="最多做种数"
+        value={values.maxSeeders}
+        onChange={(e) => onChange('maxSeeders', e.target.value)}
+      />
+      <input
+        className="input-base"
+        inputMode="decimal"
+        placeholder="最小体积 GB"
+        value={values.minSizeGB}
+        onChange={(e) => onChange('minSizeGB', e.target.value)}
+      />
+      <input
+        className="input-base"
+        inputMode="decimal"
+        placeholder="最大体积 GB"
+        value={values.maxSizeGB}
+        onChange={(e) => onChange('maxSizeGB', e.target.value)}
+      />
+      <label className="flex items-center gap-2 rounded-xl border border-gray-200 bg-white px-3 py-2 text-sm text-ink-100">
+        <input
+          type="checkbox"
+          checked={values.freeOnly}
+          onChange={(e) => onChange('freeOnly', e.target.checked)}
+        />
+        只下载免费资源
+      </label>
      <button type="submit" className="neon-button md:col-span-1">
        {editing ? <Save size={16} /> : <Plus size={16} />}
        {editing ? '保存' : '添加'}
@@ -74,6 +74,11 @@ export function SubscriptionsPage() {
        effects: formValues.effects,
        release_groups: formValues.releaseGroups,
        exclude_words: formValues.excludeWords,
+        min_seeders: numericRuleValue(formValues.minSeeders),
+        max_seeders: numericRuleValue(formValues.maxSeeders),
+        min_size_gb: numericRuleValue(formValues.minSizeGB),
+        max_size_gb: numericRuleValue(formValues.maxSizeGB),
+        free_only: formValues.freeOnly,
        wash_enabled: formValues.washEnabled,
        wash_priority: formValues.washPriority,
        priority: 50,
@@ -114,6 +119,11 @@ export function SubscriptionsPage() {
      effects: s.effects || '',
      releaseGroups: s.release_groups || '',
      excludeWords: s.exclude_words || '',
+      minSeeders: stringRuleValue(s.min_seeders),
+      maxSeeders: stringRuleValue(s.max_seeders),
+      minSizeGB: stringRuleValue(s.min_size_gb),
+      maxSizeGB: stringRuleValue(s.max_size_gb),
+      freeOnly: Boolean(s.free_only),
      washEnabled: Boolean(s.wash_enabled),
      washPriority: s.wash_priority || 'balanced',
    })
@@ -246,3 +256,12 @@ function apiErrorMessage(err: unknown, fallback: string): string {
  if ((err as { code?: string })?.code === 'ECONNABORTED') return '请求超时，请检查服务或网络'
  return fallback
 }
+
+function numericRuleValue(value: string): number {
+  const parsed = Number(value)
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : 0
+}
+
+function stringRuleValue(value?: number): string {
+  return value && value > 0 ? String(value) : ''
+}
@@ -10,9 +10,24 @@ export const defaultSections = [
 ]

 export const discoverStorageKey = 'mediastation.discover.sections'
+export const discoverRowsStorageKey = 'mediastation.discover.rows'
 const discoverStorageVersion = 3
+const discoverRowsStorageVersion = 1
+const discoverRowsCacheMaxAgeMs = 6 * 60 * 60 * 1000
 const legacyDefaultAdditions = ['tmdb_latest_movie', 'tmdb_latest_tv']

+interface CachedDiscoverRow {
+  page: number
+  has_next: boolean
+  items: DiscoverItem[]
+}
+
+interface CachedDiscoverRowsPayload {
+  version: number
+  saved_at: number
+  rows: Record<string, CachedDiscoverRow>
+}
+
 export const defaultSectionDefs: DiscoverSection[] = [
  { key: 'tmdb_trending_day', label: 'TMDb 今日趋势', provider: 'tmdb' },
  { key: 'tmdb_latest_movie', label: 'TMDb 最新电影', provider: 'tmdb' },
@@ -51,6 +66,85 @@ export function serializeSavedSections(selected: string[]): string {
  return JSON.stringify({ version: discoverStorageVersion, selected })
 }

+export function readCachedDiscoverRows(selected: string[]): {
+  rows: Record<string, DiscoverItem[]>
+  rowCanNext: Record<string, boolean>
+} {
+  try {
+    const raw = window.localStorage.getItem(discoverRowsStorageKey)
+    if (!raw) return { rows: {}, rowCanNext: {} }
+    const parsed = JSON.parse(raw) as Partial<CachedDiscoverRowsPayload>
+    if (
+      parsed.version !== discoverRowsStorageVersion ||
+      typeof parsed.saved_at !== 'number' ||
+      Date.now() - parsed.saved_at > discoverRowsCacheMaxAgeMs ||
+      !parsed.rows
+    ) {
+      return { rows: {}, rowCanNext: {} }
+    }
+    const allowed = new Set(selected)
+    const rows: Record<string, DiscoverItem[]> = {}
+    const rowCanNext: Record<string, boolean> = {}
+    for (const [key, row] of Object.entries(parsed.rows)) {
+      if (!allowed.has(key) || row.page !== 1 || !Array.isArray(row.items) || row.items.length === 0) {
+        continue
+      }
+      rows[key] = row.items
+      rowCanNext[key] = Boolean(row.has_next)
+    }
+    return { rows, rowCanNext }
+  } catch {
+    return { rows: {}, rowCanNext: {} }
+  }
+}
+
+export function writeCachedDiscoverRow(
+  key: string,
+  page: number,
+  items: DiscoverItem[],
+  hasNext: boolean,
+) {
+  if (page !== 1 || items.length === 0) return
+  try {
+    const current = readRawDiscoverRowsCache()
+    current.rows[key] = {
+      page,
+      has_next: hasNext,
+      items,
+    }
+    current.saved_at = Date.now()
+    window.localStorage.setItem(discoverRowsStorageKey, JSON.stringify(current))
+  } catch {
+    // Best-effort UI cache only; failing to persist should never break Discover.
+  }
+}
+
+function readRawDiscoverRowsCache(): CachedDiscoverRowsPayload {
+  try {
+    const raw = window.localStorage.getItem(discoverRowsStorageKey)
+    if (!raw) return emptyDiscoverRowsCache()
+    const parsed = JSON.parse(raw) as Partial<CachedDiscoverRowsPayload>
+    if (parsed.version !== discoverRowsStorageVersion || !parsed.rows) {
+      return emptyDiscoverRowsCache()
+    }
+    return {
+      version: discoverRowsStorageVersion,
+      saved_at: typeof parsed.saved_at === 'number' ? parsed.saved_at : Date.now(),
+      rows: parsed.rows,
+    }
+  } catch {
+    return emptyDiscoverRowsCache()
+  }
+}
+
+function emptyDiscoverRowsCache(): CachedDiscoverRowsPayload {
+  return {
+    version: discoverRowsStorageVersion,
+    saved_at: Date.now(),
+    rows: {},
+  }
+}
+
 function sanitizeSectionKeys(keys: unknown[], allowed: Set<string>): string[] {
  return keys.filter((key): key is string => typeof key === 'string' && allowed.has(key))
 }
@@ -145,7 +145,6 @@ function canonicalCategory(part: string) {
  if (key === '日剧' || key === '韩剧') return '日韩剧'
  if (key === '真人秀') return '综艺'
  if (key === '少儿') return '儿童'
-  if (key === '未分类') return '欧美剧'
  if (key === '国产动漫') return '国漫'
  if (['番剧', '日漫', '日本动漫', '日本动画'].includes(key)) return '日番'
  if (key === '韩国动漫' || key === '韩国动画') return '韩漫'
@@ -12,12 +12,17 @@ export interface SubscriptionFormValues {
  effects: string
  releaseGroups: string
  excludeWords: string
+  minSeeders: string
+  maxSeeders: string
+  minSizeGB: string
+  maxSizeGB: string
+  freeOnly: boolean
  washEnabled: boolean
  washPriority: string
 }

 export const defaultSubscriptionExcludeWords =
-  'cam,ts,tc,枪版,dovi,dv,dolby vision,dolby,杜比视界,杜比,h265,h.265,h-265,h_265,hevc,x265,10bit,10-bit,hi10p,atmos,truehd,ddp,dd+,eac3'
+  'cam,ts,tc,telesync,telecine,hdcam,hdts,枪版,抢先,抢鲜,预告,trailer,sample,hr,h&r,hit and run,hit&run,hit-and-run,禁转,禁止转载,禁下,禁止下载,dovi,dv,dolby vision,dolby,杜比视界,杜比,h265,h.265,h-265,h_265,h 265,hevc,x265,10bit,10-bit,10 bit,hi10p,atmos,truehd,ddp,dd+,eac3'

 export const defaultSubscriptionFormValues: SubscriptionFormValues = {
  name: '',
@@ -33,6 +38,11 @@ export const defaultSubscriptionFormValues: SubscriptionFormValues = {
  effects: '',
  releaseGroups: '',
  excludeWords: defaultSubscriptionExcludeWords,
+  minSeeders: '',
+  maxSeeders: '',
+  minSizeGB: '',
+  maxSizeGB: '',
+  freeOnly: false,
  washEnabled: false,
  washPriority: 'balanced',
 }
@@ -7,11 +7,32 @@ export function subscriptionRuleBadges(subscription: Subscription): string[] {
    subscription.quality || '质量不限',
    subscription.effects || '',
    subscription.release_groups ? `发布组 ${subscription.release_groups}` : '',
-    subscription.wash_enabled ? `洗版 ${washPriorityLabel(subscription.wash_priority)}` : '未启用洗版',
+    subscription.free_only ? '仅免费' : '',
+    seedersLabel(subscription),
+    sizeLabel(subscription),
+    washStatusLabel(subscription),
  ]
  return labels.filter(Boolean)
 }

+function seedersLabel(subscription: Subscription): string {
+  const min = subscription.min_seeders || 0
+  const max = subscription.max_seeders || 0
+  if (min > 0 && max > 0) return `做种 ${min}-${max}`
+  if (min > 0) return `做种 >=${min}`
+  if (max > 0) return `做种 <=${max}`
+  return ''
+}
+
+function sizeLabel(subscription: Subscription): string {
+  const min = subscription.min_size_gb || 0
+  const max = subscription.max_size_gb || 0
+  if (min > 0 && max > 0) return `体积 ${min}-${max}GB`
+  if (min > 0) return `体积 >=${min}GB`
+  if (max > 0) return `体积 <=${max}GB`
+  return ''
+}
+
 export function subscriptionProgressLabel(subscription: Subscription): string {
  const isSeries = ['tv', 'anime', 'variety'].includes((subscription.media_type || '').toLowerCase())
  if (!isSeries) {
@@ -41,3 +62,20 @@ function washPriorityLabel(priority?: string): string {
      return '均衡'
  }
 }
+
+function washStatusLabel(subscription: Subscription): string {
+  if (!subscription.wash_enabled) return '未启用洗版'
+  if (!hasExplicitWashCriteria(subscription)) return '洗版待配置'
+  return `洗版 ${washPriorityLabel(subscription.wash_priority)}`
+}
+
+function hasExplicitWashCriteria(subscription: Subscription): boolean {
+  const resolution = (subscription.resolution || '').trim().toLowerCase()
+  const quality = (subscription.quality || '').trim().toLowerCase()
+  return Boolean(
+    (resolution && resolution !== 'best') ||
+      (quality && quality !== 'best') ||
+      subscription.effects?.trim() ||
+      subscription.release_groups?.trim(),
+  )
+}
@@ -31,6 +31,8 @@ export function useStrmGenerateForm(libraries: Library[]) {
  const [autoGenerate, setAutoGenerate] = useState(false)
  const [savingSettings, setSavingSettings] = useState(false)
  const [overwrite, setOverwrite] = useState(false)
+  const [includeLocal, setIncludeLocal] = useState(true)
+  const [preserveTree, setPreserveTree] = useState(false)
  const [generating, setGenerating] = useState(false)
  const [generateResult, setGenerateResult] = useState<GenerateSTRMResult | null>(null)

@@ -62,6 +64,7 @@ export function useStrmGenerateForm(libraries: Library[]) {
        )
        setRedirectProxyEnabled(settings['cloud.playback_redirect_proxy_enabled'] !== 'false')
        setAutoGenerate(settings['strm.auto_generate_enabled'] === 'true')
+        setPreserveTree(settings['strm.preserve_tree'] === 'true')
        setSettingsLoaded(true)
      })
      .catch(() => setSettingsLoaded(true))
@@ -112,7 +115,8 @@ export function useStrmGenerateForm(libraries: Library[]) {
        output_dir: submittedOutputDir,
        overwrite,
        enabled: autoGenerate,
-        include_local: true,
+        include_local: includeLocal,
+        preserve_tree: preserveTree,
      })
      const nextOutputDir = result.output_dir || outputDir
      setGenerateResult(result)
@@ -167,7 +171,9 @@ export function useStrmGenerateForm(libraries: Library[]) {
    generating,
    onGenerate,
    outputDir,
+    includeLocal,
    overwrite,
+    preserveTree,
    playbackStatus: playbackStatusText(strmPlaybackEnabled, redirectProxyEnabled, cloudPlaybackMode),
    redirectProxyEnabled,
    saveSTRMSettings,
@@ -176,8 +182,10 @@ export function useStrmGenerateForm(libraries: Library[]) {
    setBaseURL,
    setCloudPlaybackMode,
    setGenerateLibraryID,
+    setIncludeLocal,
    setOutputDir: onOutputDirChange,
    setOverwrite,
+    setPreserveTree,
    setRedirectProxyEnabled,
    setStrmPlaybackEnabled,
    strmPlaybackEnabled,
@@ -5,10 +5,12 @@ import type { Library } from '../types'
 import { useStrmAttachForm } from './useStrmAttachForm'
 import { useStrmGenerateForm } from './useStrmGenerateForm'
 import { useStrmImportForm } from './useStrmImportForm'
+import { useStrmTreeGenerateForm } from './useStrmTreeGenerateForm'

 export function useStrmPage() {
  const [libraries, setLibraries] = useState<Library[]>([])
  const generate = useStrmGenerateForm(libraries)
+  const treeGenerate = useStrmTreeGenerateForm()
  const importForm = useStrmImportForm(libraries)
  const attach = useStrmAttachForm()

@@ -21,5 +23,6 @@ export function useStrmPage() {
    generate,
    importForm,
    libraries,
+    treeGenerate,
  }
 }
@@ -0,0 +1,115 @@
+import type { ChangeEvent, FormEvent } from 'react'
+import { useState } from 'react'
+import toast from 'react-hot-toast'
+
+import { strmAPI, type GenerateSTRMResult } from '../api/strm'
+import { currentOrigin } from './strmPageModel'
+import { apiErrorMessage, isHTTPURL } from './strmPageUtils'
+
+export function useStrmTreeGenerateForm() {
+  const [provider, setProvider] = useState('openlist')
+  const [sourceRoot, setSourceRoot] = useState('')
+  const [outputPrefix, setOutputPrefix] = useState('')
+  const [baseURL, setBaseURL] = useState(currentOrigin())
+  const [outputDir, setOutputDir] = useState('data/strm/tree')
+  const [treeText, setTreeText] = useState('')
+  const [pathsText, setPathsText] = useState('')
+  const [overwrite, setOverwrite] = useState(false)
+  const [cleanup, setCleanup] = useState(false)
+  const [generating, setGenerating] = useState(false)
+  const [result, setResult] = useState<GenerateSTRMResult | null>(null)
+
+  const onImportTreeFile = async (event: ChangeEvent<HTMLInputElement>) => {
+    const input = event.currentTarget
+    const file = input.files?.[0]
+    if (!file) return
+    try {
+      const text = await file.text()
+      if (!text.trim()) {
+        toast.error('目录树文件为空')
+        return
+      }
+      setTreeText(text)
+      toast.success(`已导入 ${file.name}`)
+    } catch {
+      toast.error('目录树文件读取失败')
+    } finally {
+      input.value = ''
+    }
+  }
+
+  const onGenerate = async (event: FormEvent) => {
+    event.preventDefault()
+    const trimmedBaseURL = baseURL.trim()
+    const paths = parsePathList(pathsText)
+    if (!treeText.trim() && paths.length === 0) {
+      toast.error('请粘贴目录树或路径列表')
+      return
+    }
+    if (trimmedBaseURL && !isHTTPURL(trimmedBaseURL)) {
+      toast.error('域名必须以 http:// 或 https:// 开头')
+      return
+    }
+    setGenerating(true)
+    try {
+      const next = await strmAPI.generateFromTree({
+        provider,
+        source_root: sourceRoot.trim() || undefined,
+        output_prefix: outputPrefix.trim() || undefined,
+        base_url: trimmedBaseURL.replace(/\/+$/, '') || undefined,
+        output_dir: outputDir.trim(),
+        tree_text: treeText.trim() || undefined,
+        paths: paths.length > 0 ? paths : undefined,
+        overwrite,
+        cleanup,
+      })
+      setResult(next)
+      toast.success(`生成完成：新增 ${next.generated} · 更新 ${next.updated} · 跳过 ${next.skipped}`)
+    } catch (err: unknown) {
+      toast.error(apiErrorMessage(err, '目录树生成失败'))
+    } finally {
+      setGenerating(false)
+    }
+  }
+
+  return {
+    baseURL,
+    cleanup,
+    generating,
+    onImportTreeFile,
+    onGenerate,
+    outputDir,
+    outputPrefix,
+    overwrite,
+    pathsText,
+    provider,
+    result,
+    setBaseURL,
+    setCleanup,
+    setOutputDir,
+    setOutputPrefix,
+    setOverwrite,
+    setPathsText,
+    setProvider,
+    setSourceRoot,
+    setTreeText,
+    sourceRoot,
+    treeText,
+  }
+}
+
+function parsePathList(raw: string): string[] {
+  const seen = new Set<string>()
+  const out: string[] = []
+  raw
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter(Boolean)
+    .forEach((line) => {
+      if (line.startsWith('#')) return
+      if (seen.has(line.toLowerCase())) return
+      seen.add(line.toLowerCase())
+      out.push(line)
+    })
+  return out
+}
@@ -18,6 +18,11 @@ export interface Subscription {
  effects?: string
  release_groups?: string
  exclude_words?: string
+  min_seeders?: number
+  max_seeders?: number
+  min_size_gb?: number
+  max_size_gb?: number
+  free_only?: boolean
  wash_enabled?: boolean
  wash_priority?: string
  total_episodes?: number
@@ -41,6 +41,8 @@ function getSeriesRawKey(media: Media): string {
  if (isEpisodeLike(media) || pathLooksEpisodic(media)) {
    // 路径剧名优先:对全剧一致, 不受单集 tmdb 污染影响。
    if (fromPath) return seriesFingerprint('library-path', targetLibraryID(media), fromPath)
+    const pathID = seriesExternalIDFromPath(media.path)
+    if (pathID) return seriesFingerprint('library-path-id', targetLibraryID(media), pathID)
    // 无路径剧名(扁平目录)时才退而用外部 id;此时各集若共享整剧 id 仍能合并。
    if (media.tmdb_id && media.tmdb_id > 0) return `tmdb:${media.tmdb_id}`
    if (media.bangumi_id && media.bangumi_id > 0) return `bgm:${media.bangumi_id}`
@@ -78,7 +80,7 @@ export function isEpisodeLike(media: Media): boolean {
 // 剧集类目录名(电视剧/动漫及其二级分类)。媒体路径落在这些目录下时, 即便
 // 季集号未识别出来, 也应按剧集对待, 跳转到 /library 分类视图而非 /media 单页。
 const EPISODIC_PATH_RE =
-  /[\\/](?:电视剧|剧集|国产剧|欧美剧|日韩剧|日剧|韩剧|综艺|纪录片|儿童|动漫|番剧|国漫|日番|韩漫|美漫|欧美动漫|欧美动画|其他动漫|tv|series|shows?|season[\s._-]*\d|s\d{1,2}(?:[\s._-]|[\\/])|special[\s._-]*episodes?|specials?|sp|ovas?|oads?|extras?|bonus(?:es)?|omake|特别篇|特別篇|番外篇?|特典|外传|外傳|总集篇|總集篇)[\\/]/i
+  /[\\/](?:电视剧|剧集|连续剧|短剧|国产剧|国剧|大陆剧|华语剧|国产电视剧|大陆电视剧|华语电视剧|欧美剧|欧美电视剧|美剧|英剧|日韩剧|日韩电视剧|日剧|韩剧|港剧|台剧|港台剧|泰剧|综艺|纪录片|儿童|动漫|番剧|国漫|日番|韩漫|美漫|欧美动漫|欧美动画|其他动漫|tv|series|shows?|season[\s._-]*\d|s\d{1,2}(?:[\s._-]|[\\/])|special[\s._-]*episodes?|specials?|sp|ovas?|oads?|extras?|bonus(?:es)?|omake|特别篇|特別篇|番外篇?|特典|外传|外傳|总集篇|總集篇)[\\/]/i

 const SEASON_FOLDER_RE =
  /^(?:s\d{1,2}|season[\s._-]*\d{1,2}|第\s*[0-9一二三四五六七八九十百零两]+\s*季|special[\s._-]*episodes?|specials?|sp|ovas?|oads?|extras?|bonus(?:es)?|omake|特别篇|特別篇|番外篇?|特典|外传|外傳|总集篇|總集篇)$/i
@@ -206,15 +208,43 @@ function unsafeEpisodeTitle(title: string): boolean {
 }

 export function seriesTitleFromPath(path?: string): string {
+  const part = seriesDirectoryNameFromPath(path)
+  return part ? normalizePathSeriesTitle(part) : ''
+}
+
+function seriesDirectoryNameFromPath(path?: string): string {
  if (!path) return ''
  const parts = path.split(/[\\/]+/).filter(Boolean)
  if (parts.length < 2) return ''
  let dirIndex = parts.length - 2
+  const lastPart = parts[parts.length - 1]
+  if (!seriesPathPartLooksLikeFile(lastPart) && !SEASON_FOLDER_RE.test(lastPart)) {
+    dirIndex = parts.length - 1
+  }
  while (dirIndex >= 0 && SEASON_FOLDER_RE.test(parts[dirIndex])) {
    dirIndex -= 1
  }
  if (dirIndex < 0) return ''
-  return normalizePathSeriesTitle(parts[dirIndex])
+  return parts[dirIndex]
+}
+
+function seriesExternalIDFromPath(path?: string): string {
+  const part = seriesDirectoryNameFromPath(path)
+  if (!part) return ''
+  for (const [source, pattern] of [
+    ['tmdb', /(?:^|[^a-z0-9])(?:tmdbid|tmdb)[\s_:=#-]*(\d{2,})/i],
+    ['bgm', /(?:^|[^a-z0-9])(?:bangumi|bgm)[\s_:=#-]*(\d{2,})/i],
+    ['douban', /(?:^|[^a-z0-9])(?:douban|db)[\s_:=#-]*(\d{2,})/i],
+    ['thetvdb', /(?:^|[^a-z0-9])(?:thetvdb|tvdb)[\s_:=#-]*(\d{2,})/i],
+  ] as const) {
+    const match = pattern.exec(part)
+    if (match?.[1]) return `${source}:${match[1]}`
+  }
+  return ''
+}
+
+function seriesPathPartLooksLikeFile(part: string): boolean {
+  return /\.(?:mkv|mp4|m4v|avi|mov|webm|flv|wmv|ts|m2ts|mts|vob|rmvb|rm|3gp|mpg|mpeg|iso|strm|nfo|srt|ass|ssa|vtt|sub|idx|jpe?g|png|webp)$/i.test(part)
 }

 export function groupSeries(items: Media[] = []): SeriesCard[] {