Peach: Local-first video metadata scraper and media manager.
fix(web): 统一回收站卡片并补齐归入原因与视频还原
longmeidaoff2a01a2ba8b
diff --git a/README.md b/README.mdindex a49b186f1..06ed042fa 100644--- a/README.md+++ b/README.md@@ -68,6 +68,7 @@ https://github.com/user-attachments/assets/a5610874-e611-41bb-be22-7d99f0d64b62- **身份分类**:艺人按身份与发行范围分为女优、素人、西方、网黄博主和动画作者。素人指有可信非职业出演证据,或全部出演作品都是素人发行(FC2-PPV 番号,或带非视觉模型来源的「素人」标签)的艺人,女优与西方出演者不归为素人;其他作品题材只用于作品筛选。名册使用「艺人、卖家、在线」三个并列入口,卖家按来源账号与作品对应。筛选条只显示有内容的分类,资料页在视频数量左侧显示分类与图标。- **作品计数**:明确分段的同一 FC2 合集计为一个视频,分段文件和出演归属完整保留。已确认合并的身份共用资料与作品,旧资料页地址通往规范身份。- **版本与分卷**:同一番号的中字、无码、清晰度和修复版汇在一张作品卡里;各版本保留自己的分卷,播完一卷接着播放同版下一卷。+- **回收站**:卡片显示手动、垃圾、重复或文件缺失的归入原因;视频和其它资源均可直接还原。未记录原因的条目显示「原因未记录」。- **账号身份**:网黄博主分类需要身份或账号来源;未核实的条目可在全部名册查看。账号头像优先使用保存的图片;有本人身份依据的个人博主,在两部作品画面截到同一张脸时自动装上头像;其余账号以代表作画面占位,并标明非本人。资料页中的别名只承载身份名称,画质和资源包规格保留在文件信息中。- **西方图片来源**:出演者与网黄博主可选 Babepedia 主图库人像;Tushy 等 Vixen 网络作品以出演者和发行日匹配官方封面,卡片、详情和头像框选共用原图,无法唯一匹配时留待核验。- **女优页**:别名、生日身材、社媒和 JavDB、MISSAV 链接汇在一页,下面是她在你馆藏里的全部作品和照片;换头像时图库人像、作品封面、本机图片和图片地址都能先框一块,也能整张使用。diff --git a/docs/REUSE.md b/docs/REUSE.mdindex 24464ee7c..778b4e6e3 100644--- a/docs/REUSE.md+++ b/docs/REUSE.md@@ -516,6 +516,8 @@ Python 复用 MIT 许可的 [Ruff](https://docs.astral.sh/ruff/) 0.16.10,版## 卡片与来源头像+回收站复用 `MediaCard`、`/api/batch` 与共享操作回执,视频和资源共用还原按钮及原位失败提示。`asset.disposal_reason` 保存手动、垃圾、重复和文件缺失;还原清空原因,撤销按原原因归组写回,未知原因保持为空。无新增依赖。+卡片 label 复用既有 `javTitleHtml`、`followTitleMarks` 与 `data-media-tags`,分段筛选复用 `SegmentedRadioGroup`。来源头像共用 `PublicAPI` 的已验证图片主机、三个下载槽位、Pillow 解码、单请求合并与六小时缓存;只持久保存没有查询参数的公开静态头像地址。人物使用策略在投影和口味汇总处过滤明确登记的男优,原始来源记录仍完整保留,无新增依赖或 ledger 迁移。公开作品资料与评论复用 `jav_cache.PublicSnapshots`、既有 `filelock` 和原子写入;`cache_fresh` 与前端 `publicationFresh` 统一日历月边界、每天补齐及满月后的固定快照。`public_cache_scope` 将快照隔离到调用者数据目录,记录实际来源时间;测试显式传临时目录,默认 `PublicAPI()` 只用内存。媒体字节复用媒体缓存,来源 JSON 不承载本地标签决定、想要状态或观看历史。diff --git a/frontend/e2e/design-cards.test.ts b/frontend/e2e/design-cards.test.tsindex 62b563e36..2769c03b6 100644--- a/frontend/e2e/design-cards.test.ts+++ b/frontend/e2e/design-cards.test.ts@@ -167,19 +167,19 @@ describe('设计决定:作品卡、管理页与复核', () => {glyph: '[data-variant="resource"] [data-media-glyph]',kind: '[data-variant="resource"] [data-media-kind-glyph]',});- /* 回收站卡有边框:量实际盒子,头像、标题与最后一行都要和框、封面隔开,一行文件名不留空行。 */+ /* 回收站卡的标题统一两行,头像对齐标题顶部,归入原因与边框保留间距。 */const inset = await page.locator('#grid [data-media-card][data-variant="resource"]').first().evaluate((card) => {const box = (selector: string) => card.querySelector(selector)!.getBoundingClientRect();const frame = card.getBoundingClientRect();- const [pic, avatar, title, byline] = ['[data-media-pic]', '[data-media-avatar]', '[data-media-title]', '[data-media-byline]'].map(box);- return { left: avatar.left - frame.left, top: title.top - pic.bottom, bottom: frame.bottom - byline.bottom,+ const [pic, avatar, title, reason] = ['[data-media-pic]', '[data-media-avatar]', '[data-media-title]', '[data-media-disposal-reason]'].map(box);+ return { left: avatar.left - frame.left, top: title.top - pic.bottom, bottom: frame.bottom - reason.bottom,title: title.height, lineHeight: parseFloat(getComputedStyle(card.querySelector('[data-media-title]')!).lineHeight),- skew: Math.abs((avatar.top + avatar.bottom) / 2 - (title.top + byline.bottom) / 2) };+ skew: Math.abs(avatar.top - title.top) };});assert.ok(inset.left >= 10 && inset.top >= 8 && inset.bottom >= 10,`回收站卡的元信息区贴着边框或封面:左 ${inset.left}、上 ${inset.top}、下 ${inset.bottom}`);- assert.ok(inset.title < inset.lineHeight * 1.5, `一行文件名的标题仍占 ${inset.title}px,预留了第二行`);- assert.ok(inset.skew <= 3, `头像没有和标题加署名那一块居中对齐,偏 ${inset.skew}px`);+ assert.ok(Math.abs(inset.title - inset.lineHeight * 2) < 1, `回收站标题未预留两行:${JSON.stringify(inset)}`);+ assert.ok(inset.skew <= 3, `头像没有位于标题区顶部,偏 ${inset.skew}px`);assert.deepEqual([trash.glyph?.display, trash.glyph?.place, trash.glyph?.color], ['grid', 'center center', trash.muted.color],'回收站资源卡封面格里的字形没有居中或不是次要文字色');assert.deepEqual([trash.kind?.display, trash.kind?.place, trash.kind?.color], ['grid', 'center center', trash.text.color],@@ -827,7 +827,7 @@ describe('设计决定:作品卡、管理页与复核', () => {await cards.first().locator('[data-junk-action="dispose"]').click();await page.waitForFunction(() => document.querySelectorAll('#grid [data-junk-card]').length === 2, null,{ timeout: 10_000 });- assert.deepEqual(opened.state.batches, [{ ids: [9101], operation: 'dispose' }]);+ assert.deepEqual(opened.state.batches, [{ ids: [9101], operation: 'dispose', disposal_reason: 'junk' }]);await page.getByText('已移入回收站', { exact: true }).first().waitFor({ timeout: 5_000 });// 分类是 `<a href>`,普通左键由壳改地址重读:整页重载的话,页面上记的这个标记会丢。diff --git a/frontend/e2e/trash-cards.test.ts b/frontend/e2e/trash-cards.test.tsnew file mode 100644index 000000000..23a9cdf45--- /dev/null+++ b/frontend/e2e/trash-cards.test.ts@@ -0,0 +1,95 @@+import assert from 'node:assert/strict';+import { after, before, describe, it } from 'node:test';+import type { Browser } from 'playwright-core';+import { launch, requiredEnv, VIEWPORTS } from './harness.ts';++describe('回收站卡片', () => {+ let browser: Browser;+ before(async () => { browser = await launch() });+ after(async () => { await browser?.close() });+ for (const viewport of VIEWPORTS) {+ it(`${viewport.name} 混排卡片等高、展示归入原因并可还原视频`, async () => {+ const context = await browser.newContext({ viewport: { width: viewport.width, height: viewport.height } });+ try {+ const page = await context.newPage();+ await page.addInitScript(() => localStorage.setItem('peach.settings.v1', JSON.stringify({ detailAutoplay: false })));+ const reasons = ['manual', 'junk', 'duplicate', 'missing', null];+ const items = Array.from({ length: 10 }, (_, i) => ({+ id: 92000 + i, name: i === 1 ? '长标题'.repeat(40) : `示例资源 ${i}`,+ medium: ['video', 'image', 'other'][i % 3], location: 'local', duration: i % 3 === 0 ? 163 : null,+ size: 10000, disposal: 'trash', disposal_reason: reasons[i % 5],+ is_jav: i === 0, code: i === 0 ? 'DEMO-001' : null, release_date: '2026-01-01',+ creator: '示例创作者', tags: i % 2 === 0 ? ['示例标签', '长标签'.repeat(20)] : [],+ }));+ const restored: number[] = [];+ let attempts = 0;+ await page.route('**/photo-thumb?*', route => route.fulfill({ contentType: 'image/svg+xml',+ body: '<svg xmlns="http://www.w3.org/2000/svg" width="640" height="360"><rect width="640" height="360" fill="gray"/></svg>' }));+ await page.route('**/api/items?*', route => route.fulfill({ json: {+ items: items.filter(item => !restored.includes(item.id)), total: items.length - restored.length, has_more: false,+ } }));+ await page.route('**/api/batch', async route => {+ const body = route.request().postDataJSON();+ if (body.operation === 'restore') {+ attempts += 1;+ if (attempts === 1) {+ await route.fulfill({ status: 503, json: { error: '演示还原失败' } });+ return;+ }+ restored.push(...body.ids);+ } else {+ assert.equal(body.operation, 'dispose');+ assert.equal(body.disposal_reason, 'manual');+ restored.splice(0);+ }+ await route.fulfill({ json: { ok: true, changed: body.ids.length } });+ });+ await page.goto(requiredEnv('PEACH_E2E_ORIGIN') + '/trash', { waitUntil: 'load' });+ const cards = page.locator('#grid [data-media-card]');+ await cards.first().waitFor();+ assert.equal(await cards.count(), 10);+ const heights: number[] = [];+ for (let i = 0; i < 10; i++) {+ await cards.nth(i).scrollIntoViewIfNeeded();+ heights.push(await cards.nth(i).evaluate(card => card.getBoundingClientRect().height));+ assert.equal(await cards.nth(i).locator('[data-media-resource-action="restore"]').count(), 1);+ }+ assert.ok(Math.max(...heights) - Math.min(...heights) < 1, JSON.stringify(heights));+ assert.deepEqual(await cards.locator('[data-media-disposal-reason]').allTextContents(),+ ['手动', '垃圾', '重复', '文件缺失', '原因未记录', '手动', '垃圾', '重复', '文件缺失', '原因未记录']);+ assert.equal(await cards.locator('[data-flag="dispose"]').count(), 0);+ const textInsets: number[] = [];+ for (const i of [3, 4]) {+ await cards.nth(i).scrollIntoViewIfNeeded();+ textInsets.push(await cards.nth(i).locator('[data-media-title]').evaluate(title => {+ const range = document.createRange();+ range.selectNodeContents(title.firstChild!);+ return range.getBoundingClientRect().top - title.getBoundingClientRect().top;+ }));+ }+ assert.ok(Math.abs(textInsets[0]! - textInsets[1]!) < 1,+ `视频与资源的首行标题未对齐:${JSON.stringify(textInsets)}`);+ const video = cards.first();+ await video.scrollIntoViewIfNeeded();+ const boxes = await video.evaluate(card => {+ const duration = card.querySelector('[data-media-duration]')!.getBoundingClientRect();+ const restore = card.querySelector('[data-media-resource-action]')!.getBoundingClientRect();+ return { duration: duration.toJSON(), restore: restore.toJSON(), overflow: document.documentElement.scrollWidth > innerWidth };+ });+ assert.ok(boxes.duration.bottom <= boxes.restore.top || boxes.duration.left >= boxes.restore.right);+ assert.equal(boxes.overflow, false);+ await video.locator('[data-media-resource-action="restore"]').click();+ await video.locator('[data-media-operation-error]').waitFor();+ assert.equal(await video.locator('[data-media-operation-error]').textContent(), '演示还原失败');+ assert.equal(await cards.count(), 10);+ await video.locator('[data-media-resource-action="restore"]').click();+ await page.locator('#grid [data-media-card][data-id="92000"]').waitFor({ state: 'detached' });+ assert.deepEqual(restored, [92000]);+ await page.getByRole('button', { name: '撤销', exact: true }).last().click();+ const returned = page.locator('#grid [data-media-card][data-id="92000"]');+ await returned.waitFor();+ assert.equal(await returned.locator('[data-media-disposal-reason]').textContent(), '手动');+ } finally { await context.close() }+ });+ }+});diff --git a/frontend/src/application/catalog.js b/frontend/src/application/catalog.jsindex e779088f9..b8bf0fe46 100644--- a/frontend/src/application/catalog.js+++ b/frontend/src/application/catalog.js@@ -100,7 +100,8 @@ export async function runResourceOperation(it,operation){await loadCatalog();const inverse=operation==='restore'?'dispose':'restore';receiptsState.actionReceipt(operation==='restore'?'已还原':'已移入回收站',{undo:async()=>{- await api('/api/batch',{method:'POST',body:JSON.stringify({ids:[it.id],operation:inverse})});+ await api('/api/batch',{method:'POST',body:JSON.stringify({ids:[it.id],operation:inverse,+ ...(inverse==='dispose'?{disposal_reason:it.disposal_reason??null}:{})})});await loadCatalog();}});}catch(error){receiptsState.actionFailure('操作',error);throw error}@@ -493,7 +494,8 @@ export function loadJunk(surface){export async function runJunkOperation(it,operation){const ids=[it.id],disposed=operation==='dispose',reconsidered=operation==='reconsider-junk';try{- await api('/api/batch',{method:'POST',body:JSON.stringify({ids,operation})});+ await api('/api/batch',{method:'POST',body:JSON.stringify({ids,operation,+ ...(disposed?{disposal_reason:'junk'}:{})})});await loadCatalog();const inverse=disposed?'restore':reconsidered?'dismiss-junk':'reconsider-junk';receiptsState.actionReceipt(disposed?'已移入回收站':reconsidered?'已重新加入垃圾判断':'已标记为不是垃圾',{undo:async()=>{diff --git a/frontend/src/application/selection.js b/frontend/src/application/selection.jsindex 8ae1550a1..22361d2a6 100644--- a/frontend/src/application/selection.js+++ b/frontend/src/application/selection.js@@ -64,7 +64,12 @@ export async function runCatalogBatch(operation,button){setSelectMode(false,true);await reloadAfterWrite();const inverse=operation==='dispose'?'restore':operation==='restore'?'dispose':null;receiptsState.actionReceipt(`已${labels[operation]} ${ids.length} 项`,{undo:inverse?async()=>{- await api('/api/batch',{method:'POST',body:JSON.stringify({ids,operation:inverse})});+ if(inverse==='dispose'&&r.restored_reasons){+ for(const reason of [null,'manual','junk','duplicate','missing']){+ const group=ids.filter(id=>r.restored_reasons[id]===reason);+ if(group.length)await api('/api/batch',{method:'POST',body:JSON.stringify({ids:group,operation:inverse,disposal_reason:reason})});+ }+ }else await api('/api/batch',{method:'POST',body:JSON.stringify({ids,operation:inverse})});await reloadAfterWrite();}:null})}catch(error){setActionBusy(button,false);throw error}@@ -126,7 +131,8 @@ export async function runJunkBatch(operation,button){return confirmModal({title:titles[operation],body:`将处理选中的 ${ids.length} 个文件。`,confirmLabel:titles[operation],danger:false,onConfirm:async()=>{setActionBusy(button);try{- await api('/api/batch',{method:'POST',body:JSON.stringify({ids,operation})});+ await api('/api/batch',{method:'POST',body:JSON.stringify({ids,operation,+ ...(operation==='dispose'?{disposal_reason:'junk'}:{})})});setSelectMode(false,true);await loadCatalog();const inverse=operation==='dispose'?'restore':operation==='dismiss-junk'?'reconsider-junk':operation==='reconsider-junk'?'dismiss-junk':null;diff --git a/frontend/src/react/catalog-grid/types.ts b/frontend/src/react/catalog-grid/types.tsindex 26001236b..6bb9d1316 100644--- a/frontend/src/react/catalog-grid/types.ts+++ b/frontend/src/react/catalog-grid/types.ts@@ -39,6 +39,7 @@ export interface MediaItem {why?: string;feedback?: string;disposal?: string;+ disposal_reason?: 'manual' | 'junk' | 'duplicate' | 'missing' | null;watch_later?: boolean;part_group?: {key: string; seed_id: number; count: number; title?: string; total_size?: number; total_duration?: number;diff --git a/frontend/src/react/components/media-card.css b/frontend/src/react/components/media-card.cssindex e2e92a97e..7ceb98389 100644--- a/frontend/src/react/components/media-card.css+++ b/frontend/src/react/components/media-card.css@@ -64,8 +64,8 @@ body[data-density="dense"] .peach-react [data-media-card][data-variant="short"]}/* 回收站那一屏的卡是一块有边的面,封面贴边;元信息区在框里留出四周的边距,不用网格卡那套- * 「垫 8px 再 -8px 抵消」(卡本身 overflow:hidden,垫出去的一圈也会被裁掉)。文件名多是一行,- * 标题不预留第二行,头像与标题加署名那一块居中对齐;屏外估高跟着按一行算。 */+ * 「垫 8px 再 -8px 抵消」(卡本身 overflow:hidden,垫出去的一圈也会被裁掉)。标题两行,+ * 署名、标签与归入原因各一行,屏外估高和加载骨架共用这份内容预算。 */body[data-surface="/trash"] .peach-react [data-media-card] {gap: 0;overflow: hidden;@@ -74,16 +74,23 @@ body[data-surface="/trash"] .peach-react [data-media-card] {}body[data-surface="/trash"] .peach-react [data-media-card] [data-media-pic] { --pic-radius: 0px; }body[data-surface="/trash"] .peach-react [data-media-card] [data-media-meta] {- --card-meta-byline: 1lh;- --card-meta-tags: 0px;- --card-meta-block: calc(var(--fs-md) * 1.35 + 3px + var(--card-meta-byline) + var(--card-meta-tags));+ --card-meta-byline: 20px;+ --card-meta-tags: calc(var(--fs-xs) * 1.45 + var(--tag-pad-y) * 2 + 2px + 3px);+ --card-meta-block: calc(var(--fs-md) * 2.7 + 3px + var(--card-meta-byline) + var(--card-meta-tags) + 23px);min-height: 0;margin: 0;padding: 10px 12px 12px;}-body[data-surface="/trash"] .peach-react [data-media-card] [data-media-title] { min-height: 0; }+body[data-surface="/trash"] .peach-react [data-media-card] [data-media-title] { min-height: 2.7em; align-content: start; }body[data-surface="/trash"] .peach-react [data-media-card] [data-media-text] { gap: 3px; }-body[data-surface="/trash"] .peach-react [data-media-text] > [data-media-tags] { margin-top: -4px; }+body[data-surface="/trash"] .peach-react [data-media-text] > [data-media-tags] { margin-top: 0; }+body[data-surface="/trash"] .peach-react button[data-media-title] {+ display: flex; flex-direction: column; align-items: stretch; justify-content: flex-start;+}+.peach-react [data-media-title-text] {+ display: -webkit-box; max-height: 2.7em; overflow: hidden; text-decoration: inherit;+ -webkit-line-clamp: 2; -webkit-box-orient: vertical;+}/* 整张卡的打开点击区垫在封面与元信息区下面。 */.peach-react [data-media-open] {@@ -577,7 +584,6 @@ body[data-surface="/trash"] .peach-react [data-media-text] > [data-media-tags] {.peach-react [data-media-flags] > i { display: block; width: 6px; height: 6px; }.peach-react [data-flag="dislike"] { background: var(--drop); }.peach-react [data-flag="seen"] { background: var(--muted); }-.peach-react [data-flag="dispose"] { background: var(--meter); }.peach-react [data-flag="later"] { background: var(--ink); }.peach-react [data-media-why] { min-width: 0; max-width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }.peach-react [data-variant="next"] [data-media-why] { color: var(--loupe); }@@ -663,6 +669,23 @@ body[data-density="dense"]:not([data-surface="/trash"]) .peach-react [data-mediabody[data-density="dense"]:not([data-surface="/trash"]) .peach-react [data-media-card] [data-media-tag]:nth-child(n+2) { display: none; }/* ── 回收站里的资源卡 ── */+body[data-surface="/trash"] .peach-react [data-media-text] { height: var(--card-meta-block); }+body[data-surface="/trash"] .peach-react [data-media-byline] { flex-wrap: nowrap; height: 20px; flex: none; overflow: hidden; }+body[data-surface="/trash"] .peach-react [data-media-size] { flex: none; white-space: nowrap; }+body[data-surface="/trash"] .peach-react [data-media-tags] {+ height: calc(var(--card-meta-tags) - 3px); flex: none; flex-wrap: nowrap; overflow: hidden;+}+.peach-react [data-media-disposal-reason] {+ flex: none; height: 20px; overflow: hidden; color: var(--ink-2);+ font-size: var(--fs-xs); line-height: 20px; text-overflow: ellipsis; white-space: nowrap;+}+.peach-react [data-pending-delete] [data-media-duration] { top: 10px; bottom: auto; }+.peach-react [data-pending-delete] :is([data-media-preview], [data-media-later], [data-media-seek]) { display: none; }+.peach-react [data-media-operation-error] {+ position: absolute; z-index: 7; left: 10px; right: 10px; bottom: 48px;+ padding: 8px; border-radius: var(--badge-radius); background: var(--ground); color: var(--drop);+ font-size: var(--fs-xs); overflow-wrap: anywhere;+}.peach-react [data-media-glyph] {display: grid;place-items: center;diff --git a/frontend/src/react/components/media-card.tsx b/frontend/src/react/components/media-card.tsxindex 21eae8a39..50c425cc4 100644--- a/frontend/src/react/components/media-card.tsx+++ b/frontend/src/react/components/media-card.tsx@@ -44,6 +44,39 @@ function Icon({ name }: { name: string }) {}const RESOURCE_LABELS: Record<string, string> = { image: '图片', audio: '音频', archive: '压缩包', other: '其它文件' };+const DISPOSAL_LABELS = { manual: '手动', junk: '垃圾', duplicate: '重复', missing: '文件缺失' };++function DisposalReason({ item }: { item: MediaItem }) {+ if (item.disposal !== 'trash') return null;+ const label = (item.disposal_reason && DISPOSAL_LABELS[item.disposal_reason]) || '原因未记录';+ return <span data-media-disposal-reason="" title={`归入原因:${label}`}>{label}</span>;+}++/** 视频与资源共用回收站操作,失败原因留在卡片上供重试。 */+function ResourceAction({ item, actions }: { item: MediaItem; actions: MediaCardActions }) {+ const [busy, setBusy] = useState(false);+ const [error, setError] = useState('');+ const operation = item.disposal === 'trash' ? 'restore' : 'dispose';+ const label = operation === 'restore' ? '还原' : '移入回收站';+ const run = (event: MouseEvent) => {+ event.preventDefault();+ event.stopPropagation();+ if (busy) return;+ setBusy(true);+ setError('');+ void actions.resourceOperation(item, operation)+ .catch((cause: unknown) => setError(cause instanceof Error ? cause.message : '操作失败,请重试'))+ .finally(() => setBusy(false));+ };+ return <>+ <button type="button" data-media-resource-action={operation} aria-label={`${label} ${item.name || '未命名资源'}`}+ title={label} onClick={run} aria-busy={busy || undefined} aria-disabled={busy || undefined}>+ {busy ? <><span dangerouslySetInnerHTML={{ __html: spinnerHtml(`正在${label}`) }} /><span>{`正在${label}`}</span></>+ : <span>{label}</span>}+ </button>+ {error ? <span data-media-operation-error="" role="alert">{error}</span> : null}+ </>;+}/** 一个列表里的画面框等高:竖屏带一律竖屏比例,其余按版式取外观应用层那一份(`@peach/appearance`* 的 `cardRatio`,骨架读的也是它)。 */@@ -172,7 +205,7 @@ function VideoCard({ item, variant, layout, selected, selectMode, seekSeconds, hconst { avatar, who } = identityParts(item);const tags = (item.follow_tags || item.tags || []).slice(0, 3);const flags = [item.feedback === 'dislike' && 'dislike', item.feedback === 'seen' && 'seen',- item.disposal === 'trash' && 'dispose', item.watch_later && 'later'].filter(Boolean) as string[];+ item.watch_later && 'later'].filter(Boolean) as string[];const click = (event: MouseEvent<HTMLElement>) => {const target = event.target as HTMLElement;@@ -209,6 +242,7 @@ function VideoCard({ item, variant, layout, selected, selectMode, seekSeconds, h? <span data-media-group="" title={editions.editions.join(' · ')}>{`${Number(editions.count).toLocaleString()} 个版本`}</span>: null}<span data-media-duration="">{fmtDur(shownDuration)}</span>+ {item.disposal === 'trash' ? <ResourceAction item={item} actions={actions} /> : null}{watched > 0? (<div data-media-progress="" role="progressbar" aria-label="观看进度" aria-valuemin={0} aria-valuemax={100}@@ -248,7 +282,9 @@ function VideoCard({ item, variant, layout, selected, selectMode, seekSeconds, h{avatar}<div data-media-text=""><button type="button" data-media-title="" data-open=""- dangerouslySetInnerHTML={{ __html: titleHtml }} />+ dangerouslySetInnerHTML={item.disposal === 'trash' ? undefined : { __html: titleHtml }}>+ {item.disposal === 'trash' ? <span data-media-title-text="" dangerouslySetInnerHTML={{ __html: titleHtml }} /> : null}+ </button><div data-media-byline="">{who}{item.why ? <span data-media-why="">{item.why}</span> : null}@@ -257,7 +293,7 @@ function VideoCard({ item, variant, layout, selected, selectMode, seekSeconds, h{item.play_count ? <span data-media-watch-count="">{`看过 ${item.play_count}`}</span> : null}<span data-media-flags="">{flags.map((flag) => <i key={flag} data-flag={flag} />)}</span></div>- {tags.length+ {tags.length || item.disposal === 'trash'? (<div data-media-tags="">{tags.map((tag) => (@@ -267,6 +303,7 @@ function VideoCard({ item, variant, layout, selected, selectMode, seekSeconds, h</div>): null}+ <DisposalReason item={item} /></div></div></article>@@ -277,20 +314,10 @@ function VideoCard({ item, variant, layout, selected, selectMode, seekSeconds, h* 「移入回收站」,点了就写 ledger,做完给一颗撤销键。 */function ResourceCard({ item, selected, selectMode, helpers, actions, onOpen }: MediaCardProps) {const card = useRef<HTMLElement | null>(null);- const [busy, setBusy] = useState(false);const image = item.medium === 'image' && item.location !== 'online';const name = String(item.name || '');const label = name.toLowerCase().endsWith('.url') ? '网址快捷方式' : RESOURCE_LABELS[item.medium || ''] || '其它文件';const glyph = image ? 'pics' : label === '网址快捷方式' ? 'globe' : 'hard-drive';- const operation = item.disposal === 'trash' ? 'restore' : 'dispose';- const actionLabel = operation === 'restore' ? '还原' : '移入回收站';- const run = (event: MouseEvent) => {- event.preventDefault();- event.stopPropagation();- if (busy) return;- setBusy(true);- void actions.resourceOperation(item, operation).catch(() => {}).finally(() => setBusy(false));- };const click = (event: MouseEvent<HTMLElement>) => {if (!card.current) return;if (selectMode || event.shiftKey || event.ctrlKey || event.metaKey) {@@ -300,7 +327,6 @@ function ResourceCard({ item, selected, selectMode, helpers, actions, onOpen }:}onOpen(item, card.current);};- const busyLabel = operation === 'restore' ? '正在还原' : '正在处理';return (<article ref={card} data-media-card="" data-id={item.id} data-variant="resource" data-medium={item.medium || 'other'}data-pending-delete={item.disposal === 'trash' ? '' : undefined} data-selected={selected ? '' : undefined}@@ -315,12 +341,7 @@ function ResourceCard({ item, selected, selectMode, helpers, actions, onOpen }:<div data-media-badge="" dangerouslySetInnerHTML={{ __html: helpers.badgeHtml(item.location || '', item.cost || '') }} /><span data-media-check=""><Icon name="check" /></span><span data-media-trash-mark=""><Icon name="trash" /><b>回收站</b></span>- <button type="button" data-media-resource-action={operation} aria-label={`${actionLabel} ${name}`}- title={actionLabel} onClick={run} aria-busy={busy || undefined} aria-disabled={busy || undefined}>- {busy- ? <><span dangerouslySetInnerHTML={{ __html: spinnerHtml(operation === 'restore' ? '正在还原' : '正在移入回收站') }} /><span>{busyLabel}</span></>- : <><Icon name={operation === 'restore' ? 'rotate-ccw' : 'trash'} /><span>{actionLabel}</span></>}- </button>+ <ResourceAction item={item} actions={actions} /></div><div data-media-meta=""><span data-media-avatar="" data-media-kind-glyph="" aria-hidden="true"><Icon name={glyph} /></span>@@ -332,6 +353,8 @@ function ResourceCard({ item, selected, selectMode, helpers, actions, onOpen }:{item.why ? <span data-media-why="">{item.why}</span> : null}<span data-media-size="">{Number(item.size) > 0 ? fmtSize(Number(item.size)) : '大小未知'}</span></div>+ {item.disposal === 'trash' ? <div data-media-tags="" /> : null}+ <DisposalReason item={item} /></div></div></article>diff --git a/frontend/src/react/duplicates/duplicates.ts b/frontend/src/react/duplicates/duplicates.tsindex 604198324..c9150960b 100644--- a/frontend/src/react/duplicates/duplicates.ts+++ b/frontend/src/react/duplicates/duplicates.ts@@ -146,7 +146,8 @@ export function victimBytes(groups: readonly DuplicateGroup[], ids: readonly num/** 批量改判。一次最多 200 条,分批串行发:并发发出去只是让服务端自己排队。 */export async function batchOperate(ids: readonly number[], operation: 'dispose' | 'restore'): Promise<void> {for (let offset = 0; offset < ids.length; offset += BATCH_LIMIT) {- await apiSend(BATCH_URL, { ids: ids.slice(offset, offset + BATCH_LIMIT), operation });+ await apiSend(BATCH_URL, { ids: ids.slice(offset, offset + BATCH_LIMIT), operation,+ ...(operation === 'dispose' ? { disposal_reason: 'duplicate' } : {}) });}}diff --git a/frontend/test/react/duplicates.test.tsx b/frontend/test/react/duplicates.test.tsxindex e68a76f95..80a371834 100644--- a/frontend/test/react/duplicates.test.tsx+++ b/frontend/test/react/duplicates.test.tsx@@ -140,7 +140,7 @@ it('批量保留最大先确认,弹层点名条数与字节数;确认后进expect(seen[0]!.body).toContain('将把 2 个重复文件的馆藏记录移入回收站,每组保留最大的一个。');expect(seen[0]!.body).toContain('文件共 2.0 GB,记录可从回收站还原。');const batch = fetcher.mock.calls.findIndex((call) => call[0] === '/api/batch');- expect(sentBody(fetcher, batch)).toEqual({ ids: [2, 4], operation: 'dispose' });+ expect(sentBody(fetcher, batch)).toEqual({ ids: [2, 4], operation: 'dispose', disposal_reason: 'duplicate' });expect(toast).toHaveBeenCalledWith('已把 2 项移入回收站', expect.objectContaining({ undo: expect.any(Function) }));const { undo } = toast.mock.calls[0]![1] as { undo(): Promise<void> };await undo();diff --git a/migrations/0046_disposal_reason.sql b/migrations/0046_disposal_reason.sqlnew file mode 100644index 000000000..939f6c75c--- /dev/null+++ b/migrations/0046_disposal_reason.sql@@ -0,0 +1,2 @@+ALTER TABLE asset ADD COLUMN disposal_reason TEXT+CHECK(disposal_reason IS NULL OR disposal_reason IN ('manual','junk','duplicate','missing'));diff --git a/scripts/trash_junk.py b/scripts/trash_junk.pyindex 008d98752..9504e5b3e 100644--- a/scripts/trash_junk.py+++ b/scripts/trash_junk.py@@ -167,7 +167,7 @@ def trash_assets(connection, asset_ids: list[int]) -> int:return 0marks = ",".join("?" * len(ids))cursor = connection.execute(- f"UPDATE asset SET disposal='trash', feedback_at=? WHERE id IN ({marks}) "+ f"UPDATE asset SET disposal='trash', disposal_reason='junk', feedback_at=? WHERE id IN ({marks}) ""AND disposal IS NULL AND location IN ('local','115','pikpak')",[time.time(), *ids],)diff --git a/src/peach/download_postprocess.py b/src/peach/download_postprocess.pyindex 5b998cbda..3ab53c1be 100644--- a/src/peach/download_postprocess.py+++ b/src/peach/download_postprocess.py@@ -91,7 +91,7 @@ def _isolate_ads(contract, main: int, folder_ids: list[int]) -> int:marks = ",".join("?" * len(candidates))with contract.database.write_transaction() as connection:cursor = connection.execute(- f"UPDATE asset SET disposal='trash',feedback_at=? WHERE id IN ({marks}) "+ f"UPDATE asset SET disposal='trash',disposal_reason='junk',feedback_at=? WHERE id IN ({marks}) ""AND disposal IS NULL", (time.time(), *candidates))return int(cursor.rowcount)diff --git a/src/peach/web_activity.py b/src/peach/web_activity.pyindex 84ee6e11a..18b69756e 100644--- a/src/peach/web_activity.py+++ b/src/peach/web_activity.py@@ -73,8 +73,8 @@ def w_feedback(contract: ActivityContract, body):if current == VANISHED:raise ValueError("vanished assets cannot be moved to the recycle bin")connection.execute(- "UPDATE asset SET disposal=?, feedback_at=? WHERE id=?",- (None if current == "trash" else "trash", time.time(), aid),+ "UPDATE asset SET disposal=?, disposal_reason=?, feedback_at=? WHERE id=?",+ (None if current == "trash" else "trash", None if current == "trash" else "manual", time.time(), aid),)elif kind == "o":connection.execute(@@ -94,7 +94,7 @@ def w_feedback(contract: ActivityContract, body):"UPDATE asset SET rating=? WHERE id=?", (value or None, aid),)result = dict(connection.execute(- "SELECT feedback,disposal,rating,o_count FROM asset WHERE id=?", (aid,),+ "SELECT feedback,disposal,disposal_reason,rating,o_count FROM asset WHERE id=?", (aid,),).fetchone())return {"ok": True, **result}diff --git a/src/peach/web_batch.py b/src/peach/web_batch.pyindex c67a932c5..569eb4f6d 100644--- a/src/peach/web_batch.py+++ b/src/peach/web_batch.py@@ -802,6 +802,36 @@ def _reject_ineligible_targets(operation: str, rows) -> None:raise ValueError("junk decisions are only allowed for active physical assets")+def _batch_disposal_reason(body):+ """移入回收站的原因;显式空值用于撤销未记录原因的条目。"""+ if body.get("operation") != "dispose":+ return None+ reason = body.get("disposal_reason", "manual")+ if reason not in (None, "manual", "junk", "duplicate", "missing"):+ raise ValueError("unsupported disposal reason")+ return reason+++def _write_batch_state(connection, rows, operation, now, disposal_reason):+ """同一事务写入反馈或回收站状态,并保留还原操作的撤销信息。"""+ ids = [row["id"] for row in rows]+ marks = ",".join("?" * len(ids))+ if operation == "restore":+ connection.execute(+ f"UPDATE asset SET disposal=NULL,disposal_reason=NULL,feedback_at=? WHERE id IN ({marks})",+ [now, *ids],+ )+ return {"restored_reasons": {str(row["id"]): row["disposal_reason"] for row in rows}}+ if operation == "dispose":+ connection.execute(+ f"UPDATE asset SET disposal='trash',disposal_reason=?,feedback_at=? WHERE id IN ({marks})",+ [disposal_reason, now, *ids],+ )+ else:+ connection.execute(f"UPDATE asset SET feedback='seen',feedback_at=? WHERE id IN ({marks})", [now, *ids])+ return {}++def w_batch(contract: WebContract, body):"""Apply one explicit, reversible marker to a bounded selected set."""raw_ids = body.get("ids")@@ -818,9 +848,11 @@ def w_batch(contract: WebContract, body):raise ValueError("unsupported batch operation")# 产地的取值在这里就要认出来,别等到写库那一步才发现拼错了。region_value = _batch_region_value(body) if operation == "region" else None+ disposal_reason = _batch_disposal_reason(body)marks = ",".join("?" * len(ids))contract.cache_bust()purge_outcome = None+ state_receipt = {}# 批量是一次写、几秒就完的事,但删除那一支会真的动磁盘:事后「刚才那一批到底# 删了多少、有没有半路失败」只有这条记录答得出。不声明互斥——两批不同的资产# 各改各的,互斥只会把正常的连续操作挡住。@@ -830,19 +862,15 @@ def w_batch(contract: WebContract, body):try:with contract.write_transaction() as connection:found = connection.execute(- f"SELECT id,path,snapshot_path,disposal,location FROM asset WHERE id IN ({marks})", ids,+ f"SELECT id,path,snapshot_path,disposal,disposal_reason,location FROM asset WHERE id IN ({marks})", ids,).fetchall()valid_ids = [row["id"] for row in found]if not valid_ids:raise ValueError("assets not found")_reject_ineligible_targets(operation, found)now = time.time()- if operation == "restore":- placeholders = ",".join("?" * len(valid_ids))- connection.execute(- f"UPDATE asset SET disposal=NULL,feedback_at=? WHERE id IN ({placeholders})",- [now, *valid_ids],- )+ if operation in {"restore", "seen", "dispose"}:+ state_receipt = _write_batch_state(connection, found, operation, now, disposal_reason)elif operation == "delete":# 已消失的行文件本来就不在了,只删账本行;文件又回到盘上的那几条留着,# 下一轮扫描会把它们接回在库。选中里有一条已消失的,整批都按这条口径删。@@ -862,13 +890,6 @@ def w_batch(contract: WebContract, body):"DELETE FROM review_decision WHERE category='junk_file' AND item_key=?",[(str(asset_id),) for asset_id in valid_ids],)- elif operation in {"seen", "dispose"}:- column, value = ("feedback", "seen") if operation == "seen" else ("disposal", "trash")- placeholders = ",".join("?" * len(valid_ids))- connection.execute(- f"UPDATE asset SET {column}=?,feedback_at=? WHERE id IN ({placeholders})",- [value, now, *valid_ids],- )elif operation == "region":# 走 `write_owned_fields` 而不是直接 UPDATE:产地是真相字段,用户这一# 笔要压得住后面每一轮刮削与推断,归属列是它唯一的凭据。@@ -901,7 +922,7 @@ def w_batch(contract: WebContract, body):return resulthandle.finish("succeeded", summary={"operation": operation,"changed": len(valid_ids)})- return {"ok": True, "operation": operation, "changed": len(valid_ids)}+ return {"ok": True, "operation": operation, "changed": len(valid_ids), **state_receipt}def _add_large_short_copy_cluster(items: list[dict], clusters: list[list[dict]]):diff --git a/src/peach/web_catalog.py b/src/peach/web_catalog.pyindex 154b9c8c2..9af6633d6 100644--- a/src/peach/web_catalog.py+++ b/src/peach/web_catalog.py@@ -337,7 +337,7 @@ def q_items(contract: WebContract, args):sql = ("SELECT a.id,a.location,a.path,a.name,a.catalog_title,a.original_title,a.medium,""a.creator,a.studio,a.code,a.release_date,a.size,""a.duration,a.width,a.height,a.ctx_length,a.ctx_orient,a.snapshot_path,"- "a.play_count,a.leave_ratio,a.feedback,a.disposal,a.rating,a.o_count,"+ "a.play_count,a.leave_ratio,a.feedback,a.disposal,a.disposal_reason,a.rating,a.o_count,""a.play_seconds,a.max_reached,a.seek_count,a.region,"f"{EFFECTIVE_REGION_SQL} AS effective_region,""EXISTS(SELECT 1 FROM watch_queue w WHERE w.asset_id=a.id "@@ -875,7 +875,7 @@ def q_item(contract: WebContract, aid):r = c.execute("SELECT id,location,path,name,catalog_title,original_title,creator,studio,code,""release_date,size,duration,width,height,field_owners,mutation_revision,"- "ctx_length,ctx_orient,snapshot_path,play_count,leave_ratio,feedback,disposal,"+ "ctx_length,ctx_orient,snapshot_path,play_count,leave_ratio,feedback,disposal,disposal_reason,""rating,o_count,play_seconds,max_reached,seek_count,region,"f"{effective_region_sql('asset')} AS effective_region,""COALESCE((SELECT p.liked FROM asset_preference p WHERE p.asset_id=asset.id "diff --git a/src/peach/web_resource_sync.py b/src/peach/web_resource_sync.pyindex d31a9c1ee..429a83507 100644--- a/src/peach/web_resource_sync.py+++ b/src/peach/web_resource_sync.py@@ -757,7 +757,7 @@ def w_purge_missing(contract: ResourceSyncContract, body):stamp = time.time()kept = set(mark_vanished(connection, record_holders(connection, ids), stamp))connection.executemany(- "UPDATE asset SET disposal='trash',feedback_at=? WHERE id=? AND disposal IS NULL",+ "UPDATE asset SET disposal='trash',disposal_reason='missing',feedback_at=? WHERE id=? AND disposal IS NULL",[(stamp, asset_id) for asset_id in ids if asset_id not in kept],)reattached = set(reattach_vanished(connection, kept))diff --git a/tests/test_downloads_postprocess.py b/tests/test_downloads_postprocess.pyindex 8cd1d84f1..aecd9a0a9 100644--- a/tests/test_downloads_postprocess.py+++ b/tests/test_downloads_postprocess.py@@ -12,6 +12,13 @@ from support.ledger import fresh_ledgerclass DownloadPostprocessTests(unittest.TestCase):+ def test_isolated_ads_record_the_junk_reason(self):+ self.contract.download_junk_candidates = lambda: [{"id": self.asset_id}]+ self.assertEqual(post._isolate_ads(self.contract, -1, [self.asset_id]), 1)+ with self.database.read_connection() as connection:+ self.assertEqual(tuple(connection.execute("SELECT disposal,disposal_reason FROM asset WHERE id=?",+ (self.asset_id,)).fetchone()), ("trash", "junk"))+def setUp(self):temporary = tempfile.TemporaryDirectory()self.addCleanup(temporary.cleanup)diff --git a/tests/test_fastapi_api.py b/tests/test_fastapi_api.pyindex ee133c87b..54fc399b1 100644--- a/tests/test_fastapi_api.py+++ b/tests/test_fastapi_api.py@@ -41,7 +41,7 @@ CREATE TABLE asset(duration REAL, width INTEGER, height INTEGER, ctx_length TEXT, ctx_orient TEXT,ctx_quality TEXT, play_count INTEGER DEFAULT 0, last_played TEXT, rating INTEGER,o_count INTEGER, watch_ratio REAL, stash_scene_id INTEGER, snapshot_path TEXT, first_seen TEXT,- feedback TEXT, disposal TEXT, leave_ratio REAL, play_seconds REAL,+ feedback TEXT, disposal TEXT, disposal_reason TEXT, leave_ratio REAL, play_seconds REAL,feedback_at REAL, seek_count INTEGER, max_reached REAL,field_owners TEXT, mutation_revision INTEGER NOT NULL DEFAULT 0, region TEXT,UNIQUE(location,path));diff --git a/tests/test_migrations.py b/tests/test_migrations.pyindex 777f6a98a..94d79d297 100644--- a/tests/test_migrations.py+++ b/tests/test_migrations.py@@ -12,6 +12,25 @@ MIGRATIONS = Path(__file__).resolve().parents[1] / "migrations"class MigrationTests(unittest.TestCase):+ def test_disposal_reason_migration_preserves_assets_tags_and_unknown_reasons(self):+ prior = self.root.resolve() / 'prior'+ prior.mkdir()+ for path in MIGRATIONS.glob('*.sql'):+ if path.name < '0046_':+ shutil.copyfile(path, prior / path.name)+ upgrade(self.db, prior)+ connection = sqlite3.connect(self.db)+ try:+ connection.execute("INSERT INTO asset(id,location,path,medium,disposal) VALUES(1,'local','sample.mp4','video','trash')")+ connection.execute("INSERT INTO asset_tag(asset_id,tag,source) VALUES(1,'示例','user')")+ connection.commit()+ self.assertEqual([migration.version for migration in upgrade(self.db, MIGRATIONS)], ['0046'])+ self.assertEqual(connection.execute("SELECT disposal,disposal_reason FROM asset WHERE id=1").fetchone(), ('trash', None))+ self.assertEqual(connection.execute("SELECT tag,source FROM asset_tag WHERE asset_id=1").fetchall(), [('示例', 'user')])+ self.assertEqual(connection.execute("SELECT count(*) FROM asset").fetchone()[0], 1)+ finally:+ connection.close()+def setUp(self):self.tmp = tempfile.TemporaryDirectory()self.root = Path(self.tmp.name)@@ -24,7 +43,7 @@ class MigrationTests(unittest.TestCase):sqlite3.connect(self.db).close()backup = self.root / "before.db"done = upgrade(self.db, MIGRATIONS, backup)- self.assertEqual([m.version for m in done], [f'{number:04d}' for number in range(46)])+ self.assertEqual([m.version for m in done], [f'{number:04d}' for number in range(47)])self.assertTrue(backup.exists())con = sqlite3.connect(self.db)tables = {row[0] for row in con.execute(@@ -42,7 +61,7 @@ class MigrationTests(unittest.TestCase):"asset_tag_preference", "asset_search", "follow_playback","genre_decision", "asset_subtitle", "task_run", "performer_profile", "code_sample_image","entity_classification", "entity_identity_link", "schema_migration"} <= tables)- self.assertEqual(versions, [f'{number:04d}' for number in range(46)])+ self.assertEqual(versions, [f'{number:04d}' for number in range(47)])self.assertEqual(upgrade(self.db, MIGRATIONS), [])self.assertEqual(plan(self.db, MIGRATIONS)[1], [])diff --git a/tests/test_rm_web.py b/tests/test_rm_web.pyindex 0102364f7..42e6ea9ae 100644--- a/tests/test_rm_web.py+++ b/tests/test_rm_web.py@@ -25,6 +25,29 @@ from support.ledger import fresh_ledgerclass WebDataTests(unittest.TestCase):+ def test_recycle_bin_reasons_round_trip_and_restore_clears_them(self):+ for reason in ("manual", "junk", "duplicate", "missing"):+ rm_web.w_batch(self.contract, {"ids": [1], "operation": "dispose", "disposal_reason": reason})+ self.assertEqual(rm_web.q_items(self.contract, {"state": "trash"})["items"][0]["disposal_reason"], reason)+ self.assertEqual(rm_web.q_item(self.contract, 1)["disposal_reason"], reason)+ restored = rm_web.w_batch(self.contract, {"ids": [1], "operation": "restore"})+ self.assertEqual(restored["restored_reasons"], {"1": reason})+ self.assertIsNone(self.row()["disposal_reason"])+ with self.assertRaisesRegex(ValueError, "disposal reason"):+ rm_web.w_batch(self.contract, {"ids": [1], "operation": "dispose", "disposal_reason": "guessed"})+ self.assertIsNone(self.row()["disposal"])+ self.assertEqual(rm_web.w_feedback(self.contract, {"id": 1, "kind": "dispose"})["disposal_reason"], "manual")+ self.assertIsNone(rm_web.w_feedback(self.contract, {"id": 1, "kind": "dispose"})["disposal_reason"])++ def test_recycle_bin_legacy_reason_is_unknown(self):+ with self.contract.write_transaction() as connection:+ connection.execute("UPDATE asset SET disposal='trash' WHERE id=1")+ self.assertIsNone(rm_web.q_items(self.contract, {"state": "trash"})["items"][0]["disposal_reason"])+ restored = rm_web.w_batch(self.contract, {"ids": [1], "operation": "restore"})+ self.assertEqual(restored["restored_reasons"], {"1": None})+ rm_web.w_batch(self.contract, {"ids": [1], "operation": "dispose", "disposal_reason": None})+ self.assertIsNone(self.row()["disposal_reason"])+def setUp(self):self.tmp = tempfile.TemporaryDirectory()self.db_path = str(fresh_ledger(self.tmp.name))diff --git a/tests/test_trash_junk.py b/tests/test_trash_junk.pyindex fbf7437d0..23085e92f 100644--- a/tests/test_trash_junk.py+++ b/tests/test_trash_junk.py@@ -81,6 +81,8 @@ class TrashJunkTests(unittest.TestCase):self.assertEqual(code, 0)self.assertEqual(self.disposal(1), "trash")+ with closing(sqlite3.connect(self.db_path)) as connection:+ self.assertEqual(connection.execute("SELECT disposal_reason FROM asset WHERE id=1").fetchone()[0], "junk")self.assertIsNone(self.disposal(2))self.assertTrue(self.backup.is_file())diff --git a/tests/test_web_resource_sync.py b/tests/test_web_resource_sync.pyindex 1543eebb2..23953ab94 100644--- a/tests/test_web_resource_sync.py+++ b/tests/test_web_resource_sync.py@@ -138,6 +138,7 @@ class PurgeMissingTests(unittest.TestCase):self.assertEqual(self.disposals(), {1: None, 2: "vanished", 3: "trash", 4: None})con = sqlite3.connect(self.db_path)try:+ self.assertEqual(con.execute("SELECT disposal_reason FROM asset WHERE id=3").fetchone()[0], "missing")# 元数据等到清空回收站才随账本行一起删。self.assertEqual([r[0] for r in con.execute("SELECT asset_id FROM asset_tag")], [2, 4])diff --git a/web/board.css b/web/board.cssindex 141eed0a6..cc8402ff7 100644--- a/web/board.css+++ b/web/board.css@@ -608,12 +608,16 @@ body[data-density="dense"] .postercard-skeleton .skeletoncard u{height:30px}body:is([data-surface="/junk-files"],[data-surface="/trash"]) .catalog-skeleton>div{grid-template-columns:repeat(auto-fill,minmax(min(100%,280px),1fr));gap:20px}body:is([data-surface="/junk-files"],[data-surface="/trash"]) .catalog-skeleton .skeletoncard{border:1px solid var(--line-soft);border-radius:var(--surface-radius);overflow:hidden;background:var(--ground);padding-bottom:20px}/* 回收站卡照 `media-card.css` 里回收站那几条排:面色同真卡,元信息区四周 10px 12px 12px,- 头像列 38px 加左边距 12px,标题一行 1.35em、署名一行 20px;文件多是图片与压缩包,不带标签行。 */+ 头像列 38px 加左边距 12px,标题两行 2.7em、署名一行 20px,再预留标签和归入原因行。 */body[data-surface="/trash"] .catalog-skeleton .skeletoncard{grid-template-columns:50px minmax(0,1fr);gap:3px 10px;padding:0 0 12px;background:var(--color-background-primary-default)}body[data-surface="/trash"] .catalog-skeleton .skeletoncard s{grid-row:2/span 2;margin:9px 0 0 12px}-body[data-surface="/trash"] .catalog-skeleton .skeletoncard b{width:auto;height:1.35em;margin:7px 12px 0 0}+body[data-surface="/trash"] .catalog-skeleton .skeletoncard b{width:auto;height:2.7em;margin:7px 12px 0 0}body[data-surface="/trash"] .catalog-skeleton .skeletoncard em{height:20px}-body[data-surface="/trash"] .catalog-skeleton .skeletoncard u{display:none}+body[data-surface="/trash"] .catalog-skeleton .skeletoncard u{display:block;position:relative;height:calc(1.45em + var(--tag-pad-y) * 2 + 2px + 23px);background:transparent}+body[data-surface="/trash"] .catalog-skeleton .skeletoncard u::before,+body[data-surface="/trash"] .catalog-skeleton .skeletoncard u::after{content:"";position:absolute;left:0;border-radius:var(--control-radius);background:var(--hover)}+body[data-surface="/trash"] .catalog-skeleton .skeletoncard u::before{top:0;width:100%;height:calc(100% - 23px)}+body[data-surface="/trash"] .catalog-skeleton .skeletoncard u::after{bottom:0;width:60%;height:20px}/* 垃圾卡照 `junk-queue.css` 排:面色同真卡,预览格贴边,元信息区四周 20px、文件名与事实两行各 20px、行间 6px,键行是一条沉一档底色、顶上压一条发丝线的 61px 横条(12px 内边距夹一排 36px 的键)。 */body[data-surface="/junk-files"] .catalog-skeleton .skeletoncard{grid-template-columns:minmax(0,1fr);gap:0;padding:0;background:var(--color-background-primary-default)}