Merge branch 'deai2'

Co-Authored-By: Claude Fable 5.1 <[email protected]>

# Conflicts:
#	apps/server/src/modules/acquisition-organize/services/organize.ts
#	apps/web/app/routes/console/sites.$siteId.tsx
This commit is contained in:
root committed 2026-09-29 21:26:16 +08:00
commit 12bc4664b6
247 files changed
+2658 -2148

No files matched your search

+85 -57
View File
@@ -44,6 +44,7 @@ import { type DataColumn, DataTable } from "~/components/console/data-table.tsx"
import { EmptyState, ErrorState, LoadingState } from "~/components/console/empty-state.tsx";
import { consolePath } from "~/components/console/nav.ts";
import { StatusBadge } from "~/components/console/status-badge.tsx";
import { TechInfo } from "~/components/console/tech-info.tsx";
import { evidenceLabel, FieldLockDialog, IdentityDialog, MergeDialog } from "~/components/library/entity-dialogs.tsx";
import {
CONTENT_TYPE,
@@ -86,11 +87,12 @@ import { CELL_LABEL, type CellKind, cellKind } from "~/components/subscriptions/
import { SubscriptionFormDialog } from "~/components/subscriptions/subscription-form.tsx";
import { Button } from "~/components/ui/button.tsx";
import { errorMessage } from "~/lib/api.ts";
import { useUiPrefs } from "~/lib/ui-prefs.ts";
import { formatBytes, formatDateTime } from "~/lib/utils.ts";
// 作品详情(REQ §13.1 / §13.4.3):实际路径、外部身份映射及状态、元数据来源、各 Slot、候选拒绝理由、
// 内容单元、下载历史与校验结果,同一页同时展示。
// MD-1(对照 MP 媒体详情):头部背景图 + 海报 + 评分 / 类型 / 状态 + 简介、主创、季折叠与每集行(库内状态按版本目标),
// MD-1(对照 MP 媒体详情):头部背景图 + 海报 + 评分 / 类型 / 状态 + 简介、主创、季折叠与每集行(库内状态按收录版本),
// 头部 / 主创 / 季集组件与仅 TMDB 的作品详情页共用(components/media/media-detail)。
const pad = (n: number) => String(n).padStart(2, "0");
@@ -127,13 +129,13 @@ function PathsPanel({ detail }: { detail: LibraryDetail }) {
const rootOf = (id: string | null) => roots.data?.items.find((r) => r.id === id);
const bindings = detail.pathBindings.filter((b) => b.status !== "superseded");
return (
<Panel title="实际路径与库根" description="路径绑定建立后不随译名变化">
<Panel title="文件位置">
{bindings.length === 0 && detail.assets.length === 0 ? (
<EmptyState
plain
icon={FolderTree}
title="还没有入库文件"
description="版本目标满足后,文件位置显示在这里。"
description="收录版本满足后,文件位置显示在这里。"
className="py-8"
/>
) : (
@@ -146,7 +148,9 @@ function PathsPanel({ detail }: { detail: LibraryDetail }) {
<li key={b.id} className="rounded-lg border border-border/70 px-3 py-2">
<div className="flex flex-wrap items-center gap-2">
<Chip>{b.bindingKind === "season" ? `第 ${b.seasonNumber} 季目录` : "作品目录"}</Chip>
<span className="text-meta text-muted-foreground">库根 {root?.name ?? "未知库根"}</span>
<span className="text-meta text-muted-foreground">
媒体库目录 {root?.name ?? "未知媒体库目录"}
</span>
{b.status === "conflict" ? <StatusBadge tone="destructive">绑定冲突</StatusBadge> : null}
</div>
<p className="mt-1 font-mono text-caption break-all text-foreground">
@@ -163,22 +167,19 @@ function PathsPanel({ detail }: { detail: LibraryDetail }) {
<div className="flex flex-wrap items-center gap-2">
<span className="text-sm font-medium text-foreground">{deliveryLine(a.asset) || "未知规格"}</span>
{a.asset.status !== "active" ? <StatusBadge tone="warning">{a.asset.status}</StatusBadge> : null}
{a.asset.verifiedAt ? (
<StatusBadge tone="success">已核验 {relTime(a.asset.verifiedAt)}</StatusBadge>
) : (
<StatusBadge>未核验</StatusBadge>
)}
{a.asset.verifiedAt ? null : <StatusBadge>未核验</StatusBadge>}
</div>
<ul className="mt-2 space-y-1.5">
{a.locations.map((l) => (
<li key={l.id} className="min-w-0">
<div className="flex flex-wrap items-center gap-1.5">
<Chip>{LOCATION_KIND[l.locationKind] ?? l.locationKind}</Chip>
{l.isPrimary ? <Chip>主位置</Chip> : null}
<Tone v={LOCATION_STATUS[l.status]} />
{l.locationKind !== "library" ? (
<Chip>{LOCATION_KIND[l.locationKind] ?? l.locationKind}</Chip>
) : null}
{l.status !== "available" ? <Tone v={LOCATION_STATUS[l.status]} /> : null}
{l.libraryRootId ? (
<span className="text-meta text-muted-foreground">
{rootOf(l.libraryRootId)?.name ?? "库根"}
{rootOf(l.libraryRootId)?.name ?? "媒体库目录"}
</span>
) : null}
</div>
@@ -197,6 +198,8 @@ function PathsPanel({ detail }: { detail: LibraryDetail }) {
);
}
const PROVIDER_LABEL: Record<string, string> = { tmdb: "TMDB", tvdb: "TVDB", imdb: "IMDb", douban: "豆瓣" };
// ── 外部身份映射 ──
function IdentityPanel({ detail }: { detail: LibraryDetail }) {
const [open, setOpen] = useState(false);
@@ -204,8 +207,7 @@ function IdentityPanel({ detail }: { detail: LibraryDetail }) {
const candidates = detail.identities.filter((i) => i.status === "proposed" || i.status === "conflicted");
return (
<Panel
title="外部身份"
description="以本地 ID 为准,外部身份可修改"
title="匹配的 TMDB 条目"
actions={
<Button variant="outline" size="sm" onClick={() => setOpen(true)}>
<PencilLine />
@@ -245,10 +247,13 @@ function IdentityRow({ i }: { i: ExternalIdentity }) {
return (
<li className="rounded-lg border border-border/70 px-3 py-2">
<div className="flex flex-wrap items-center gap-2">
<span className="font-mono text-caption break-all text-foreground">
{i.provider}:{i.entityType}:{i.externalId}
<span
className="text-caption break-all text-foreground"
title={`${i.provider}:${i.entityType}:${i.externalId}`}
>
{PROVIDER_LABEL[i.provider] ?? i.provider} {i.externalId}
</span>
<Tone v={IDENTITY_STATUS[i.status]} />
{i.status !== "accepted" ? <Tone v={IDENTITY_STATUS[i.status]} /> : null}
{i.locked ? (
<StatusBadge>
<Lock className="h-3 w-3" />
@@ -256,9 +261,12 @@ function IdentityRow({ i }: { i: ExternalIdentity }) {
</StatusBadge>
) : null}
</div>
<p className="mt-1 text-meta text-muted-foreground">
证据 {evidenceLabel(i.evidenceLevel)} · {VERIFY_STATUS[i.verifyStatus]?.label ?? i.verifyStatus}
{i.verifiedAt ? `(${relTime(i.verifiedAt)})` : ""} · r{i.revision}
<p
className="mt-1 text-meta text-muted-foreground"
title={`证据 ${evidenceLabel(i.evidenceLevel)} · ${VERIFY_STATUS[i.verifyStatus]?.label ?? i.verifyStatus} · r${i.revision}`}
>
{i.locked || i.evidenceLevel === "manual" ? "你确认的" : "自动匹配"}
{i.verifiedAt ? ` · ${relTime(i.verifiedAt)}` : ""}
</p>
{reason ? <p className="mt-0.5 text-meta break-words text-muted-foreground">{reason}</p> : null}
</li>
@@ -365,29 +373,44 @@ function MetadataPanel({ detail, entity }: { detail: LibraryDetail; entity: Medi
.filter((x) => x.final || !ENRICH_ONLY_FIELDS.has(x.field));
const candidatesOf = (f: string) => (entity?.metadataFields ?? []).filter((m) => m.field === f);
const current = editing ? finals.find((x) => x.field === editing)?.final?.value : undefined;
const prefs = useUiPrefs();
const [showSources, setShowSources] = useState(prefs.techInfoExpanded);
const [allAliases, setAllAliases] = useState(false);
// 别名:默认只列中英文与手动加的,其余折成 +N
const aliases = entity?.aliases ?? [];
const keyAliases = aliases.filter(
(a) => a.locked || !a.language || /^(zh|en|cn)/i.test(a.language) || /[\p{Script=Han}]/u.test(a.alias),
);
const shownAliases = allAliases ? aliases : keyAliases.slice(0, 12);
const moreAliases = aliases.length - shownAliases.length;
return (
<Panel
title="字段来源与锁"
description={`锁定的字段刷新时不变 · 最近刷新 ${formatDateTime(detail.entity.lastMetadataRefreshAt)}`}
title="元数据"
description={`更新于 ${formatDateTime(detail.entity.lastMetadataRefreshAt)}`}
actions={
<Button
variant="outline"
size="sm"
disabled={refresh.isPending}
onClick={() =>
refresh.mutate(
{ full: true },
{
onSuccess: () => toast.success("已提交刷新,含全部季的每集信息"),
onError: (err) => toast.error(errorMessage(err, "刷新失败")),
},
)
}
>
<RefreshCw className={refresh.isPending ? "animate-spin" : undefined} />
刷新元数据
</Button>
<>
<Button variant="ghost" size="sm" aria-pressed={showSources} onClick={() => setShowSources((v) => !v)}>
{showSources ? "隐藏来源" : "显示来源"}
</Button>
<Button
variant="outline"
size="sm"
disabled={refresh.isPending}
onClick={() =>
refresh.mutate(
{ full: true },
{
onSuccess: () => toast.success("已提交刷新,含全部季的每集信息"),
onError: (err) => toast.error(errorMessage(err, "刷新失败")),
},
)
}
>
<RefreshCw className={refresh.isPending ? "animate-spin" : undefined} />
刷新元数据
</Button>
</>
}
>
<ul className="divide-y divide-border/60">
@@ -400,14 +423,14 @@ function MetadataPanel({ detail, entity }: { detail: LibraryDetail; entity: Medi
<p className="line-clamp-4 text-sm break-words text-foreground">
{final ? fieldText(field, final.value) : <span className="text-muted-foreground">未提供</span>}
</p>
{final ? (
{final && showSources ? (
<p className="text-meta text-muted-foreground">
来源 {METADATA_SOURCE[final.source] ?? final.source}
{final.language ? ` · ${final.language}` : ""} · {relTime(final.at)}
</p>
) : null}
{final ? <EvidenceLine field={cands.find((c) => c.source === final.source)} /> : null}
{cands.length ? (
{final && showSources ? <EvidenceLine field={cands.find((c) => c.source === final.source)} /> : null}
{cands.length && showSources ? (
<p className="mt-0.5 text-meta break-words text-muted-foreground">
候选:
{cands
@@ -461,15 +484,20 @@ function MetadataPanel({ detail, entity }: { detail: LibraryDetail; entity: Medi
</ul>
{entity?.aliases.length ? (
<div className="mt-3 border-t border-border/60 pt-3">
<p className="mb-1.5 text-meta text-muted-foreground">别名(用于模糊召回)</p>
<p className="mb-1.5 text-meta text-muted-foreground">别名</p>
<ChipList
items={entity.aliases.map((a) => (
items={shownAliases.map((a) => (
<span key={a.id}>
{a.alias}
{a.locked ? <Lock className="ml-1 inline h-3 w-3" /> : null}
</span>
))}
/>
{moreAliases > 0 || allAliases ? (
<Button variant="ghost" size="xs" className="mt-1" onClick={() => setAllAliases((v) => !v)}>
{allAliases ? "收起" : `还有 ${moreAliases} 个`}
</Button>
) : null}
</div>
) : null}
<FieldLockDialog entityId={id} field={editing} current={current} onOpenChange={(o) => !o && setEditing(null)} />
@@ -481,12 +509,12 @@ function MetadataPanel({ detail, entity }: { detail: LibraryDetail; entity: Medi
function SlotsPanel({ detail, units }: { detail: LibraryDetail; units: ContentUnit[] }) {
if (detail.slots.length === 0) {
return (
<Panel title="版本目标">
<Panel title="收录版本">
<EmptyState
plain
icon={CalendarClock}
title="还没有版本目标"
description="新建订阅或版本目标后,按目标补齐和升级。"
title="还没有收录版本"
description="新建订阅或收录版本后,按目标补齐和升级。"
action={
<Button asChild variant="outline" size="sm">
<Link to={consolePath("subscriptions")}>去订阅</Link>
@@ -499,7 +527,7 @@ function SlotsPanel({ detail, units }: { detail: LibraryDetail; units: ContentUn
}
const assetOf = (id: string | null) => detail.assets.find((a) => a.asset.id === id);
return (
<Panel title="版本目标" description="每个目标单独判断硬条件、软偏好和升级">
<Panel title="收录版本" description="每个目标单独判断硬条件、软偏好和升级">
<div className="grid gap-3 xl:grid-cols-2">
{detail.slots.map((s) => {
const cur = assetOf(s.currentAssetId);
@@ -547,7 +575,7 @@ function UnitsPanel({ entity, detail }: { entity: ReturnType<typeof useEntityDet
cell: (u) => (
<div className="flex flex-wrap gap-1">
{u.status === "provisional" ? (
<StatusBadge tone="warning">临时单元</StatusBadge>
<StatusBadge tone="warning">编号待确认</StatusBadge>
) : u.status === "retired" ? (
<StatusBadge>已退役</StatusBadge>
) : (
@@ -582,7 +610,7 @@ function UnitsPanel({ entity, detail }: { entity: ReturnType<typeof useEntityDet
a.segment.localeCompare(b.segment),
);
return (
<Panel title="内容单元" description="临时单元按解析结果创建,确认或改编号后锁定" bodyClassName="p-0 sm:p-0">
<Panel title="季与集" bodyClassName="p-0 sm:p-0">
<DataTable
plain
columns={columns}
@@ -592,15 +620,15 @@ function UnitsPanel({ entity, detail }: { entity: ReturnType<typeof useEntityDet
error={entity.error}
onRetry={() => entity.refetch()}
empty={{
title: detail.entity.kind === "movie" ? "电影没有季和集" : "还没有内容单元",
description: detail.entity.kind === "movie" ? "电影按内容版本核对完整性。" : "识别到新集后会建临时单元。",
title: detail.entity.kind === "movie" ? "电影没有季和集" : "还没有季和集",
description: detail.entity.kind === "movie" ? undefined : "识别到新的一集后会出现在这里。",
}}
/>
</Panel>
);
}
// ── 季与集(MD-1):季折叠 + 每集行,库内状态按版本目标 ──
// ── 季与集(MD-1):季折叠 + 每集行,库内状态按收录版本 ──
const CELL_TONE: Record<CellKind, "success" | "warning" | "destructive" | "neutral"> = {
have: "success",
@@ -717,7 +745,7 @@ function EpisodesPanel({ detail, units }: { detail: LibraryDetail; units: Conten
}
>
{rows.length > 1 ? (
<fieldset aria-label="按版本目标看状态" className="m-0 mb-3 flex min-w-0 flex-wrap gap-1.5 border-0 p-0">
<fieldset aria-label="按收录版本看状态" className="m-0 mb-3 flex min-w-0 flex-wrap gap-1.5 border-0 p-0">
{rows.map((r, i) => (
<button
key={r.slotId ?? "any"}
@@ -931,7 +959,7 @@ function DownloadsPanel({ detail }: { detail: LibraryDetail }) {
{r.targetPath ?? r.sourcePath ?? r.id}
</Link>
<span className="text-meta text-muted-foreground tabular-nums">
{r.trigger === "manual" ? "手动" : r.trigger === "agent" ? "Agent" : "自动"} · {r.fileSucceeded}/
{r.trigger === "manual" ? "手动" : r.trigger === "agent" ? "智能体" : "自动"} · {r.fileSucceeded}/
{r.fileTotal} 个文件 · {formatDateTime(r.createdAt)}
</span>
</li>
@@ -1104,8 +1132,8 @@ export default function LibraryDetailPage() {
</Button>
) : null}
<EntityNamingButton entityId={e.id} kind={e.kind} />
<span className="font-mono text-meta break-all text-muted-foreground sm:ml-auto">{e.id}</span>
</div>
<TechInfo className="-mt-3 mb-5" items={[{ label: "作品 ID", value: e.id, wide: true }]} />
<div className="space-y-5">
{credits.cast.length || credits.crew.length ? (