feat: v0.3.8–v0.3.14 工作区汇总(依赖升级、整理来源、手动入库、原地入库等)
生产 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]>
This commit is contained in:
1 parent
8013196e3f
commit
ceb66f8c77
265 files changed
+17751
-2483
No files matched your search
@@ -15,5 +15,6 @@ export {
|
||||
planOrganize,
|
||||
type SourceFile,
|
||||
} from "./plan.ts";
|
||||
export * from "./replacement.ts";
|
||||
export { type DefaultSubtitleLang, sidecarLanguageSuffix, sidecarStem } from "./sidecars.ts";
|
||||
export { findOtherVersions } from "./versions.ts";
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
splitExt,
|
||||
} from "./sidecars.ts";
|
||||
|
||||
export type OrganizeOperation = "copy" | "move" | "rename";
|
||||
export type OrganizeOperation = "copy" | "move" | "rename" | "in_place";
|
||||
export type OrganizeFileKind = "video" | "subtitle" | "audio" | "nfo" | "other";
|
||||
export type ExistingPolicy = "skip" | "replace_with_verify" | "conflict";
|
||||
|
||||
@@ -52,6 +52,8 @@ export interface OrganizeInput {
|
||||
/** 主视频最小体积,默认 50 MiB;低于此值视为样例/垃圾 */
|
||||
minVideoBytes?: number;
|
||||
grants?: { replace?: boolean };
|
||||
/** Explicit one-time replacement grants, restricted to the selected old library paths. */
|
||||
replacePaths?: readonly string[];
|
||||
parse?: ParseOptions;
|
||||
/** 随行字幕里此语言加 .default 标记(对照 MP DEFAULT_SUB);不设不加 */
|
||||
defaultSubtitleLang?: DefaultSubtitleLang;
|
||||
@@ -198,6 +200,7 @@ export function planOrganize(input: OrganizeInput): OrganizePlan {
|
||||
const existing = new Map((input.existingTargets ?? []).map((e) => [e.path, e]));
|
||||
const targetDevice = input.target.device;
|
||||
const isRename = input.operation === "rename";
|
||||
const inPlace = input.operation === "in_place";
|
||||
|
||||
const videos: { f: SourceFile; parsed: ParsedRelease; dst: string }[] = [];
|
||||
const sidecars: SourceFile[] = [];
|
||||
@@ -232,6 +235,15 @@ export function planOrganize(input: OrganizeInput): OrganizePlan {
|
||||
excluded.push({ src: f.path, kind, reason: "extra_content" });
|
||||
continue;
|
||||
}
|
||||
if (inPlace) {
|
||||
if (input.mediaType === "tv" && !parsed.episodes && !parsed.airDate) {
|
||||
excluded.push({ src: f.path, kind, reason: "no_episode" });
|
||||
continue;
|
||||
}
|
||||
if (input.mediaType === "tv" && parsed.season === undefined) parsed.season = 1;
|
||||
videos.push({ f, parsed, dst: f.path });
|
||||
continue;
|
||||
}
|
||||
const [, ext] = splitExt(basename(f.path));
|
||||
let dir: string | undefined;
|
||||
let named: ReturnType<typeof renderMediaFileName>;
|
||||
@@ -276,7 +288,7 @@ export function planOrganize(input: OrganizeInput): OrganizePlan {
|
||||
kind: "video",
|
||||
role: "main",
|
||||
action: "transfer",
|
||||
...(sameDevice(v.f.device, targetDevice) !== undefined
|
||||
...(!inPlace && sameDevice(v.f.device, targetDevice) !== undefined
|
||||
? { crossDevice: sameDevice(v.f.device, targetDevice) }
|
||||
: {}),
|
||||
...(v.parsed.season !== undefined ? { season: v.parsed.season } : {}),
|
||||
@@ -310,7 +322,7 @@ export function planOrganize(input: OrganizeInput): OrganizePlan {
|
||||
const [mainStem] = splitExt(main.dst);
|
||||
const [, ext] = splitExt(basename(s.path));
|
||||
const suffix = sidecarLanguageSuffix(tags, input.defaultSubtitleLang);
|
||||
let dst = `${mainStem}${suffix}.${ext.toLowerCase()}`;
|
||||
let dst = inPlace ? s.path : `${mainStem}${suffix}.${ext.toLowerCase()}`;
|
||||
for (let n = 1; usedSidecarDst.has(dst); n++) dst = `${mainStem}${suffix}.${n}.${ext.toLowerCase()}`;
|
||||
usedSidecarDst.add(dst);
|
||||
planned.push({
|
||||
@@ -321,7 +333,9 @@ export function planOrganize(input: OrganizeInput): OrganizePlan {
|
||||
role: "sidecar",
|
||||
mainSrc: main.f.path,
|
||||
action: "transfer",
|
||||
...(sameDevice(s.device, targetDevice) !== undefined ? { crossDevice: sameDevice(s.device, targetDevice) } : {}),
|
||||
...(!inPlace && sameDevice(s.device, targetDevice) !== undefined
|
||||
? { crossDevice: sameDevice(s.device, targetDevice) }
|
||||
: {}),
|
||||
});
|
||||
}
|
||||
|
||||
@@ -337,7 +351,7 @@ export function planOrganize(input: OrganizeInput): OrganizePlan {
|
||||
// 目标已存在
|
||||
const replaced: string[] = [];
|
||||
for (const p of planned) {
|
||||
if (p.action !== "transfer") continue;
|
||||
if (inPlace || p.action !== "transfer") continue;
|
||||
const e = existing.get(p.dst);
|
||||
if (!e) continue;
|
||||
if (e.size === p.size && e.sha256 !== undefined && e.sha256 === input.files.find((f) => f.path === p.src)?.sha256) {
|
||||
@@ -349,7 +363,7 @@ export function planOrganize(input: OrganizeInput): OrganizePlan {
|
||||
p.action = "skip";
|
||||
p.skipReason = "target_exists";
|
||||
conflicts.push({ kind: "target_exists", blocking: false, src: p.src, dst: p.dst, detail: "skipped" });
|
||||
} else if (onExisting === "replace_with_verify") {
|
||||
} else if (onExisting === "replace_with_verify" && (!input.replacePaths || input.replacePaths.includes(p.dst))) {
|
||||
p.action = "replace";
|
||||
replaced.push(p.dst);
|
||||
if (!input.grants?.replace)
|
||||
@@ -397,10 +411,11 @@ export function planOrganize(input: OrganizeInput): OrganizePlan {
|
||||
bytes,
|
||||
});
|
||||
}
|
||||
preconditions.push({
|
||||
kind: "target_absent",
|
||||
paths: active.filter((p) => p.action === "transfer").map((p) => p.dst),
|
||||
});
|
||||
if (!inPlace)
|
||||
preconditions.push({
|
||||
kind: "target_absent",
|
||||
paths: active.filter((p) => p.action === "transfer").map((p) => p.dst),
|
||||
});
|
||||
preconditions.push({ kind: "source_unchanged", files: active.map((p) => ({ path: p.src, size: p.size })) });
|
||||
const verify = active.filter((p) => !isRename && needsCopy(p)).map((p) => p.dst);
|
||||
if (verify.length > 0) preconditions.push({ kind: "verify_after_copy", paths: verify });
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { replacementCovers, replacementScope } from "./replacement.ts";
|
||||
|
||||
describe("one-time replacement coverage", () => {
|
||||
it("movies require the same Part", () => {
|
||||
const old = replacementScope("Movie.2020.720p.Part1.mkv", "movie");
|
||||
expect(replacementCovers(old, [replacementScope("Movie.2020.1080p.Part2.mkv", "movie")])).toBe(false);
|
||||
expect(replacementCovers(old, [replacementScope("Movie.2020.1080p.Part1.mkv", "movie")])).toBe(true);
|
||||
});
|
||||
it("replaces only episodes fully covered by successful files, preserving indivisible merged ranges", () => {
|
||||
const success = [1, 2, 3, 5, 6].map((n) => replacementScope(`Show.S01E${String(n).padStart(2, "0")}.mkv`, "tv"));
|
||||
expect(replacementCovers(replacementScope("Show.S01E01.mkv", "tv"), success)).toBe(true);
|
||||
expect(replacementCovers(replacementScope("Show.S01E04.mkv", "tv"), success)).toBe(false);
|
||||
expect(replacementCovers(replacementScope("Show.S01E07.mkv", "tv"), success)).toBe(false);
|
||||
expect(replacementCovers(replacementScope("Show.S01E01-E10.mkv", "tv"), success)).toBe(false);
|
||||
expect(replacementCovers(replacementScope("Show.S02E01.mkv", "tv"), success)).toBe(false);
|
||||
expect(replacementCovers(replacementScope("Show.Special.mkv", "tv"), success)).toBe(false);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,35 @@
|
||||
import { parseReleasePath } from "../release-parser/path.ts";
|
||||
|
||||
/** Physical files are indivisible: every covered unit must have a successful replacement. */
|
||||
export interface ReplacementScope {
|
||||
mediaType: "movie" | "tv";
|
||||
part: string;
|
||||
season?: number;
|
||||
episodes?: number[];
|
||||
}
|
||||
export function replacementScope(
|
||||
path: string,
|
||||
mediaType: "movie" | "tv",
|
||||
units?: { season?: number; episodes?: number[] },
|
||||
): ReplacementScope {
|
||||
const parsed = parseReleasePath(path);
|
||||
const episodes =
|
||||
units?.episodes ??
|
||||
(parsed.episodes
|
||||
? Array.from({ length: parsed.episodes.end - parsed.episodes.start + 1 }, (_, i) => parsed.episodes!.start + i)
|
||||
: undefined);
|
||||
const season = units?.season ?? parsed.season;
|
||||
return {
|
||||
mediaType,
|
||||
part: (parsed.part ?? "").toLowerCase(),
|
||||
...(season !== undefined ? { season } : {}),
|
||||
...(episodes ? { episodes } : {}),
|
||||
};
|
||||
}
|
||||
export function replacementCovers(old: ReplacementScope, successful: readonly ReplacementScope[]): boolean {
|
||||
const compatible = successful.filter((s) => s.mediaType === old.mediaType && s.part === old.part);
|
||||
if (old.mediaType === "movie") return compatible.length > 0;
|
||||
if (old.season === undefined || !old.episodes?.length) return false;
|
||||
const episodes = new Set(compatible.filter((s) => s.season === old.season).flatMap((s) => s.episodes ?? []));
|
||||
return old.episodes.every((e) => episodes.has(e));
|
||||
}
|
||||
Reference in new issue
Block a user