Peach: Local-first video metadata scraper and media manager.
feat(integrations): 随附用户脚本更新至 0.7.2
longmeidaob99c619cce8e
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 3fce3f60a..6c0e80729 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -37,6 +37,7 @@ Removed / Fixed / Security。- **播放**:从详情用 mpv、VLC(Windows)或 IINA、mpv(macOS)打开作品后,Peach 会记下这次观看:起播计一次播放,观看时长、拖动次数和离开位置写进与网页播放器相同的记录,放完记为看完。播放器异常退出或连不上时只是不记,不会弹出提示。PotPlayer 和系统默认播放器仍只负责打开文件。- **账本**:「应用与维护」新增「账本备份」:可以立即备份账本,也可以从列表里的一份备份恢复。列表写明每份备份的时间、来源(手动或写入前自动)和大小;恢复只在写入端执行,会先检查备份并把当前账本另存一份,被中断后下次启动时自动收拾到完整的账本。- **复核**:有 NFO 或升级后重新核对资料的影片,在线来源与现有资料的差异不再一律交人复核。只差写法、打码或店铺装饰的,和只有社区站有异议的,保留现有资料;来源多给的标签自动补上,一个不删;官方来源一致的标题与发行日期直接更新。厂牌、系列、出演者的官方异议,以及 NFO 与官方来源对不上的,仍留在复核页。升级后对已有的这批差异自动整理一次,自动写入的可用 `revert_auto_landing.py` 按规则名整批撤回。+- **采集**:随附用户脚本更新至 0.7.2。浮卡「其他任务」展开、折叠有高度过渡,进出番号的进度页沿用设置面板的进场动效。别的页面添加的任务结束后一直留在列表里,直到点行尾的关闭键、进度页的「标为已读」或列表底部的「全部标为已读」;没有进行中的任务时,收成图标的角标显示未读的已结束数量。列表底部的「重试失败项」按失败原因逐项重试:整理失败的重试整理,磁力失效的换一个磁力,其余从原网页重新加入。Peach 自动重新提交的云下载显示「等待自动重新提交」。更新脚本并刷新来源页面后生效。### 修复diff --git a/web/integrations/jav-userscript-release.json b/web/integrations/jav-userscript-release.jsonindex 504fab992..901b7f62e 100644--- a/web/integrations/jav-userscript-release.json+++ b/web/integrations/jav-userscript-release.json@@ -1,12 +1,12 @@{- "version": "0.7.1",+ "version": "0.7.2","repository": "https://github.com/peach-mitao/peach-userscript",- "commit": "a5aa2ddf4a897f2d7d0478b2a7fc044538b38aca",+ "commit": "8a79b31a90bdceb493b26b29ffc2fef6e13aa3a3","install_url": "/integrations/peach-jav.user.js","bridge_min_version": "0.5.1","site_schema_version": 1,"files": {- "peach-jav.user.js": "954420bed6c5ee3be36435f2043572bf1133f71588dacbb4f0a24cf3d1e5a3ab",+ "peach-jav.user.js": "56ebe0fd32eb122d70a9bf4cb560cbaf48a80b4e15f5652e16d3344f35357ba1","jav-sites.json": "74983ac48fb8dda583bd066f7dce7fbc01834137a8be07f5cbe779dcfb7b83db"}}diff --git a/web/integrations/peach-jav.user.js b/web/integrations/peach-jav.user.jsindex 80f645259..ddf2af6f0 100644--- a/web/integrations/peach-jav.user.js+++ b/web/integrations/peach-jav.user.js@@ -12,7 +12,7 @@// @updateURL https://update.sleazyfork.org/scripts/600821/Peach%20%C2%B7%20JAV%20%E5%85%A5%E5%BA%93.meta.js// @downloadURL https://update.sleazyfork.org/scripts/600821/Peach%20%C2%B7%20JAV%20%E5%85%A5%E5%BA%93.user.js// @license AGPL-3.0-or-later-// @version 0.7.1+// @version 0.7.2// @description Detect video codes on web pages, select titles, and send them to Peach for download and library import.// @description:zh-CN 识别网页中的番号,选择影片并交给 Peach 下载入库。// @description:zh-TW 識別網頁中的番號,選擇影片並交給 Peach 下載入庫。@@ -291,7 +291,7 @@const STORAGE_POSITION = 'peach.jav.position';const STORAGE_APPEARANCE = 'peach.jav.appearance';const ROOT_ID = 'peach-jav-action';- const SCRIPT_VERSION = "0.7.1";+ const SCRIPT_VERSION = "0.7.2";// 0.6.3 起默认名改为英文;发布页切换前仍返回原名。const PUBLISHED_NAMES = ['Peach Userscript', 'Peach · JAV 入库'];const PEACH_LOGO = "data:image/png;base64,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";@@ -547,15 +547,21 @@.geist-button.launcher[data-count]{position:relative;overflow:visible}.geist-button.launcher[data-count]::after{content:attr(data-count);position:absolute;top:-4px;right:-4px;min-width:18px;height:18px;padding:0 5px;box-sizing:border-box;border-radius:9px;display:grid;place-items:center;background:var(--color-status-blue-background);color:var(--color-status-blue-text);font:var(--board-caption-semibold);box-shadow:0 0 0 2px var(--ground);pointer-events:none}- .shared-tasks{display:grid;gap:8px;min-width:0}.shared-heading{display:flex;align-items:center;gap:4px;width:fit-content;margin:0;padding:0;border:0;background:transparent;- font:var(--board-caption-semibold);color:var(--muted);cursor:pointer}.shared-heading:hover{color:var(--ink)}- .shared-heading:focus-visible{outline:2px solid var(--tungsten);outline-offset:2px;border-radius:4px}+ .geist-button.launcher[data-count-tone=ended]::after{background:var(--color-status-lime-background);color:var(--color-status-lime-text)}+ .shared-note{margin:8px 0 0}.shared-foot{display:flex;justify-content:flex-end;gap:16px;margin-top:8px}.shared-foot:not(:has(>:not([hidden]))){display:none}+ .shared-tasks{min-width:0}.shared-heading,.shared-action{display:flex;align-items:center;gap:4px;width:fit-content;margin:0;padding:0;border:0;background:transparent;+ font:var(--board-caption-semibold);color:var(--muted);cursor:pointer}.shared-heading:hover,.shared-action:hover{color:var(--ink)}.shared-action:disabled{opacity:.5;cursor:default}+ .shared-heading:focus-visible,.shared-action:focus-visible{outline:2px solid var(--tungsten);outline-offset:2px;border-radius:4px}.shared-fold{width:14px;height:14px;flex:none;stroke:currentColor;fill:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;transition:transform .15s ease}.shared-heading[aria-expanded=false] .shared-fold{transform:rotate(-90deg)}- .shared-list{list-style:none;margin:0;padding:0;display:grid;gap:4px;max-height:172px;overflow:auto;overscroll-behavior:contain;scrollbar-width:thin}+ /* 折叠沿用 Peach Collapse(frontend/src/ui-kit/collapse.css):过渡时裁边,展开停稳后摘掉,行的悬停底色才不被切。 */+ .shared-body{display:flow-root;overflow:hidden;transition:height .2s ease-in-out}.shared-body.fold-settled{overflow:visible}+ .shared-list{list-style:none;margin:8px 0 0;padding:0;display:grid;gap:4px;max-height:172px;overflow:auto;overscroll-behavior:contain;scrollbar-width:thin}.shared-list li{min-width:0}.shared-row{display:flex;align-items:center;gap:8px;width:calc(100% + 16px);min-width:0;min-height:32px;margin:0 -8px;padding:4px 8px;border:0;border-radius:6px;background:transparent;color:inherit;font:inherit;text-align:left;cursor:pointer;transition:background-color .15s ease}.shared-row:hover{background:var(--surface)}.shared-row:focus-visible{outline:2px solid var(--tungsten);outline-offset:-2px}+ .shared-item{display:flex;align-items:center;gap:4px}.shared-item .shared-row{flex:1;width:auto;margin-right:0}+ .shared-item .geist-button.icon{width:28px;height:28px;color:var(--muted)}.shared-item .geist-button.icon:hover{color:var(--ink)}.shared-code{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font:var(--board-body-medium)}.shared-chevron{width:16px;height:16px;flex:none;stroke:currentColor;fill:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;color:var(--muted)}.task-page .bar strong{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}@@ -1571,6 +1577,7 @@if (body.state === 'failed') return ['failed', failureText(body), {magnet:'磁力失效', cloud:'网盘问题'}[body.cause] || '失败'];if (body.state === 'no_match') return ['no_match', failureText(body)];if (body.state === 'submitted' && ['remote_done', 'landed'].includes(download?.state)) return ['importing', download.label || '入库中'];+ if (body.state === 'submitted' && download?.state === 'submit_pending') return ['submitted', '等待自动重新提交', '待重新提交'];if (body.state === 'submitted' && download?.state === 'remote_running' && typeof download.progress === 'number' && Number.isFinite(download.progress)) {const percent = Math.round(Math.min(1, Math.max(0, download.progress)) * 100);return ['submitted', `网盘下载中 ${percent}%`, `下载中 ${percent}%`];@@ -2229,10 +2236,7 @@if ([404, 405].includes(response.status)) { resolve(null); return; }try {if (response.status !== 200 || response.responseText.length > 2 * 1024 * 1024) throw new Error();- const data = JSON.parse(response.responseText);- if (data.ok !== true || !Array.isArray(data.items)) throw new Error();- resolve(data.items.filter(body => body?.ok === true && STATES.has(body.state) && typeof body.code === 'string'- && candidates(body.code).size === 1).slice(0, 200));+ resolve(activeItems(JSON.parse(response.responseText)));} catch { reject(new Error('Peach 返回的任务列表无效')); }},onerror: () => reject(new Error('无法连接 Peach')), ontimeout: () => reject(new Error('Peach 请求超时')),@@ -2242,6 +2246,34 @@});}+ function activeItems(data) {+ if (data?.ok !== true || !Array.isArray(data.items)) throw new Error();+ return data.items.filter(body => body?.ok === true && STATES.has(body.state) && typeof body.code === 'string'+ && candidates(body.code).size === 1).slice(0, 200);+ }++ // 确认已结束的任务,返回 Peach 的新任务列表;旧版 Peach 没有这个接口。+ function requestDismiss(config, request) {+ return new Promise((resolve, reject) => {+ try {+ GM_xmlhttpRequest({ method: 'POST', url: `${config.base}/api/jav-browser/dismiss`, anonymous: true, timeout: 30_000,+ headers: { Authorization: `Bearer ${config.token}`, Accept: 'application/json', 'Content-Type': 'application/json' },+ data: JSON.stringify(request),+ onload(response) {+ if ([404, 405].includes(response.status)) { reject(new Error('Peach 尚不支持确认已结束的任务,请更新 Peach。')); return; }+ if (response.status === 401 || response.status === 403) { reject(new Error('令牌无效或无权限,请重新配置。')); return; }+ try {+ if (response.status !== 200 || response.responseText.length > 2 * 1024 * 1024) throw new Error();+ resolve(activeItems(JSON.parse(response.responseText)));+ } catch { reject(new Error('没有确认成功,请稍后重试。')); }+ },+ onerror: () => reject(new Error('无法连接 Peach,请稍后重试。')), ontimeout: () => reject(new Error('Peach 请求超时,请稍后重试。')),+ onabort: () => reject(new Error('Peach 请求已中止。')),+ });+ } catch { reject(new Error('无法连接 Peach,请稍后重试。')); }+ });+ }+// 写快照的窗口在任务由进行中走到整理完成时响一次;响过的任务记入共享存储,别的窗口不再响。function chimeTransitions(previous, items) {const before = new Map(previous.map(body => [comparisonKey(body.code), body]));@@ -2321,11 +2353,15 @@if (!node.isConnected) { sharedLists.delete(node); continue; }paintSharedList(node); paintTaskPage(node.closest('.panel'));}+ // 角标:有进行中的显示进行中数量;都结束了还有没确认的,换成已结束的数量。const running = sharedMode() ? sharedSnapshot.items.filter(tracking).length : 0;+ const ended = running ? 0 : otherTasks().filter(awaitingAck).length;for (const launcher of [current?.launcher, updateEntry?.launcher]) {if (!launcher) continue;- if (running) launcher.dataset.count = running > 99 ? '99+' : String(running); else delete launcher.dataset.count;- launcher.title = running ? `Peach 有 ${running} 项任务进行中` : '';+ const count = running || ended;+ if (count) launcher.dataset.count = count > 99 ? '99+' : String(count); else delete launcher.dataset.count;+ if (ended) launcher.dataset.countTone = 'ended'; else delete launcher.dataset.countTone;+ launcher.title = running ? `Peach 有 ${running} 项任务进行中` : ended ? `Peach 有 ${ended} 项任务已结束,待确认` : '';}for (const root of surfaces) if (root.isConnected) placeSurface(root);}@@ -2365,28 +2401,61 @@// 其他任务超过 3 项,或本页番号正在抓取时,列表自动折叠;手动展开或折叠一直有效,直到自动条件变化。const SHARED_FOLD_LIMIT = 3;- // 本页番号已有整体进度,这里只列其他番号:进行中的在前,最近 10 分钟结束的在后。- // 每项一行,点开进入该番号的进度页。+ // 其他番号:本页番号已有整体进度,不在这里列。确认过的已结束任务不再列出。+ const ownKey = () => current && alive(current) && !current.identity.conflict ? comparisonKey(current.identity.code) : '';+ function otherTasks() {+ const own = ownKey();+ return sharedMode() ? sharedSnapshot.items.filter(body => comparisonKey(body.code) !== own && body.dismissed !== true) : [];+ }++ // 结束后等用户确认的任务:Peach 给了确认键的才能确认;旧版 Peach 没有,照旧 10 分钟后自行离开列表。+ const awaitingAck = body => !tracking(body) && typeof body.ended_key === 'string' && body.dismissed !== true;++ // 进行中的在前,已结束的在后;每项一行,点开进入该番号的进度页,已结束的行尾可以标为已读。+ // 标题与列表跨重绘保留,开合状态变了(点标题或自动条件变化)才播高度过渡。function paintSharedList(node) {- const own = current && alive(current) && !current.identity.conflict ? comparisonKey(current.identity.code) : '';- const items = sharedMode() ? sharedSnapshot.items.filter(body => comparisonKey(body.code) !== own) : [];+ const items = otherTasks();node.hidden = !items.length;- const focused = node.getRootNode().activeElement?.closest?.('.shared-row,.shared-heading');- const focusKey = focused?.dataset.code || (focused ? 'heading' : '');- if (!items.length) { node.replaceChildren(); return; }+ const focused = node.getRootNode().activeElement?.closest?.('.shared-row');+ // 列表空了只藏起整段,标题、提示与开合状态留着,确认失败时提示仍有处可写。+ if (!items.length) return;loadSharedPeople(items);- const auto = items.length > SHARED_FOLD_LIMIT || Boolean(own && current && (current.tracking || current.busy));+ const auto = items.length > SHARED_FOLD_LIMIT || Boolean(ownKey() && (current.tracking || current.busy));if (node.foldChoice && node.foldChoice.auto !== auto) node.foldChoice = null;const open = node.foldChoice ? node.foldChoice.open : !auto;const running = items.filter(tracking), ended = items.filter(body => !tracking(body));- const heading = element('button', 'shared-heading');- heading.type = 'button';+ if (!node.parts) {+ const heading = element('button', 'shared-heading'), label = element('span');+ heading.type = 'button';+ heading.append(label, chevronIcon('shared-fold', 'm6 9 6 6 6-6'));+ heading.addEventListener('click', () => {+ node.foldChoice = { auto: node.parts.auto, open: !node.parts.open };+ paintSharedList(node);+ });+ const retryAll = element('button', 'shared-action', '重试失败项');+ retryAll.type = 'button';+ retryAll.addEventListener('click', () => void retryFailed(node));+ const clear = element('button', 'shared-action', '全部标为已读');+ clear.type = 'button';+ clear.addEventListener('click', () => void acknowledgeEnded(node, { all: true }));+ const foot = element('div', 'shared-foot'); foot.append(retryAll, clear);+ const note = element('p', 'geist-note shared-note');+ note.dataset.variant = 'error'; note.setAttribute('role', 'alert'); note.hidden = true;+ const body = element('div', 'shared-body fold-settled'), list = element('ul', 'shared-list');+ body.hidden = !open;+ body.append(list, foot);+ node.replaceChildren(heading, note, body);+ node.parts = { heading, label, retryAll, clear, note, body, list, open };+ }+ const { heading, label, retryAll, clear, body: fold, list } = node.parts;+ label.textContent = ['其他任务', running.length ? `进行中 ${running.length} 项` : '', ended.length ? `已结束 ${ended.length} 项` : '']+ .filter(Boolean).join(' · ');+ clear.hidden = !ended.some(awaitingAck);+ retryAll.hidden = !ended.some(retryableTask);heading.setAttribute('aria-expanded', String(open));- heading.append(element('span', '', running.length ? `其他任务 · 进行中 ${running.length} 项` : '其他任务 · 最近结束'),- chevronIcon('shared-fold', 'm6 9 6 6 6-6'));- heading.addEventListener('click', () => { node.foldChoice = { auto, open: !open }; paintSharedList(node); placeSurface(node.getRootNode().host); });- const list = element('ul', 'shared-list');- list.hidden = !open;+ if (open !== node.parts.open) setFoldOpen(fold, open, () => placeSurface(node.getRootNode().host));+ Object.assign(node.parts, { auto, open });+ const rows = [];for (const body of [...running, ...ended].slice(0, 20)) {const row = element('button', 'shared-row'), status = element('span', 'chip');row.type = 'button'; row.dataset.code = body.code;@@ -2394,11 +2463,103 @@setRowState({ row, status }, ...rowState(body));row.setAttribute('aria-label', `${body.code},${status.textContent},查看进度`);row.addEventListener('click', () => openTaskPage(node.closest('.panel'), body.code));- const item = element('li'); item.append(row); list.append(item);+ const item = element('li', 'shared-item'); item.append(row);+ if (awaitingAck(body)) {+ const dismiss = control(`将 ${body.code} 标为已读`, { icon: 'close' });+ dismiss.addEventListener('click', () => {+ // 标为已读后焦点交给下一行,最后一行交给上一行,列表空了交给标题。+ const next = (item.nextElementSibling || item.previousElementSibling)?.querySelector('.shared-row')?.dataset.code;+ void acknowledgeEnded(node, { keys: [body.ended_key] });+ ([...list.querySelectorAll('.shared-row')].find(row => row.dataset.code === next) || heading).focus();+ });+ item.append(dismiss);+ }+ rows.push(item);+ }+ list.replaceChildren(...rows);+ if (focused) [...list.querySelectorAll('.shared-row')].find(row => row.dataset.code === focused.dataset.code)?.focus();+ }++ // 失败的其他任务可以重试:入库后整理失败的走「重试整理」,其余按原来源重新加入,磁力本身的问题换一个磁力。+ const retryableTask = body => !tracking(body) && (['failed', 'no_match'].includes(body.state) || organizeFailed(body));+ const switchesMagnet = body => body.state === 'failed' && body.cause === 'magnet';+ const retryLabel = body => organizeFailed(body) ? '重试整理' : switchesMagnet(body) ? '换一个磁力' : '重试加入';+ function retryTask(config, body) {+ if (organizeFailed(body)) return requestRetryOrganize(config, body.code);+ return request(config, body.code, typeof body.source_url === 'string' ? body.source_url : '', 'POST', false,+ switchesMagnet(body) ? { switch: true } : {});+ }++ // 列表底部「重试失败项」:逐项重试列出的失败任务,一项出错不影响其余,最后取一次新列表。+ async function retryFailed(node) {+ const config = configuration(), parts = node.parts;+ if (!config || !parts || parts.retryAll.disabled) return;+ const failed = otherTasks().filter(retryableTask).slice(0, 20);+ parts.retryAll.disabled = true; parts.note.hidden = true;+ let errors = 0, reason = '';+ for (const body of failed) {+ try { await retryTask(config, body); } catch (error) { errors++; reason = error.message; }+ }+ parts.retryAll.disabled = false;+ await sharedTick(true);+ if (errors && parts.note.isConnected) {+ parts.note.textContent = `${errors} 项没有重试成功:${reason}`; parts.note.hidden = false;+ placeSurface(parts.note.getRootNode().host);+ }+ }++ // 确认已结束的任务。先在本地标为已确认并写进共享快照,各窗口立刻收起;Peach 返回的列表再作为新快照。+ async function acknowledgeEnded(node, request) {+ const config = configuration();+ if (!config || !sharedMode()) return;+ if (node?.parts) node.parts.note.hidden = true;+ const keys = new Set(request.keys || []);+ const marked = sharedSnapshot.items.map(body => awaitingAck(body) && (request.all || keys.has(body.ended_key)) ? { ...body, dismissed: true } : body);+ const local = { ...sharedSnapshot, at: Date.now(), items: marked };+ GM_setValue(STORAGE_TASKS, JSON.stringify(local)); applyShared(local);+ try {+ const items = await requestDismiss(config, request.all ? { all: true } : { keys: [...keys] });+ if (configuration()?.base !== config.base) return;+ const snapshot = { version: 1, base: config.base, at: Date.now(), available: true, items };+ GM_setValue(STORAGE_TASKS, JSON.stringify(snapshot)); applyShared(snapshot);+ } catch (error) {+ void sharedTick(true);+ const note = node?.parts?.note;+ if (note?.isConnected) { note.textContent = error.message; note.hidden = false; placeSurface(note.getRootNode().host); }}- node.replaceChildren(heading, list);- if (focusKey === 'heading') heading.focus();- else if (focusKey) [...list.querySelectorAll('.shared-row')].find(row => row.dataset.code === focusKey)?.focus();+ }++ // 折叠正文的高度过渡,与 Peach frontend/src/ui-kit/collapse.ts 的 setCollapseRegionOpen 同一做法:+ // 量出起止高度写进 inline height,跑完交回自然高度;过渡途中又被反向点按时,前一次的收尾不再做。+ const foldRuns = new WeakMap();+ function setFoldOpen(body, open, place) {+ const run = (foldRuns.get(body) || 0) + 1;+ foldRuns.set(body, run);+ const finish = done => {+ let finished = false;+ const end = event => {+ if ((event && event.propertyName !== 'height') || finished) return;+ finished = true; body.removeEventListener('transitionend', end); clearTimeout(timer);+ if (foldRuns.get(body) === run) { done(); place(); }+ };+ body.addEventListener('transitionend', end);+ // 减少动效时没有 transitionend,260ms 兜底。+ const timer = setTimeout(end, 260);+ };+ body.classList.remove('fold-settled');+ if (open) {+ const start = body.hidden ? 0 : body.getBoundingClientRect().height;+ body.hidden = false; body.inert = false;+ body.style.height = `${start}px`; body.getBoundingClientRect();+ body.style.height = `${body.scrollHeight}px`;+ finish(() => { body.style.height = ''; body.classList.add('fold-settled'); });+ } else {+ body.inert = true;+ body.style.height = `${body.getBoundingClientRect().height}px`; body.getBoundingClientRect();+ body.style.height = '0px';+ finish(() => { body.hidden = true; body.inert = false; body.style.height = ''; });+ }+ place();}// 其他任务的进度页:在同一张浮卡里替换主页,显示该番号的五段整体进度与状态说明;返回回到主页。@@ -2417,40 +2578,75 @@const note = element('p', 'geist-note');note.setAttribute('role', 'status'); note.setAttribute('aria-live', 'polite'); note.setAttribute('aria-label', `${code} 的任务状态`);const parts = buildFlow();- const retry = control('重试整理');+ // 失败的番号在进度页直接重试,按钮文字随失败原因变:重试整理、换一个磁力或重试加入。+ const retry = control('重试加入');retry.hidden = true;retry.addEventListener('click', async () => {- const config = configuration();- if (!config || retry.disabled) return;+ const config = configuration(), body = panel.taskPage?.body;+ if (!config || !body || retry.disabled) return;retry.disabled = true;try {- const result = await requestRetryOrganize(config, code);+ const result = await retryTask(config, body);if (panel.taskPage?.page === page) { panel.taskPage.body = result; paintTaskPage(panel); }void sharedTick(true);} catch (error) {if (panel.taskPage?.page === page) { note.textContent = error.message; note.dataset.variant = 'error'; }} finally { retry.disabled = false; }});- body.append(note, parts.flow, retry);+ // 已结束、等确认的番号:标为已读并回到主页。+ const ack = control('标为已读');+ ack.hidden = true;+ ack.addEventListener('click', () => {+ const key = panel.taskPage?.body?.ended_key;+ if (!key) return;+ void acknowledgeEnded(panel.querySelector('.shared-tasks'), { keys: [key] });+ closeTaskPage(panel, true);+ });+ body.append(note, parts.flow, retry, ack);page.append(bar, body);- for (const child of panel.children) if (!child.hidden) { child.hidden = true; child.dataset.taskHidden = ''; }- panel.append(page);- panel.taskPage = { page, code, note, people, retry, body: null, ...parts };+ switchPanel(panel, () => {+ for (const child of panel.children) if (!child.hidden) { child.hidden = true; child.dataset.taskHidden = ''; }+ panel.append(page);+ panel.taskPage = { page, code, note, people, retry, ack, body: null, ...parts };+ paintTaskPage(panel);+ return [page];+ });back.addEventListener('click', () => closeTaskPage(panel, true));- paintTaskPage(panel);back.focus();}+ // focus:用户点了返回,回到主页并播返回动效;切换面板模式时直接收起。function closeTaskPage(panel, focus = false) {const open = panel?.taskPage;if (!open) return;- open.page.remove(); panel.taskPage = null;- for (const child of panel.querySelectorAll(':scope > [data-task-hidden]')) { child.hidden = false; delete child.dataset.taskHidden; }- if (focus) [...panel.querySelectorAll('.shared-row')].find(row => row.dataset.code === open.code)?.focus();+ const restore = () => {+ open.page.remove(); panel.taskPage = null;+ const shown = [...panel.querySelectorAll(':scope > [data-task-hidden]')];+ for (const child of shown) { child.hidden = false; delete child.dataset.taskHidden; }+ return shown;+ };+ if (focus) switchPanel(panel, restore);+ else { panel.motion?.forEach(animation => animation.cancel()); restore(); }+ // 回到这一行;这一行已确认收起时回到「其他任务」标题。+ if (focus) ([...panel.querySelectorAll('.shared-row')].find(row => row.dataset.code === open.code)+ || panel.querySelector('.shared-heading'))?.focus();for (const root of surfaces) if (root.isConnected) placeSurface(root);}- // 番号结束超过 10 分钟后会离开快照,进度页保留最后一次看到的状态。+ // 主页与进度页在同一张浮卡里切换:浮卡高度从旧值过渡到新值,进来的一层播 Peach 设置面板的+ // board-dialog-in(缩放、模糊、淡入),时长与缓动同 --board-dialog-motion。浮卡按底边定位,高度变化向上长,不会跳位。+ function switchPanel(panel, change) {+ const from = panel.getBoundingClientRect().height;+ panel.motion?.forEach(animation => animation.cancel());+ const entering = change();+ if (matchMedia('(prefers-reduced-motion: reduce)').matches || !from) return;+ const to = panel.getBoundingClientRect().height, timing = { duration: 300, easing: 'cubic-bezier(.32,.72,0,1)' };+ panel.motion = [panel.animate([{ height: `${from}px` }, { height: `${to}px` }], timing),+ ...entering.map(node => node.animate([{ opacity: 0, transform: 'scale(.85)', filter: 'blur(4px)' },+ { opacity: 1, transform: 'scale(1)', filter: 'blur(0)' }], timing))];+ }++ // 番号确认过或由旧版 Peach 列出时,结束 10 分钟后离开快照,进度页保留最后一次看到的状态。function paintTaskPage(panel) {const open = panel?.taskPage;if (!open) return;@@ -2464,7 +2660,9 @@}open.note.textContent = statusLabel(open.body);open.note.dataset.variant = statusVariant(open.body);- open.retry.hidden = !organizeFailed(open.body);+ open.retry.hidden = !retryableTask(open.body);+ open.retry.textContent = retryLabel(open.body);+ open.ack.hidden = !awaitingAck(open.body);for (const root of surfaces) if (root.isConnected) placeSurface(root);}@@ -2534,7 +2732,7 @@// 状态说明:下载任务的具体阶段、整理状态与百分比,失败时给出原因;浮卡与其他任务的进度页共用。function statusLabel(body) {const download = body.download;- const known = download && ['submitted', 'remote_running', 'remote_done', 'landed', 'ingested', 'failed', 'cancelled', 'stalled'].includes(download.state);+ const known = download && ['submit_pending', 'submitted', 'remote_running', 'remote_done', 'landed', 'ingested', 'failed', 'cancelled', 'stalled'].includes(download.state);let label = body.stage === 'submitting' ? '正在提交网盘' : LABELS[body.state];if (known && typeof download.label === 'string') {label = download.label.slice(0, 80);