feat(organize): 整理记录默认按作品分组，行内显示整理方式标签与分类
学 MP 历史记录页：整理方式改为中性小标签（移动 / 复制 / 硬链接 / 原地入库），标题下显示分类（二级分类，没有时退回作品类型）。 列表缺省按作品分组：一季多集收成一组并缺省折叠，组头显示海报、作品、季集范围（S01E01–E10）、分类、条数与非成功状态；只有一条的作品和未识别记录不画组头。切换后本浏览器记住，URL ?group=entity|none 优先。 DataTable 分组追加可选项 meta / defaultCollapsed / flat（不改既有调用的表现）。 Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01Cxwgnn2pbzQ7rXv3rq7fei
This commit is contained in:
rootandClaude Opus 5.5 committed
1 parent
67f05895d3
commit
e41a5d1f16
4 files changed
+274
-18
No files matched your search
@@ -36,7 +36,19 @@ import { Checkbox } from "~/components/files/file-list.tsx";
|
||||
import { CoverPlaceholder, relTime } from "~/components/library/parts.tsx";
|
||||
import { DeleteRecordsDialog } from "~/components/organize/delete-records-dialog.tsx";
|
||||
import { OrganizeQueue } from "~/components/organize/organize-queue.tsx";
|
||||
import { canReorganize, isRunning, recordFileProgress, recordTitle } from "~/components/organize/record-parts.ts";
|
||||
import {
|
||||
canReorganize,
|
||||
episodeRange,
|
||||
groupIssues,
|
||||
isRunning,
|
||||
type RecordGrouping,
|
||||
readGroupingPref,
|
||||
recordCategory,
|
||||
recordFileProgress,
|
||||
recordTitle,
|
||||
resolveGrouping,
|
||||
writeGroupingPref,
|
||||
} from "~/components/organize/record-parts.ts";
|
||||
import { SourceSelection } from "~/components/organize/source-selection.tsx";
|
||||
import { type OrganizeSource, OrganizeWizard } from "~/components/organize-wizard/organize-wizard.tsx";
|
||||
import { Button } from "~/components/ui/button.tsx";
|
||||
@@ -46,8 +58,9 @@ import { reasonLine } from "~/lib/reasons.ts";
|
||||
import { useSse } from "~/lib/sse.ts";
|
||||
import { cn, formatBytes, formatDateTime } from "~/lib/utils.ts";
|
||||
|
||||
// 整理记录(HIS-1 对照 MP 历史记录页):海报 + 作品 / 季集、源 → 目标路径、整理方式与大小、状态与原因、来源(下载器)、时间;
|
||||
// 按状态 / 类型 / 来源 / 时间 / 关键字(支持 * ? 通配、种子 hash)筛选;按状态计数;按作品分组;
|
||||
// 整理记录(HIS-1 对照 MP 历史记录页):海报 + 作品 / 季集 + 分类、源 → 目标路径、整理方式标签与大小、状态与原因、来源(下载器)、时间;
|
||||
// 按状态 / 类型 / 来源 / 时间 / 关键字(支持 * ? 通配、种子 hash)筛选;按状态计数;
|
||||
// 缺省按作品分组(一季十集收成一组,组头写季集范围、条数和非成功状态;只有一条的不分组),切换后本浏览器记住;
|
||||
// 单条与批量的重新整理(走整理向导)和删除(可选源文件 / 媒体库文件进回收站)。
|
||||
|
||||
type Rec = PublicOrganizationRecord;
|
||||
@@ -90,6 +103,52 @@ function StatusCell({ r }: { r: Rec }) {
|
||||
);
|
||||
}
|
||||
|
||||
/** 整理方式(移动 / 复制 / 硬链接 / 原地入库…):中性小标签,不用状态色 */
|
||||
function ActionTag({ action }: { action: Rec["action"] }) {
|
||||
return (
|
||||
<span className="inline-flex items-center rounded-tight border border-border px-1.5 py-px text-meta whitespace-nowrap text-muted-foreground">
|
||||
{ACTION_LABEL[action]}
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
||||
/** 组头:海报 + 作品 (年) + 季集范围 */
|
||||
function GroupLabel({ rows }: { rows: Rec[] }) {
|
||||
const m = rows[0]?.media;
|
||||
if (!m) return <>未识别</>;
|
||||
const range = episodeRange(rows.map((r) => r.media));
|
||||
return (
|
||||
<span className="inline-flex min-w-0 items-center gap-2.5 align-middle">
|
||||
<CoverPlaceholder small title={m.title} kind={m.kind} posterPath={m.posterPath} className="h-9 w-6 rounded-md" />
|
||||
<span className="truncate">
|
||||
{m.title}
|
||||
{m.year ? ` (${m.year})` : ""}
|
||||
{range ? <span className="ml-2 font-normal tabular-nums">{range}</span> : null}
|
||||
</span>
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
||||
/** 组头右侧:分类 · n 条 · 非成功状态(只列非零项,成功是常态不写) */
|
||||
function GroupMeta({ rows }: { rows: Rec[] }) {
|
||||
const cat = rows[0] ? recordCategory(rows[0]) : "";
|
||||
const issues = groupIssues(rows);
|
||||
return (
|
||||
<span className="flex shrink-0 items-center gap-2 tabular-nums">
|
||||
{cat ? <span className="hidden sm:inline">{cat}</span> : null}
|
||||
<span>{rows.length} 条</span>
|
||||
{issues.map((x) => (
|
||||
<span
|
||||
key={x.label}
|
||||
className={cn(x.tone === "destructive" && "text-destructive", x.tone === "warning" && "text-warning")}
|
||||
>
|
||||
{x.label} {x.n}
|
||||
</span>
|
||||
))}
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
||||
/** 长路径只留最后两段(文件名完整),前面用 … 代替;完整路径放 title */
|
||||
function shortPath(p: string | null): string | null {
|
||||
if (!p) return p;
|
||||
@@ -324,7 +383,15 @@ export default function OrganizePage() {
|
||||
const [choosingSource, setChoosingSource] = useState(false);
|
||||
const [wizard, setWizard] = useState<OrganizeSource | null>(null);
|
||||
const [toDelete, setToDelete] = useState<Rec[] | null>(null);
|
||||
const grouped = v.group === "entity";
|
||||
// 分组:URL ?group= 优先,否则用本浏览器记住的选择,缺省按作品分组(挂载后读,服务端渲染时一律按缺省)
|
||||
const [storedGrouping, setStoredGrouping] = useState<string | null>(null);
|
||||
useEffect(() => setStoredGrouping(readGroupingPref()), []);
|
||||
const grouped = resolveGrouping(v.group, storedGrouping) === "entity";
|
||||
const setGrouping = (next: RecordGrouping) => {
|
||||
writeGroupingPref(next);
|
||||
setStoredGrouping(next);
|
||||
setFilter("group", next);
|
||||
};
|
||||
|
||||
const selRows = (allRows ?? []).filter((r) => sel.has(r.id));
|
||||
const allPicked = !!rows?.length && rows.every((r) => sel.has(r.id));
|
||||
@@ -397,8 +464,16 @@ export default function OrganizePage() {
|
||||
<p className="truncate text-foreground" title={recordTitle(r)}>
|
||||
{r.media ? recordTitle(r) : <span className="text-muted-foreground">未识别 · {recordTitle(r)}</span>}
|
||||
</p>
|
||||
{recordCategory(r) ? (
|
||||
<p className="hidden truncate text-meta text-muted-foreground sm:block">{recordCategory(r)}</p>
|
||||
) : null}
|
||||
<p className="truncate text-meta text-muted-foreground sm:hidden">
|
||||
{[ACTION_LABEL[r.action], r.sizeBytes ? formatBytes(r.sizeBytes, 1) : null, relTime(when(r))]
|
||||
{[
|
||||
recordCategory(r),
|
||||
ACTION_LABEL[r.action],
|
||||
r.sizeBytes ? formatBytes(r.sizeBytes, 1) : null,
|
||||
relTime(when(r)),
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(" · ")}
|
||||
</p>
|
||||
@@ -414,13 +489,13 @@ export default function OrganizePage() {
|
||||
{ key: "path", header: "源 → 目标", hideBelow: "md", cell: (r) => <PathLines r={r} /> },
|
||||
{
|
||||
key: "action",
|
||||
header: "方式",
|
||||
header: "整理方式",
|
||||
hideBelow: "sm",
|
||||
cell: (r) => (
|
||||
<div className="whitespace-nowrap">
|
||||
<p>{ACTION_LABEL[r.action]}</p>
|
||||
<div className="flex flex-col items-start gap-1 whitespace-nowrap">
|
||||
<ActionTag action={r.action} />
|
||||
{r.sizeBytes ? (
|
||||
<p className="text-meta text-muted-foreground tabular-nums">{formatBytes(r.sizeBytes, 1)}</p>
|
||||
<span className="text-meta text-muted-foreground tabular-nums">{formatBytes(r.sizeBytes, 1)}</span>
|
||||
) : null}
|
||||
</div>
|
||||
),
|
||||
@@ -517,7 +592,7 @@ export default function OrganizePage() {
|
||||
variant={grouped ? "secondary" : "ghost"}
|
||||
size="sm"
|
||||
aria-pressed={grouped}
|
||||
onClick={() => setFilter("group", grouped ? "" : "entity")}
|
||||
onClick={() => setGrouping(grouped ? "none" : "entity")}
|
||||
>
|
||||
<ListTree />
|
||||
按作品分组
|
||||
@@ -605,11 +680,13 @@ export default function OrganizePage() {
|
||||
groupBy={
|
||||
grouped
|
||||
? {
|
||||
key: (r) => r.media?.entityId ?? "",
|
||||
label: (k, g) => {
|
||||
const m = g[0]?.media;
|
||||
return k && m ? `${m.title}${m.year ? ` (${m.year})` : ""}` : "未识别";
|
||||
},
|
||||
// 未识别的记录互不相干,各自一行
|
||||
key: (r) => r.media?.entityId ?? `none:${r.id}`,
|
||||
label: (_k, g) => <GroupLabel rows={g} />,
|
||||
meta: (_k, g) => <GroupMeta rows={g} />,
|
||||
flat: (_k, g) => g.length === 1,
|
||||
defaultCollapsed: true,
|
||||
storageKey: "organize-records-entity",
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user