生产 v0.3.8~v0.3.13 均由 8013196 加工作区修改构建部署,此前未提交;本提交补齐源码,
并含未部署的 v0.3.14 原地入库。中间各版本源码状态未保存,无法逐版拆分,详见
docs/plan/17-full-upgrade.md 与 docs/plan/18-organize-release.md。
- v0.3.8 全面升级:Deno workspace 依赖、Router 8 / Vite 8、camofox 1.18.0 / Node 24、
PostgreSQL 18.6、备份客户端 18.6、演示 qB 5.2.4
- v0.3.9 媒体整理:分类规则、整理来源与目录快照(0059)、文件管理整理入口
- v0.3.10 手动下载与入库:独立手动下载、详情页资源下载、TMDB / Local 元数据兜底
(metadata.resolve_organize)、正常多版本 / 一次性洗版(0060)
- v0.3.11 搜索详情与桌面黑边修复
- v0.3.12 列表分页、搜索历史、首页概况
- v0.3.13 统一整理弹窗与队列
- v0.3.14 原地入库(0061,未部署)
同批审计修复:
- 刮削入队:确认原记录存在后才删重放产生的新记录;写回 run 关联失败时保持 queued,
由处理器补关联(对齐 MP 先登记、只在入队失败时记失败)
- 识别升级链只在结果更确定时采用,不再用 no_match 顶替原有歧义候选
- bluray_dir 资产以原盘目录本身为刮削根(MP 同做法)
- metadata.resolve_organize 登记到入库排障 Skill 与能力地图
- db/src/types.ts 按迁移重新生成;contracts 整理动作枚举顺序与数据库对齐
- 测试:原地入库用例改为直接查记录表;domain 测试模板补 version
- 前端:通知铃铛弹层与用户菜单统一样式;站点卡片共用卡头、底栏贴底、分页间距
依赖升级证据只提交摘要文件,registry-snapshot.json 移至 .local/(SHA-256 记于文档)。
Co-Authored-By: Claude Opus 5.5 <[email protected]>
154 lines
5.6 KiB
TypeScript
154 lines
5.6 KiB
TypeScript
import { lstat, readdir } from "node:fs/promises";
|
|
import { join } from "node:path";
|
|
import type {
|
|
FileRootId,
|
|
FilesRecordSourcesResult,
|
|
FilesTreeQuery,
|
|
FilesTreeResult,
|
|
OrganizationStatus,
|
|
} from "@umt/contracts";
|
|
import { sql } from "@umt/db";
|
|
import { FilesError, type FmDeps, isTempName, loadRootDefs, resolveIn, within } from "./common.ts";
|
|
import { kindOfName } from "./list.ts";
|
|
|
|
// G8 目录摘要(树折叠 / 上一级):只列子目录(是否还有下级)+ 本目录递归视频数与已登记数;
|
|
// G5 整理记录 → 源 FileRef(整理记录"重新整理"按登记目录 hostPath 换算)。
|
|
|
|
const likePrefix = (rel: string) => `${rel.replace(/[\\%_]/g, (m) => `\\${m}`)}/%`;
|
|
const hiddenName = (n: string) => n.startsWith(".") || isTempName(n);
|
|
|
|
export async function treeOf(d: FmDeps, q: FilesTreeQuery): Promise<FilesTreeResult> {
|
|
const r = await resolveIn(d, q.root, q.path);
|
|
if (!r.lst?.isDirectory() || r.isSymlink) throw new FilesError("bad_request", `不是目录:${r.rel || "/"}`);
|
|
const names = await readdir(r.abs, { withFileTypes: true });
|
|
const subdirs = names
|
|
.filter((n) => n.isDirectory() && !hiddenName(n.name))
|
|
.map((n) => n.name)
|
|
.sort((a, b) => a.localeCompare(b));
|
|
const max = d.options.listMaxEntries;
|
|
const truncated = subdirs.length > max;
|
|
const dirs = await Promise.all(
|
|
subdirs.slice(0, max).map(async (name) => {
|
|
const path = r.rel ? `${r.rel}/${name}` : name;
|
|
const kids = await readdir(join(r.abs, name), { withFileTypes: true }).catch(() => []);
|
|
return { name, path, hasChildren: kids.some((k) => k.isDirectory() && !hiddenName(k.name)) };
|
|
}),
|
|
);
|
|
|
|
// 递归数视频(上限 dirSummaryMax 项,同列表目录摘要口径)
|
|
let seen = 0;
|
|
let videoCount = 0;
|
|
let partial = false;
|
|
const stack = [r.abs];
|
|
while (stack.length > 0 && !partial) {
|
|
const dir = stack.pop()!;
|
|
for (const n of await readdir(dir, { withFileTypes: true }).catch(() => [])) {
|
|
if (++seen > d.options.dirSummaryMax) {
|
|
partial = true;
|
|
break;
|
|
}
|
|
if (n.name.startsWith(".")) continue;
|
|
if (n.isDirectory()) stack.push(join(dir, n.name));
|
|
else if (n.isFile() && kindOfName(n.name) === "video") videoCount++;
|
|
}
|
|
}
|
|
let registeredCount = 0;
|
|
if (r.def.libraryRootId) {
|
|
const row = await sql<{ n: number }>`
|
|
select count(*)::int as n from asset_location
|
|
where library_root_id = ${r.def.libraryRootId} and status = 'available'
|
|
and (${r.rel} = '' or relative_path like ${likePrefix(r.rel)})`.execute(d.ctx.db);
|
|
registeredCount = row.rows[0]?.n ?? 0;
|
|
}
|
|
const slash = r.rel.lastIndexOf("/");
|
|
return {
|
|
root: q.root,
|
|
path: r.rel,
|
|
name: r.rel ? r.rel.slice(slash + 1) : r.def.name,
|
|
parent: r.rel === "" ? null : slash < 0 ? "" : r.rel.slice(0, slash),
|
|
dirs,
|
|
truncated,
|
|
summary: { videoCount, registeredCount, partial },
|
|
};
|
|
}
|
|
|
|
export async function recordSources(d: FmDeps, recordId: string): Promise<FilesRecordSourcesResult> {
|
|
const db = d.ctx.db;
|
|
const rec = await db
|
|
.selectFrom("organization_record")
|
|
.select([
|
|
"id",
|
|
"media_entity_id",
|
|
"action",
|
|
"status",
|
|
"source_path",
|
|
"source_path_view",
|
|
"target_path",
|
|
"target_library_root_id",
|
|
"plan",
|
|
])
|
|
.where("id", "=", recordId)
|
|
.executeTakeFirst();
|
|
if (!rec) throw new FilesError("not_found", "整理记录不存在");
|
|
const mains = await db
|
|
.selectFrom("organization_file_result")
|
|
.select(["source_path", "target_path", "target_library_root_id"])
|
|
.where("organization_record_id", "=", rec.id)
|
|
.where("role", "=", "main")
|
|
.orderBy("ordinal")
|
|
.limit(500)
|
|
.execute();
|
|
const defs = (await loadRootDefs(db)).sort((a, b) => b.hostPath.length - a.hostPath.length);
|
|
const toRef = (abs: string) => {
|
|
const def = defs.find((x) => within(abs, x.hostPath));
|
|
return def
|
|
? { root: def.id as FileRootId, path: abs === def.hostPath ? "" : abs.slice(def.hostPath.length + 1) }
|
|
: null;
|
|
};
|
|
// Successful moves have removed their inputs: reorganize the existing library files.
|
|
const moved = rec.action === "move" && rec.status === "succeeded";
|
|
const targetOf = (rootId: string | null, path: string | null) => {
|
|
const root = defs.find((d) => d.libraryRootId === rootId);
|
|
return root && path && within(join(root.hostPath, path), root.hostPath) ? join(root.hostPath, path) : null;
|
|
};
|
|
let sources = moved
|
|
? mains.map((m) => targetOf(m.target_library_root_id, m.target_path)).filter((p): p is string => !!p)
|
|
: mains.map((m) => m.source_path);
|
|
const dir = moved ? targetOf(rec.target_library_root_id, rec.target_path) : rec.source_path;
|
|
if (
|
|
dir &&
|
|
sources.length > 1 &&
|
|
sources.every((p) => within(p, dir)) &&
|
|
!defs.some((x) => x.hostPath === dir.replace(/\/+$/, ""))
|
|
)
|
|
sources = [dir];
|
|
if (sources.length === 0 && dir) sources = [dir];
|
|
const items: FilesRecordSourcesResult["items"] = [];
|
|
const unresolved: string[] = [];
|
|
for (const abs of [...new Set(sources)]) {
|
|
const ref = moved || rec.source_path_view === "local" ? toRef(abs) : null;
|
|
const exists = ref
|
|
? await lstat(abs).then(
|
|
() => true,
|
|
() => false,
|
|
)
|
|
: false;
|
|
if (ref && exists) items.push(ref);
|
|
else unresolved.push(abs);
|
|
}
|
|
return {
|
|
recordId: rec.id,
|
|
mediaEntityId: rec.media_entity_id,
|
|
action: rec.action,
|
|
status: rec.status as OrganizationStatus,
|
|
items,
|
|
unresolved,
|
|
...(rec.plan &&
|
|
typeof rec.plan === "object" &&
|
|
"sourceConfigId" in rec.plan &&
|
|
typeof rec.plan.sourceConfigId === "string"
|
|
? { sourceConfigId: rec.plan.sourceConfigId }
|
|
: {}),
|
|
};
|
|
}
|