Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

feat(media): 统一开放挂载网盘读写并补齐品牌图标

longmeidao03eb94e22387
diff --git a/README.md b/README.md
index d71396812..ab8d306f4 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,7 @@ Linux 无桌面镜像与 CloudDrive2 分别部署,媒体目录与运行数据
- `<片名>-poster.jpg` 这样的海报。
- 已有的标题、女优、厂牌和海报会直接显示。
- **支持哪些网盘?**
- - 支持已挂载的 115、PikPak、光鸭、OneDrive;其他网盘用「其他已挂载网盘」登记。光鸭、OneDrive 和通用挂载来源按只读方式管理。新增网盘目录需选择「正常读取」或「代理流量保护」,包括 PikPak;实际代理在挂载工具中配置,见[挂载配置](docs/CLOUDDRIVE.md)。
+ - 支持已挂载的 115、PikPak、光鸭、OneDrive;其他网盘用「其他已挂载网盘」登记。所有挂载来源均可读写,文件操作取决于挂载工具和网盘账号的权限与能力。新增网盘目录需选择「正常读取」或「代理流量保护」,包括 PikPak;实际代理在挂载工具中配置,见[挂载配置](docs/CLOUDDRIVE.md)。
- CloudDrive2 也可运行在群晖等 NAS 上。Windows 先把共享目录映射为盘符,再在 Peach 中选择对应文件夹;这种方式无需在 Windows 安装 CloudDrive2 或 WinFsp。
- 看片时 Peach 只把它当普通文件夹读,不保存网盘账号。
- 用云下载时,CloudDrive2 的 API 令牌和 PikPak 的登录令牌存在这台电脑的凭据文件里。
diff --git a/docs/CLOUDDRIVE.md b/docs/CLOUDDRIVE.md
index 12043d643..029c39ff7 100644
--- a/docs/CLOUDDRIVE.md
+++ b/docs/CLOUDDRIVE.md
@@ -1,6 +1,8 @@
# CloudDrive 配置与调优
-Peach 可以读取已挂载的 115、PikPak、光鸭、OneDrive,以及「其他已挂载网盘」。先用 CloudDrive2、OpenList 对应的挂载工具或系统文件系统把网盘接成本机目录,再由 Peach 扫描。光鸭、OneDrive 和通用挂载来源按只读方式管理;平台账号和实际网络连接由挂载工具负责。
+Peach 支持已挂载的 115、PikPak、光鸭、OneDrive,以及「其他已挂载网盘」的文件读写。先用 CloudDrive2、OpenList 对应的挂载工具或系统文件系统把网盘接成本机目录,再由 Peach 扫描。平台账号、写入权限和实际网络连接由挂载工具负责;文件操作失败时,Peach 显示实际错误。
+
+光鸭云盘的上传、建文件夹、改名和移动需要 CloudDrive2 v1.1.0 或更高版本、应用写入权限和有效会员;删除、复制接口暂不可用,见 [CloudDrive 官方更新记录](https://www.clouddrive2.com/download.html)。OneDrive 与其他挂载来源也需要相应的写入权限。Peach 的文件整理支持预览、执行与回滚,云下载支持范围见下文。
要往网盘里添资源,可以用「云下载」把磁力交给 115 或 PikPak 离线下载,见下文[云下载](#云下载把磁力交给网盘离线下载)一节。
diff --git a/docs/HANDOFF.md b/docs/HANDOFF.md
index 3badc2242..e51cded57 100644
--- a/docs/HANDOFF.md
+++ b/docs/HANDOFF.md
@@ -72,7 +72,7 @@
## 参考产品证据登记
-- STRM 与挂载来源(2026-10-17):[固定源码、差异与验收](reference-snapshots/strm-source-evidence.md)。
+- 2026-10-17:[STRM](reference-snapshots/strm-source-evidence.md)、[图标](reference-snapshots/media-source-icons.md)。
- 目录树与面包屑:2026-10-17 取得 BoardUI registry 源码,版本、SHA-256 与适配见 [BoardUI 适配](BOARD_UI.md#目录浏览)。保留首页结构,目录用途由用户确认。官方实时示例未取得。
diff --git a/docs/REUSE.md b/docs/REUSE.md
index 83df79383..0f1250d98 100644
--- a/docs/REUSE.md
+++ b/docs/REUSE.md
@@ -4,7 +4,7 @@
STRM 采用文本指针、播放时解析的通用行为,参考 SmartStrm 文档、OpenList 的 `drivers/strm` 与 Jellyfin 的 STRM 探测入口;固定 revision、许可证与实际读取位置见 [取证记录](reference-snapshots/strm-source-evidence.md)。SmartStrm 核心闭源,源码未取得。Peach 独立实现受限 HTTP(S) 指针,复用 HTTPX、现有 Range 传输、`m3u8` 解析与播放器计划;无新增运行依赖,也不复制上游应用代码。
-光鸭、OneDrive 与其他网盘复用声明挂载根、路径翻译、扫描和只读保护;网盘登录与平台 API 由 CloudDrive2 或 OpenList 等挂载工具提供。挂载目录可单独设置代理流量保护,成本投影与批处理使用同一规则。STRM、ISO 跳过后台媒体读取,普通媒体保留按来源策略执行的探测;九宫格和时间轴共用本机视频预览开关。
+光鸭、OneDrive 与其他网盘复用声明挂载根、路径翻译、扫描、文件整理与回滚、隔离删除和空目录清理。所有挂载来源统一开放读写,底层权限或不支持的操作由挂载工具报错;网盘登录与平台 API 由 CloudDrive2 或 OpenList 等挂载工具提供,不新增 SDK 或依赖。临时文件与账本回归覆盖三个来源的整理、回滚、删除、权限拒绝和空目录清理;真实账号兼容性见待办。挂载目录可单独设置代理流量保护,成本投影与批处理使用同一规则。STRM、ISO 跳过后台媒体读取,普通媒体保留按来源策略执行的探测;九宫格和时间轴共用本机视频预览开关。
Actions 工作流静态检查复用 actionlint 1.7.12(MIT,`rhysd/actionlint:1.7.12` 官方 Docker 镜像),由本地 Docker action 使用,独立 Docker 目录纳入 Dependabot 与接管入口。GitHub Actions 生态不更新 `docker://` 镜像引用。Windows 官方二进制按发布校验和完成本地 POC;CI 在 Linux 容器检查语法、表达式、任务依赖与脚本。Python 与浏览器回归继续使用现有统一入口及 Playwright;六片浏览器权重来自 [已通过的 CI](https://github.com/peach-mitao/peach/actions/runs/38981261189) 的 69 份 TAP,记录在 `scripts/ci-browser-timings.json`,没有新增应用运行依赖。
diff --git a/docs/STATUS.md b/docs/STATUS.md
index 9ad787392..6707f609a 100644
--- a/docs/STATUS.md
+++ b/docs/STATUS.md
@@ -14,7 +14,7 @@
- 验收:`peach-data/review/entity-cold-missav-verification.json`。
- 身份合并 18 组;版本核查:`peach-data/review/version-evidence-review.md`。
- JAV 头像 817,水印待复核 38;档案 17、候选 253、官方封面 2;[选图规则](adr/0102-profile-avatar-priority.md)。
-- 「整理」(ADR-0039)支持预览、执行、回滚;英文视频名分词 169 条。
+- 挂载读写、整理回滚;光鸭/OneDrive 图标;真实账号待验;英文分词 169 条。
- 产地是独立维度、JAV 是其投影:`region` 空时按厂牌、创作者、番号逐层推断,不落库;韩国 MIB 不算 JAV。
- Windows 托盘自动恢复;重启 `restart_windows_tray.py --source`;代码、数据在内置盘,媒体在外置盘。
- 托盘用普通权限,提权看不到 CloudDrive 挂载盘。
diff --git a/docs/reference-snapshots/media-source-icons.md b/docs/reference-snapshots/media-source-icons.md
index f7afcdfb2..a93bd2461 100644
--- a/docs/reference-snapshots/media-source-icons.md
+++ b/docs/reference-snapshots/media-source-icons.md
@@ -6,3 +6,8 @@
- 115: https://115.com/favicon.ico; source SHA-256 27217fc80a3ac0949acc55b43f9662a08bfab1026b6fee51e2a7f3151721b64a; PNG SHA-256 cb8761584ad38d6b44d1f50b2f9f6b57b1880243ccd88d435682c39d850e986a
- pikpak: https://mypikpak.com/favicon-32x32.png; source SHA-256 c8aa2053bfa44e1c0a052c5fe3cdc540fd42471756d3017b654e72e671e69914; PNG SHA-256 1fb0e2d400c9277654194343ffd3bb5b92410c8da56e7ccee65997b0e4cab4d8
+
+2026-10-17 实测:光鸭官网 HTML 的 `link[rel=icon]` 指向 `/icon.png`;OneDrive 官网跳转到 Microsoft 产品页,其中 `img[alt=OneDrive]` 使用 FY26 SVG 品牌图标。通过 HTTPX 严格 HTTPS 下载并解码核对:光鸭原尺寸 32×32,用 Pillow 转为 PNG;OneDrive 复用 `peach.link_marks.rasterize_svg` 与锁定的 resvg-py 渲染为 64×64 PNG。两者与 115、PikPak 共用本地内嵌 PNG 和 16×16 显示方式;其他已挂载网盘使用通用 database 字形。
+
+- guangya: https://www.guangyapan.com/icon.png; source SHA-256 ef293885f5713eef15e81f11cd4545d0fc93a9df98c7599b7db03c1ec65f64d1; PNG SHA-256 53fdba335e45ed9b0ecda742bdc8358eb616e964f010cb2682ad5b4f0ec6b7d8
+- onedrive: https://www.microsoft.com/content/dam/microsoft/bade/images/icons/en-us/m365-app-icons-fy26/OneDrive-Icon-FY26.svg; source SHA-256 9f72ac359c7e03ca4723ce1a3b60f932a0bc5d2ce72dbdce365e83223142f6bc; PNG SHA-256 364c50cdfc37e563c33b6d0a3db2fc84dbdc91a73268a428f199815a57067944
diff --git a/frontend/e2e/configuration-layout.test.ts b/frontend/e2e/configuration-layout.test.ts
index 35a8f3ef3..dc9bd6341 100644
--- a/frontend/e2e/configuration-layout.test.ts
+++ b/frontend/e2e/configuration-layout.test.ts
@@ -39,12 +39,26 @@ describe('配置表单与行间距', () => {
await route.fulfill({ json: { ...data, editable: true, windows: true, media_sources: [
{ location: 'onedrive', root: 'O:\\Movies', path: 'O:\\Movies', cost: 'metered' },
{ location: 'mounted', root: 'M:\\Movies', path: 'M:\\Movies', cost: 'free' },
+ { location: 'guangya', root: 'G:\\Movies', path: 'G:\\Movies', cost: 'free' },
+ { location: '115', root: 'B:\\Movies', path: 'B:\\Movies', cost: 'free' },
+ { location: 'pikpak', root: 'A:\\Movies', path: 'A:\\Movies', cost: 'metered' },
] } });
});
await page.reload();
const form = page.getByRole('form', { name: '媒体文件夹', exact: true });
const protectedFolder = form.locator('[data-media-read-policy="0"] [aria-haspopup="listbox"]');
await protectedFolder.waitFor();
+ await page.waitForFunction(() => {
+ const marks = [...document.querySelectorAll<HTMLImageElement>('[data-folder-row] img')];
+ return marks.length === 8 && marks.every(image => image.complete && image.naturalWidth > 0);
+ });
+ const marks = await form.locator('[data-folder-row] img').evaluateAll(images => images.map(image => {
+ const box = image.getBoundingClientRect();
+ return { inline: image.getAttribute('src')?.startsWith('data:image/png;base64,'),
+ width: box.width, height: box.height };
+ }));
+ assert.deepEqual(marks, Array.from({ length: 8 }, () => ({ inline: true, width: 16, height: 16 })));
+ assert.ok(!(await form.innerText()).includes('(只读)'));
assert.ok((await protectedFolder.textContent())?.includes('代理流量保护'));
assert.ok((await form.locator('[data-media-read-policy="1"]').textContent())?.includes('正常读取'));
await protectedFolder.click();
@@ -52,6 +66,7 @@ describe('配置表单与行间距', () => {
await settle(page);
assert.ok((await protectedFolder.textContent())?.includes('正常读取'));
assert.deepEqual((await layout(page)).offenders, []);
+ await form.screenshot({ path: `../build/cloud-source-icons-${viewport.name}.png` });
assert.deepEqual(opened.problems, []);
} finally { await opened.close() }
});
diff --git a/frontend/src/core/media-sources.ts b/frontend/src/core/media-sources.ts
index afd3cbc84..f53c90c6d 100644
--- a/frontend/src/core/media-sources.ts
+++ b/frontend/src/core/media-sources.ts
@@ -4,7 +4,7 @@ import registry from '../../../resources/media-sources.json' with { type: 'json'
export type SourceCost = 'free' | 'metered';
export const MEDIA_SOURCE_REGISTRY = registry;
export const MEDIA_SOURCE_OPTIONS = registry.map((source) =>
- [source.id, source.label + (source.read_only ? '(只读)' : '')] as const);
+ [source.id, source.label] as const);
export const SCANNABLE_LOCATIONS = registry.map((source) => source.id);
export const CLOUD_LOCATIONS = registry.filter((source) => source.cloud).map((source) => source.id);
export const SOURCE_LABELS: Record<string, string> = Object.fromEntries(registry.map((source) => [source.id, source.name]));
diff --git a/frontend/src/react/settings/clouddrive-guide.tsx b/frontend/src/react/settings/clouddrive-guide.tsx
index a7fa266e4..085389381 100644
--- a/frontend/src/react/settings/clouddrive-guide.tsx
+++ b/frontend/src/react/settings/clouddrive-guide.tsx
@@ -21,7 +21,7 @@ export function CloudDriveGuide() {
<ExternalLink href="https://www.clouddrive2.com/help.html">挂载帮助</ExternalLink>
</Help>
<Help>缓存按所在硬盘和可用内存选起步值,再根据播放表现调整。</Help>
- <Help>光鸭云盘需要 CloudDrive2 v1.0.11 或更高版本,文件管理请使用光鸭云盘客户端。</Help>
+ <Help>文件操作需要挂载工具和网盘账号授予写入权限。光鸭云盘的上传、建文件夹、改名和移动需要 CloudDrive2 v1.1.0 或更高版本,删除和复制暂不支持。</Help>
{/* 三档同形、跨档比较:窄处每档一块纵排,宽处三项读数排成三列对齐。 */}
<ul aria-label="按缓存所在硬盘分档" className="flex flex-col gap-2">
{CLOUDDRIVE_PROFILES.map((profile) => (
diff --git a/frontend/src/ui-kit/media-source-icons.ts b/frontend/src/ui-kit/media-source-icons.ts
index b66ae906e..494944922 100644
--- a/frontend/src/ui-kit/media-source-icons.ts
+++ b/frontend/src/ui-kit/media-source-icons.ts
@@ -1,7 +1,12 @@
/* 官方站点图标,来源与摘要见 docs/reference-snapshots/media-source-icons.md。 */
import { MEDIA_SOURCE_REGISTRY } from '../core/media-sources';
-const SOURCE_MARKS: Readonly<Record<string, string>> = {"local": "hard-drive", "guangya": "database", "115": "data:image/png;base64,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", "pikpak": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACY0lEQVR4nNWXy2tTQRSHv7m5RUWttqlNW1OairhKNbrU+lhE/AOkdCOIIO7arty0QhSxCIIQ7VJwIfgfCIJdFB+rgC32AVIflD5CbFUsoohJRiZzb5Ne05p4kxv94HCTc+bO+c0MM3eOoICD/TJswAAQBdoBH5UhA8wDo1mIv7ojpuyAsH9EBuQgkmuASXVJI4lN3BXDawIifXIQwQ28RDA0ERfDwpr2cQ9G7iSdhcOGteZeJ1eYKreB5DS1I2oiCJba2hDQVA9tjdDaCHMfICuhMwDJz5D8BMtftK9E2s2NttrJMOxvzSdT1rIb6goW69KIXsjr5/K+nxlIWWKWrOebJIxNFhXgK7r20QjcPL+59PllGH8LarDvU3oWFHU+CDZpK+TKA3j88vd+zGKd93av/y8lrKxao7Ls6bROrrj6EE6E9WzZppZKrJ0y0Hu8RAGhZuhohqk5nShp2Y/0+nZqxPaoFQsr2my2mNDSkBe01w/7AvAu9QcB/nrYs0vboU4qSsNOwCHAoMYY/5WAsckNt1NJ8WKY5TS+fF8/E7f/Lu5aQDrjLu5agOlzF3ct4NYFd3HXAk51uYv/k9vQLPeFr9/h4gh0dcCBNu17vaiP7nt9sGNblQVs3wo9x+DZNCRm9aUyFICebh0rF9PpWP22+QvqC3f2qLZyKda34XTMLsGLGSrO8xndtxMR6ZfqQ+tz7uczRyDor0zyxY/6LlDkoMqYVsUSKvSqho8SVB/JglqCUWqF4ImharVcueQ96j4bN3KFoiDmeXpJTOXO7QJVoyEZ8mgm0rm6sLA4talFef4LaurBZfZxNPMAAAAASUVORK5CYII="};
+const SOURCE_MARKS: Readonly<Record<string, string>> = {
+ "local": "hard-drive",
+ "guangya": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAEWUlEQVR42sWXT2hcVRTGf/fNYCZdNNPGTaHaSUXFVQZSLLowoe3GdpEERHFhYqTQRBATcWlpSly56YQu4ipNZivYxCK46Z9EsBGkHdwItdhXrLixzaASo2bucXHve/feNzOagqQXHnPf/XPOd77z3XPfKLwmkxTZit4lkiEiykQK8wA5+5v0c5i5nNj3ZJ03nwPyKpmvEekFpGNZvV6PE58qdT7BEIoLRKqYOo0g6PtOogQEDkDWeS4DVgQ0MVpNqbGNpRSATDCEcLHJYcAAzWz4QHIqZCcdswwloWr7iBpWJzeWlIxTAq4CJSK7MNmQOhXrSGXeWzj205AGAiiLQAAt0JA6HZ09eRRDCKV0UmGoUsq8SzJoKRS7DgFJxpQxmjhRXsRg5pU4AAKIKvL7xmQeGPVWerJIHBACSX9TQw5EAlB75lLnnm1t18NgHqHsAPjGvCj8KHN27rEuONgPnV3w96/wVx3urZrotefMj0n5DABalfME59CjUXwGPGDlEegbgZ5+mtpmHW5fgusz8NtdF30AwKZCa9AKJeNIYERZ4anM0esuwWvzJurttK8+hLUZY1B5gaUpMIHlW+8Wh0YL7O2BU5dhb4lttxc/sEBmnE3lmba6yrf0re1RE7vj7RbOf1iBWhXqdw1D+3rh8DtQLIUgNuvwzXmaUm3T25yCJA3Kgjg+DS+fcXMPYvjkLYhXw1Ql/YHT0H861MXcs7C5bo+2BCzkpg8x3ZpDZTa8cQE6i274XB/8/K0TVt8oPDcI67FxFq9AYQ/sP2zm8wXIdcDWn7D7AOwuGdZsRWzNQFJMegfh1EU3tjoLy+85oR4agVfnzdydFZg/ZuY6izD1PRSKzXbjFageS2tF1FZEIvD0QDj29aKt41bJHV0Z7YiZ31iH7z5rbfdmFRruTsj/q5K7D4TvP9Ys9fZofXkeuntgz5Nw6X1jNDn363FzjbgyAzeqnhCzKXhmAKauuk2LY7C2YAWJExyJ6CyQ5LL5aMvtvVE1YlWZtBIexTAF9zOonyg7tCn1Ht2JohsCPS+Fe3+quas3eRpi6G9o82hpAWCj7t5fGIVdxRCE9mt5ereb0+C3ezWnCS1eXweAmkW4tuj6nUU4fiZTQPCMmijY1wvPj4a14vaKi1pjhScOsG6VAoArlZCFo5NwIgvCA/JUP5z8NLTxxVnn2Hx8uPUND1TbOnB0El45R1N6Ls8aagEeL5kUZY/qgximD3riU5n7Jbz62xeikQXj4GHa/RhmjxgQqkV5F3sSRKfA2hei6pvw+dntO791DSpH4Jc7nuCyAhT3NWTT0Z6BtBiV4MR0ezZuXTPCvb7Q8jpJo/aveNyF9N8AkrarCPvL7lr+o270kK0dD9mUTHAz/C7cwSbUIoRlHlWLWIwoUEGoPwL3McJSpCrUiRjbcfeKKfUxcQSg5lhCMQzEO5D3OophNcdS8O8YQMYpoRkix+j/LkxFDWGZAhVVcSn/Bw2n+w/oK+fWAAAAAElFTkSuQmCC",
+ "115": "data:image/png;base64,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",
+ "pikpak": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACY0lEQVR4nNWXy2tTQRSHv7m5RUWttqlNW1OairhKNbrU+lhE/AOkdCOIIO7arty0QhSxCIIQ7VJwIfgfCIJdFB+rgC32AVIflD5CbFUsoohJRiZzb5Ne05p4kxv94HCTc+bO+c0MM3eOoICD/TJswAAQBdoBH5UhA8wDo1mIv7ojpuyAsH9EBuQgkmuASXVJI4lN3BXDawIifXIQwQ28RDA0ERfDwpr2cQ9G7iSdhcOGteZeJ1eYKreB5DS1I2oiCJba2hDQVA9tjdDaCHMfICuhMwDJz5D8BMtftK9E2s2NttrJMOxvzSdT1rIb6goW69KIXsjr5/K+nxlIWWKWrOebJIxNFhXgK7r20QjcPL+59PllGH8LarDvU3oWFHU+CDZpK+TKA3j88vd+zGKd93av/y8lrKxao7Ls6bROrrj6EE6E9WzZppZKrJ0y0Hu8RAGhZuhohqk5nShp2Y/0+nZqxPaoFQsr2my2mNDSkBe01w/7AvAu9QcB/nrYs0vboU4qSsNOwCHAoMYY/5WAsckNt1NJ8WKY5TS+fF8/E7f/Lu5aQDrjLu5agOlzF3ct4NYFd3HXAk51uYv/k9vQLPeFr9/h4gh0dcCBNu17vaiP7nt9sGNblQVs3wo9x+DZNCRm9aUyFICebh0rF9PpWP22+QvqC3f2qLZyKda34XTMLsGLGSrO8xndtxMR6ZfqQ+tz7uczRyDor0zyxY/6LlDkoMqYVsUSKvSqho8SVB/JglqCUWqF4ImharVcueQ96j4bN3KFoiDmeXpJTOXO7QJVoyEZ8mgm0rm6sLA4talFef4LaurBZfZxNPMAAAAASUVORK5CYII=",
+ "onedrive": "data:image/png;base64,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",};
export const MEDIA_SOURCE_ICONS: Readonly<Record<string, string>> = Object.fromEntries(
MEDIA_SOURCE_REGISTRY.map((source) => [source.id, SOURCE_MARKS[source.id] || source.icon]),
diff --git a/frontend/test/react/media-settings.test.tsx b/frontend/test/react/media-settings.test.tsx
index 200e01d28..a235533b9 100644
--- a/frontend/test/react/media-settings.test.tsx
+++ b/frontend/test/react/media-settings.test.tsx
@@ -4,10 +4,15 @@ import { describe, expect, it, vi } from 'vitest';
import { CONFIGURATION_URL, PICK_FOLDER_URL } from '../../src/configuration-endpoints';
import type { ConfigurationData } from '../../src/react/bundle';
import { CloudDriveGuide } from '../../src/react/settings/clouddrive-guide';
+import { MEDIA_SOURCE_ICONS } from '../../src/ui-kit/media-source-icons';
import { MediaSettings } from '../../src/react/settings/media-settings';
import { buttonNamed, choose, click, fetchMock, mount, section, sentBody, settle, submit } from './render';
vi.mock('../../src/react/settings/service-preferences', () => ({ VideoThumbnailRow: () => null }));
+vi.mock('@peach/legacy/ui', async (original) => ({
+ ...await original<Record<string, unknown>>(),
+ MEDIA_SOURCE_ICONS: (await import('../../src/ui-kit/media-source-icons')).MEDIA_SOURCE_ICONS,
+}));
const data = (over: Partial<ConfigurationData> = {}): ConfigurationData => ({
editable: true, notice: '', revision: 'rev-1', media_dirs: ['D:\\Media'], library_count: 1, port: 9123, facts: [], ...over,
@@ -46,19 +51,23 @@ it('不能编辑时只说原因,不画表单', async () => {
});
describe('媒体文件夹', () => {
- it('光鸭来源回填只读名称、挂载帮助和现有图标,保存带上来源', async () => {
+ it.each([['guangya', '光鸭云盘'], ['onedrive', 'OneDrive'], ['mounted', '其他已挂载网盘']])(
+ '%s 来源回填名称、挂载帮助和现有图标,保存带上来源', async (location, label) => {
const fetcher = fetchMock(200, { saved: true, url: '/', revision: 'rev-2' });
vi.stubGlobal('fetch', fetcher);
const host = await open({ windows: true, media_sources: [
- { location: 'guangya', root: 'G:\\Movies', path: 'G:\\Movies', online: true },
+ { location, root: 'G:\\Movies', path: 'G:\\Movies', online: true },
] });
expect(paths(host)[0]?.value).toBe('G:\\Movies');
- expect(host.textContent).toContain('光鸭云盘(只读)');
- expect(host.querySelector('use[href="#i-database"]')).not.toBeNull();
- expect(host.textContent).toContain('光鸭云盘需要 CloudDrive2 v1.0.11');
+ expect(host.textContent).toContain(label);
+ expect(host.textContent).not.toContain('(只读)');
+ if (location === 'mounted') expect(host.querySelector('use[href="#i-database"]')).not.toBeNull();
+ else expect(host.querySelector('img')?.getAttribute('src')).toBe(MEDIA_SOURCE_ICONS[location]);
+ expect(host.textContent).toContain('CloudDrive2 v1.1.0');
await submit(host.querySelector('form'));
expect(sentBody(fetcher).media_sources).toEqual([
- { location: 'guangya', root: 'G:\\Movies', path: 'G:\\Movies', library: '', library_icon: '', cost: 'free' },
+ { location, root: 'G:\\Movies', path: 'G:\\Movies', library: '', library_icon: '',
+ cost: location === 'guangya' ? 'free' : 'metered' },
]);
});
diff --git a/frontend/test/react/media-source-marks.test.tsx b/frontend/test/react/media-source-marks.test.tsx
index 663b6f1a8..16362faef 100644
--- a/frontend/test/react/media-source-marks.test.tsx
+++ b/frontend/test/react/media-source-marks.test.tsx
@@ -12,6 +12,9 @@ vi.mock('@peach/legacy/ui', async (original) => ({
it.each(MEDIA_SOURCE_REGISTRY)('$label 的选择项与状态使用同一来源标识', async (source) => {
const mark = MEDIA_SOURCE_ICONS[source.id]!;
+ if (['115', 'pikpak', 'guangya', 'onedrive'].includes(source.id)) {
+ expect(mark).toMatch(/^data:image\/png;base64,/);
+ }
const host = await mount(<>
<SourceSelect index={0} value={source.id} onChange={() => undefined} />
<SourceMark mark={mark} />
diff --git a/frontend/test/react/setup-page.test.tsx b/frontend/test/react/setup-page.test.tsx
index 8628db78c..d7f658f44 100644
--- a/frontend/test/react/setup-page.test.tsx
+++ b/frontend/test/react/setup-page.test.tsx
@@ -138,7 +138,7 @@ describe('访问密码', () => {
describe('媒体库', () => {
it('首次设置网盘时必须明确选择读取策略', async () => {
const { host, sent } = await open({}, { [SETUP_URL]: { status: 200, body: done() } });
- await choose(rows(host)[0]!.querySelector('[aria-haspopup="listbox"]'), 'OneDrive(只读)');
+ await choose(rows(host)[0]!.querySelector('[aria-haspopup="listbox"]'), 'OneDrive');
const policy = rows(host)[0]!.querySelector('[data-media-read-policy] [aria-haspopup="listbox"]');
expect(policy?.textContent).toContain('选择读取策略');
await submitForm(host);
diff --git a/resources/media-sources.json b/resources/media-sources.json
index ffea3f7d1..c9a41de43 100644
--- a/resources/media-sources.json
+++ b/resources/media-sources.json
@@ -1,8 +1,8 @@
[
- {"id":"local","name":"本地磁盘","label":"本地磁盘","default_cost":"free","cloud":false,"read_only":false,"icon":"hard-drive"},
- {"id":"115","name":"115","label":"CloudDrive · 115","default_cost":"free","cloud":true,"read_only":false,"icon":"database"},
- {"id":"pikpak","name":"PikPak","label":"CloudDrive · PikPak","default_cost":"metered","cloud":true,"read_only":false,"icon":"database"},
- {"id":"guangya","name":"光鸭云盘","label":"光鸭云盘","default_cost":"free","cloud":true,"read_only":true,"icon":"database"},
- {"id":"onedrive","name":"OneDrive","label":"OneDrive","default_cost":"metered","cloud":true,"read_only":true,"icon":"database"},
- {"id":"mounted","name":"其他已挂载网盘","label":"其他已挂载网盘","default_cost":"metered","cloud":true,"read_only":true,"icon":"database"}
+ {"id":"local","name":"本地磁盘","label":"本地磁盘","default_cost":"free","cloud":false,"icon":"hard-drive"},
+ {"id":"115","name":"115","label":"CloudDrive · 115","default_cost":"free","cloud":true,"icon":"database"},
+ {"id":"pikpak","name":"PikPak","label":"CloudDrive · PikPak","default_cost":"metered","cloud":true,"icon":"database"},
+ {"id":"guangya","name":"光鸭云盘","label":"光鸭云盘","default_cost":"free","cloud":true,"icon":"database"},
+ {"id":"onedrive","name":"OneDrive","label":"OneDrive","default_cost":"metered","cloud":true,"icon":"database"},
+ {"id":"mounted","name":"其他已挂载网盘","label":"其他已挂载网盘","default_cost":"metered","cloud":true,"icon":"database"}
]
diff --git a/scripts/clean_names.py b/scripts/clean_names.py
index aaf148f54..51b669c51 100644
--- a/scripts/clean_names.py
+++ b/scripts/clean_names.py
@@ -13,7 +13,7 @@
先出 CSV 供人工核对,加 --apply 才落盘;改名同时同步 ledger 的 path/name。
用法:
- python scripts/clean_names.py [--location local|115|pikpak] [--apply]
+ python scripts/clean_names.py [--location 来源ID] [--apply]
"""
from __future__ import annotations
@@ -36,7 +36,7 @@ if str(SRC_DIR) not in sys.path:
from peach.review_csv import write_rows
from peach.catalog_rules import is_jav_code, normalise_code_key
from peach.config import DATABASE_PATH, GENERATED_DIR, LOG_DIR
-from peach.media_sources import READ_ONLY_LOCATIONS, SCANNABLE_LOCATIONS, require_writable_location
+from peach.media_sources import SCANNABLE_LOCATIONS
from peach.scripting import (
add_ledger_write_args, open_for_write, open_readonly, verify_after_write,
)
@@ -236,8 +236,6 @@ def build_plan(rows: list[tuple]) -> list[dict]:
plan: list[dict] = []
for aid, location, path, name, code, *evidence in rows:
- if location in READ_ONLY_LOCATIONS:
- continue
allow_compact = bool(evidence and evidence[0])
normalized = normalise_code_key(code)
canonical = (
@@ -336,7 +334,6 @@ def run(args_ns: argparse.Namespace) -> int:
fail += 1
continue
try:
- require_writable_location(item["location"])
if rename_needed:
_rename_path(src, dst)
except Exception as exc:
diff --git a/scripts/organize_library_dirs.py b/scripts/organize_library_dirs.py
index 28c420e23..9f248e915 100644
--- a/scripts/organize_library_dirs.py
+++ b/scripts/organize_library_dirs.py
@@ -23,6 +23,7 @@ from peach.classification import is_structural_creator
from peach.config import DATABASE_PATH, GENERATED_DIR
from peach.entity_classification import category_predicates
from peach.jobs import PidFileLock
+from peach.media_sources import SCANNABLE_LOCATIONS
from peach.migrations import sqlite_backup
from peach.organize_clouddrive import UnconfirmedMove
from peach.organize_templates import MAX_PATH, sanitise_component
@@ -455,7 +456,11 @@ def build_plan(stage, batch=None):
else:
creators, categories, unverified = classification_inputs(db)
db.create_function('infer_region',2,infer_region,deterministic=True)
- all_rows = [dict(r) for r in db.execute("SELECT a.*,"+effective_region_sql()+" AS effective_region FROM asset a WHERE a.location IN ('115','pikpak','local') AND a.path IS NOT NULL AND trim(a.path)<>'' ORDER BY a.id")]
+ marks = ','.join('?' for _ in SCANNABLE_LOCATIONS)
+ all_rows = [dict(r) for r in db.execute(
+ "SELECT a.*," + effective_region_sql() + " AS effective_region FROM asset a "
+ f"WHERE a.location IN ({marks}) AND a.path IS NOT NULL AND trim(a.path)<>'' ORDER BY a.id",
+ SCANNABLE_LOCATIONS)]
by_id = {row['id']:row for row in all_rows}
by_path = {row['path'].casefold():row for row in all_rows}
mounts = {root:root_online(translate_ledger_path(root)) for values in roots.values() for root in values}
@@ -1130,7 +1135,7 @@ if __name__ == '__main__':
parser.add_argument('--limit', type=int, default=1000)
parser.add_argument('--seconds', type=int, default=1200)
parser.add_argument('--self-check', action='store_true')
- parser.add_argument('--location', choices=('115','pikpak','local'))
+ parser.add_argument('--location', choices=SCANNABLE_LOCATIONS)
parser.add_argument('--retry-failed', action='store_true')
parser.add_argument('--skip-collapses', action='store_true')
parser.add_argument('--pikpak-webdav', action='store_true',
diff --git a/scripts/organize_media.py b/scripts/organize_media.py
index 606cad322..91e5b8278 100644
--- a/scripts/organize_media.py
+++ b/scripts/organize_media.py
@@ -26,6 +26,7 @@ if str(SRC_DIR) not in sys.path:
from peach import organize
from peach.config import DATABASE_PATH, GENERATED_DIR
+from peach.media_sources import SCANNABLE_LOCATIONS
from peach.organize_templates import PLACEHOLDERS, TemplateError
from peach.scripting import add_ledger_write_args, open_for_write, verify_after_write
@@ -35,7 +36,7 @@ def build_parser() -> argparse.ArgumentParser:
description="按模板整理文件名与目录;默认只出计划",
epilog="占位符:" + "、".join(f"{{{key}}}={label}" for key, label in PLACEHOLDERS.items()))
add_ledger_write_args(parser, db_default=DATABASE_PATH)
- parser.add_argument("--location", choices=("local", "115", "pikpak"), default="local")
+ parser.add_argument("--location", choices=SCANNABLE_LOCATIONS, default="local")
parser.add_argument("--file-template", default="", help="文件名模板,不含扩展名")
parser.add_argument("--dir-template", default="",
help="目录模板,相对来源根;留空表示原地改名")
diff --git a/scripts/trash_junk.py b/scripts/trash_junk.py
index 9504e5b3e..cf3624f0c 100644
--- a/scripts/trash_junk.py
+++ b/scripts/trash_junk.py
@@ -33,6 +33,7 @@ if str(SRC_DIR) not in sys.path:
sys.path.insert(0, str(SRC_DIR))
from peach.config import DATABASE_PATH, GENERATED_DIR, LOCATION_ROOT_DECLARATIONS
+from peach.media_sources import SCANNABLE_LOCATIONS
from peach.personal_records import record_holders
from peach.platform import root_online, translate_ledger_path, within_root
from peach.review_csv import read_rows, write_rows
@@ -46,7 +47,7 @@ from peach.web_batch import (
from peach.web_contract import WebContract
FIELDS = ["id", "score", "location", "medium", "size_mb", "name", "why", "path"]
-TRASHABLE_LOCATIONS = ("local", "115", "pikpak")
+TRASHABLE_LOCATIONS = SCANNABLE_LOCATIONS
def load_review(path: Path) -> list[dict]:
@@ -166,10 +167,11 @@ def trash_assets(connection, asset_ids: list[int]) -> int:
if not ids:
return 0
marks = ",".join("?" * len(ids))
+ sources = ",".join("?" * len(TRASHABLE_LOCATIONS))
cursor = connection.execute(
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],
+ f"AND disposal IS NULL AND location IN ({sources})",
+ [time.time(), *ids, *TRASHABLE_LOCATIONS],
)
connection.commit()
return cursor.rowcount
diff --git a/src/peach/media_sources.py b/src/peach/media_sources.py
index 3e0bc8c67..2e6cee2b5 100644
--- a/src/peach/media_sources.py
+++ b/src/peach/media_sources.py
@@ -14,19 +14,16 @@ class MediaSource:
label: str
default_cost: str
cloud: bool
- read_only: bool
icon: str
SOURCE_REGISTRY = tuple(MediaSource(**row) for row in json.loads(
(PROJECT_ROOT / "resources" / "media-sources.json").read_text(encoding="utf-8")))
SOURCES = {source.id: source for source in SOURCE_REGISTRY}
-SOURCE_OPTIONS = tuple((source.id, source.label + ("(只读)" if source.read_only else ""))
- for source in SOURCE_REGISTRY)
+SOURCE_OPTIONS = tuple((source.id, source.label) for source in SOURCE_REGISTRY)
SOURCE_COSTS = {source.id: source.default_cost for source in SOURCE_REGISTRY}
SCANNABLE_LOCATIONS = tuple(SOURCES)
CLOUD_LOCATIONS = frozenset(source.id for source in SOURCE_REGISTRY if source.cloud)
-READ_ONLY_LOCATIONS = frozenset(source.id for source in SOURCE_REGISTRY if source.read_only)
def _config(config):
@@ -83,9 +80,3 @@ def cost_sql(location_column: str = "location", path_column: str = "path", *, co
clauses.append(f"WHEN {location_column}=? THEN ?")
parameters.extend((location, cost))
return "CASE " + " ".join(clauses) + " ELSE 'metered' END", tuple(parameters)
-
-
-def require_writable_location(location: str | None) -> None:
- """只读挂载在任何文件系统写入之前拒绝。"""
- if location in READ_ONLY_LOCATIONS:
- raise ValueError(f"{SOURCES[location].name}为只读来源,请在网盘客户端管理文件")
diff --git a/src/peach/organize.py b/src/peach/organize.py
index 08be4d22d..f7d626c62 100644
--- a/src/peach/organize.py
+++ b/src/peach/organize.py
@@ -23,7 +23,6 @@ from pathlib import Path
from .catalog_rules import is_jav_code, is_uncensored_release, normalise_code_key, part_marker
from .jobs import ACTIVE_ASSET_SQL
-from .media_sources import require_writable_location
from .organize_templates import MAX_PATH, TemplateError, render, validate_template
from .platform import (is_windows_path, location_mounts, location_roots, resolve_root, root_online,
translate_ledger_path, within_root)
@@ -65,7 +64,6 @@ class UnverifiedRename(OSError):
@contextmanager
def verified_renames(location: str, rename: Callable[[str, str], None]):
"""在这段上下文里,`location` 的改名交给 `rename`(它自己确认云端结果)。"""
- require_writable_location(location)
if location in _verified_renames:
raise RuntimeError(f"来源 {location} 已注入核验改名")
_verified_renames[location] = rename
@@ -94,8 +92,6 @@ def unverified_location(location: str | None) -> bool:
def refuse_unverified(paths: Iterable[str]) -> None:
"""整批动盘之前的门槛:涉及须核验来源而没有核验通道时整批拒绝,一个文件都不动。"""
locations = [_location_of(str(path)) for path in paths]
- for location in locations:
- require_writable_location(location)
blocked = sorted({location for location in locations
if unverified_location(location)})
if blocked:
@@ -310,8 +306,6 @@ def _rename(source: str, target: str) -> None:
须核验来源(`VERIFIED_RENAME_LOCATIONS`)交给注入的官方改名;没有注入时拒绝。
"""
location = _location_of(str(source))
- require_writable_location(location)
- require_writable_location(_location_of(str(target)))
if location in VERIFIED_RENAME_LOCATIONS:
verified = _verified_renames.get(location)
if verified is None:
@@ -377,8 +371,6 @@ def apply_plan(connection: sqlite3.Connection, rows: Sequence[dict], *,
`web_organize` 都是这么做的)。这里只负责动盘、写账本和留下批次日志。
"""
movable = [row for row in rows if row.get("action") in {"rename", "move"}]
- for row in movable:
- require_writable_location(row.get("location"))
refuse_unverified(path for row in movable for path in (row["current_path"], row["target_path"]))
entries: list[dict] = []
failures: list[dict] = []
diff --git a/src/peach/routes_pages.py b/src/peach/routes_pages.py
index 6238bd59d..dc1ace95d 100644
--- a/src/peach/routes_pages.py
+++ b/src/peach/routes_pages.py
@@ -98,7 +98,7 @@ _POSIX_MEDIA_NOTE = "本机文件夹是这台电脑读取媒体的位置;Windo
#: 有一行媒体来源选了云盘时,媒体库底下出现的那句提示和它的帮助链接。
-_CLOUD_HELP = "请先将 CloudDrive2 或 OpenList 中的网盘挂载为本机文件夹;Windows 读取 NAS 共享时,请先映射为盘符,再选择对应文件夹。本机安装提示仅适用于在本机运行 CloudDrive。光鸭云盘需要 CloudDrive2 v1.0.11 或更高版本,文件管理请使用网盘客户端。"
+_CLOUD_HELP = "请先将 CloudDrive2 或 OpenList 中的网盘挂载为本机文件夹;Windows 读取 NAS 共享时,请先映射为盘符,再选择对应文件夹。本机安装提示仅适用于在本机运行 CloudDrive。文件操作需要挂载工具和网盘账号授予写入权限;光鸭云盘的上传、建文件夹、改名和移动需要 CloudDrive2 v1.1.0 或更高版本,删除和复制暂不支持。"
_CLOUD_HELP_URL = "https://www.clouddrive2.com/help.html"
_CLOUD_HELP_LABEL = "挂载帮助"
diff --git a/src/peach/web_batch.py b/src/peach/web_batch.py
index 17e4d4b17..de71fbeb0 100644
--- a/src/peach/web_batch.py
+++ b/src/peach/web_batch.py
@@ -26,7 +26,7 @@ from typing import Sequence
from .catalog_rules import duration_clusters, is_jav_code, normalise_code_key
from .config import GENERATED_DIR, LOCATION_ROOT_DECLARATIONS
from .field_owners import USER_MANUAL, write_owned_fields
-from .media_sources import READ_ONLY_LOCATIONS, SCANNABLE_LOCATIONS
+from .media_sources import SCANNABLE_LOCATIONS
from .personal_records import ASSET_REFERENCE_TABLES, VANISHED
from .platform import is_unmapped, root_online, translate_ledger_path, within_root
from .regions import normalize_region
@@ -605,8 +605,6 @@ def _online_source_roots() -> dict[str, tuple[Path, ...]]:
"""Return only declared physical roots that can be enumerated now, per source."""
roots: dict[str, tuple[Path, ...]] = {}
for location, declarations in LOCATION_ROOT_DECLARATIONS.items():
- if location in READ_ONLY_LOCATIONS:
- continue
online = []
for declaration in declarations:
root = translate_ledger_path(declaration)
@@ -707,14 +705,6 @@ def purge_assets(connection, rows, *, missing_only: bool = False):
purged, blocked, staged, snapshots, parents = [], [], [], [], []
for row in rows:
media = row["path"]
- location = row["location"] if "location" in row.keys() else None
- if location is None:
- stored = connection.execute("SELECT location FROM asset WHERE id=?", (row["id"],)).fetchone()
- location = stored[0] if stored else None
- if media and not missing_only and location in READ_ONLY_LOCATIONS:
- blocked.append({"id": row["id"], "path": media,
- "reason": "该挂载来源为只读,请在网盘客户端管理文件"})
- continue
if media and missing_only:
try:
present = translate_ledger_path(media).exists()
@@ -739,7 +729,7 @@ def purge_assets(connection, rows, *, missing_only: bool = False):
snapshot = row["snapshot_path"]
if snapshot:
snapshots.append(Path(snapshot))
- if media and location not in READ_ONLY_LOCATIONS:
+ if media:
parents.append(Path(media).parent)
purged.append(row["id"])
try:
diff --git a/src/peach/web_media_repair.py b/src/peach/web_media_repair.py
index c92154466..6b7187b7a 100644
--- a/src/peach/web_media_repair.py
+++ b/src/peach/web_media_repair.py
@@ -26,7 +26,6 @@ from pathlib import Path, PureWindowsPath
from . import media_libraries, media_probe, mp4recover, settings_file
from .mp4repair import RepairUnavailable
-from .media_sources import READ_ONLY_LOCATIONS
from .platform import translate_ledger_path
#: 判定结论的落盘位置,放在边车自己的目录里:它们同生同灭,清缓存时一起走。
@@ -170,7 +169,7 @@ def _record_replacement(contract, asset_id: int, source: Path, ffprobe: Path) ->
def _recover(contract, asset_id: int, raw: str, tools: tuple[Path, Path, Path]) -> bool:
with contract.read_connection() as connection:
row = connection.execute("SELECT location FROM asset WHERE id=?", (asset_id,)).fetchone()
- if row is None or row['location'] in READ_ONLY_LOCATIONS:
+ if row is None:
return False
untrunc, ffmpeg, ffprobe = tools
source = translate_ledger_path(raw)
diff --git a/src/peach/web_organize.py b/src/peach/web_organize.py
index bf5e4a220..5e1ad85e9 100644
--- a/src/peach/web_organize.py
+++ b/src/peach/web_organize.py
@@ -14,20 +14,19 @@ from pathlib import Path
from . import organize
from .migrations import sqlite_backup
-from .media_sources import require_writable_location
+from .media_sources import SCANNABLE_LOCATIONS
from .organize_templates import PLACEHOLDERS, TemplateError, validate_template
from .platform import location_roots
from .scripting import verify_after_write
from .web_settings import organize_templates
#: 界面上能整理的来源。`online` 是追更抓来的东西,不在任何一个媒体根下面。
-ORGANIZE_LOCATIONS = ("local", "115", "pikpak")
+ORGANIZE_LOCATIONS = SCANNABLE_LOCATIONS
def _templates(contract, body) -> tuple[str, str, str]:
"""取出这一次要用的来源与两份模板;模板缺省时用账本里存着的那一份。"""
location = str(body.get("location") or "").strip()
- require_writable_location(location)
if location not in ORGANIZE_LOCATIONS:
raise ValueError(f"不认识的来源:{location or '(空)'}")
stored = organize_templates(contract).get(location, {})
@@ -80,7 +79,7 @@ def _run_write(contract, job_id: str, work) -> dict:
并发的普通写入照常进行。
"""
backup = Path(contract.candidate_root) / "organize-backups" / (
- f"ledger.pre-organize-{time.strftime('%Y%m%d-%H%M%S')}.db")
+ f"ledger.pre-organize-{time.strftime('%Y%m%d-%H%M%S')}-{job_id}.db")
backup.parent.mkdir(parents=True, exist_ok=True)
sqlite_backup(Path(contract.db_path), backup)
connection = sqlite3.connect(str(contract.db_path), timeout=30)
diff --git a/src/peach/web_resource_sync.py b/src/peach/web_resource_sync.py
index 73b996c4a..5d849eedc 100644
--- a/src/peach/web_resource_sync.py
+++ b/src/peach/web_resource_sync.py
@@ -29,7 +29,7 @@ from .catalog_rules import dir_expr, normalise_code_key, photo_set_title
from .config import LOCATION_ROOT_DECLARATIONS
from .jobs import BackgroundJob
from .media import normalized_path
-from .media_sources import READ_ONLY_LOCATIONS, SCANNABLE_LOCATIONS
+from .media_sources import SCANNABLE_LOCATIONS
from .personal_records import VANISHED, mark_vanished, record_holders
from .platform import is_unmapped, root_online, translate_ledger_path, within_root
from .record_rehome import reattach_vanished
@@ -288,8 +288,7 @@ def _scan_sources(
if online:
unreadable: set[str] = set()
gone = vanished_asset_rows(contract, location, unreadable_dirs=unreadable)
- empties = ([] if location in READ_ONLY_LOCATIONS
- else _empty_directories(_source_roots(location), unreadable))
+ empties = _empty_directories(_source_roots(location), unreadable)
vanished_ids.extend(int(row["id"]) for row in gone)
keep = _keeps_records(contract, gone)
keep_ids.update(keep)
@@ -678,8 +677,7 @@ def w_resource_sync_apply(contract: ResourceSyncContract, body, *, progress=None
report(checked=0, total=None, message="正在删除空文件夹")
dirs_removed, dir_errors = 0, 0
for location, paths in state["empty_dirs"].items():
- if (location in READ_ONLY_LOCATIONS or location not in configured_resource_locations()
- or not source_is_online(location)):
+ if location not in configured_resource_locations() or not source_is_online(location):
continue
removed, errors = _remove_empty_directories([Path(path) for path in paths],
_source_roots(location))
diff --git a/src/peach/web_settings.py b/src/peach/web_settings.py
index 32130d3b4..3a6c459bb 100644
--- a/src/peach/web_settings.py
+++ b/src/peach/web_settings.py
@@ -19,6 +19,7 @@ import time
from typing import Protocol
from .feeds import DEFAULT_HIDDEN_COMPILATIONS, EXCERPT, GROUP_COMPILATION, SOLO_COMPILATION
+from .media_sources import SCANNABLE_LOCATIONS
from .remote_media_cache import AVATAR_REFRESH_SECONDS, FAVICON_REFRESH_SECONDS
from .profiles import DEFAULT_PROFILE_ID
@@ -132,7 +133,7 @@ def normalise_organize_templates(raw) -> dict:
return {}
clean: dict[str, dict[str, str]] = {}
for location, entry in raw.items():
- if location not in {"local", "115", "pikpak"} or not isinstance(entry, dict):
+ if location not in SCANNABLE_LOCATIONS or not isinstance(entry, dict):
continue
# 模板不合法时 `TemplateError` 原样抛给调用方:它是 `ValueError`,API 翻成 400
# 并把那句中文交给用户,而不是把这一份悄悄丢掉。
diff --git a/tests/test_guangya_sources.py b/tests/test_guangya_sources.py
index 76c201d89..56e507492 100644
--- a/tests/test_guangya_sources.py
+++ b/tests/test_guangya_sources.py
@@ -1,18 +1,22 @@
-"""光鸭挂载配置、来源读取与远端写入边界。"""
+"""挂载来源配置、整理与回滚、文件删除及底层权限错误。"""
from contextlib import closing
-import json
-from pathlib import Path
+from pathlib import Path, PureWindowsPath
import sqlite3
import tempfile
import unittest
-from unittest.mock import Mock, patch
+from unittest.mock import patch
from peach import media_configuration, onboarding, organize, resource_identification, settings_file
from peach import web_batch, web_organize, web_resource_sync
-from peach.media_sources import READ_ONLY_LOCATIONS, SCANNABLE_LOCATIONS, cost_for
+from peach.media_sources import SCANNABLE_LOCATIONS, cost_for
+from peach.web_contract import WebContract
+from peach.web_settings import organize_templates, w_settings
from support.ledger import fresh_ledger
+MOUNTED_SOURCES = ("guangya", "onedrive", "mounted")
+
+
class GuangyaSourceTests(unittest.TestCase):
def setUp(self):
self.temporary = tempfile.TemporaryDirectory()
@@ -43,11 +47,11 @@ class GuangyaSourceTests(unittest.TestCase):
}, windows=False)
self.assertEqual(errors, {})
self.assertEqual(answers.media_sources[0]["location"], "guangya")
- self.assertIn("只读", dict(media_configuration.SOURCE_OPTIONS)["guangya"])
+ for location in MOUNTED_SOURCES:
+ self.assertNotIn("只读", dict(media_configuration.SOURCE_OPTIONS)[location])
- def test_guangya_is_scannable_free_and_read_only(self):
+ def test_guangya_is_scannable_and_free(self):
self.assertIn("guangya", SCANNABLE_LOCATIONS)
- self.assertIn("guangya", READ_ONLY_LOCATIONS)
self.assertEqual(cost_for("guangya"), "free")
with patch.object(web_resource_sync, "LOCATION_ROOT_DECLARATIONS", {"guangya": ("G:/",)}):
self.assertEqual(web_resource_sync.configured_resource_locations(), ("guangya",))
@@ -61,84 +65,112 @@ class GuangyaSourceTests(unittest.TestCase):
worklist = resource_identification.build_worklist(connection)
self.assertEqual(len(worklist), 1)
- def test_organize_refuses_guangya_before_any_filesystem_write(self):
- with patch.object(organize, "location_roots", return_value={"guangya": ("G:/",)}), \
- patch.object(organize.os, "rename") as rename:
- for paths in (("G:\\film.mp4",), ("R:\\film.mp4", "G:\\film.mp4")):
- with self.subTest(paths=paths), self.assertRaisesRegex(ValueError, "只读"):
- organize.refuse_unverified(paths)
- with self.assertRaisesRegex(ValueError, "只读"):
- organize._rename("G:\\film.mp4", "G:\\renamed.mp4")
- with self.assertRaisesRegex(ValueError, "只读"):
- organize.apply_plan(Mock(), [{"asset_id": 1, "location": "guangya", "action": "rename",
- "current_path": "G:\\film.mp4", "target_path": "G:\\renamed.mp4"}],
- generated_root=self.root)
- with self.assertRaisesRegex(ValueError, "只读"):
- with organize.verified_renames("guangya", Mock()):
- self.fail("只读来源不能注入改名通道")
- log = self.root / "organize.json"
- log.write_text(json.dumps({"entries": [{"asset_id": 1,
- "old_path": "G:\\film.mp4", "new_path": "G:\\renamed.mp4"}]}), encoding="utf-8")
- with self.assertRaisesRegex(ValueError, "只读"):
- organize.rollback_batch(Mock(), log)
- rename.assert_not_called()
- with self.assertRaisesRegex(ValueError, "只读"):
- web_organize.w_organize_apply(Mock(), {"confirm": True, "location": "guangya"})
+ def test_organize_api_lists_mounts_and_executes_and_rolls_back_files(self):
+ for location in MOUNTED_SOURCES:
+ with self.subTest(location=location):
+ root = self.root / location
+ root.mkdir()
+ media = root / "media"
+ media.mkdir()
+ original = media / "film.mp4"
+ original.write_bytes(b"media")
+ db = fresh_ledger(root)
+ with closing(sqlite3.connect(db)) as connection:
+ connection.execute("INSERT INTO asset(id,location,path,name,medium,code) "
+ "VALUES(1,?,?,'film.mp4','video','ABC-123')", (location, "G:\\film.mp4"))
+ connection.commit()
+ contract = WebContract(db, candidate_root=root / "generated")
+ roots = {location: ("G:\\",)}
+ templates = {location: {"file": "{number}", "dir": "{number}"}}
+ w_settings(contract, {"organizeTemplates": templates})
+ self.assertEqual(organize_templates(contract), templates)
+
+ def translate(raw, mount=media):
+ return mount.joinpath(*PureWindowsPath(str(raw)).parts[1:])
- def test_permanent_delete_keeps_guangya_file_and_ledger_row(self):
- media = self.root / "film.mp4"
- media.write_bytes(b"media")
+ with patch.object(organize, "location_roots", return_value=roots), \
+ patch.object(web_organize, "location_roots", return_value=roots), \
+ patch.object(organize, "translate_ledger_path", side_effect=translate), \
+ patch.object(organize, "root_online", return_value=True):
+ available = web_organize.q_organize(contract)["locations"]
+ self.assertEqual([row["location"] for row in available], [location])
+ body = {"location": location, "confirm": True}
+ preview = web_organize.w_organize_preview(contract, body)
+ self.assertEqual(preview["counts"]["change"], 1)
+ web_organize.w_organize_apply(contract, body)
+ contract.organize_job.thread.join(timeout=15)
+ self.assertFalse(contract.organize_job.thread.is_alive())
+ state = contract.organize_job.snapshot()
+ self.assertEqual((state["status"], state.get("moved")), ("complete", 1), state)
+ self.assertEqual((media / "ABC-123" / "ABC-123.mp4").read_bytes(), b"media")
+ self.assertFalse(original.exists())
+ web_organize.w_organize_rollback(contract, {"confirm": True})
+ contract.organize_job.thread.join(timeout=15)
+ self.assertFalse(contract.organize_job.thread.is_alive())
+ state = contract.organize_job.snapshot()
+ self.assertEqual((state["status"], state.get("restored")), ("complete", 1), state)
+ self.assertEqual(original.read_bytes(), b"media")
+ with closing(sqlite3.connect(db)) as connection:
+ self.assertEqual(connection.execute("SELECT path FROM asset").fetchone()[0],
+ "G:\\film.mp4")
+
+ def test_permanent_delete_quarantines_mount_files_and_removes_ledger_rows(self):
with closing(sqlite3.connect(fresh_ledger(self.root))) as connection:
connection.row_factory = sqlite3.Row
- connection.execute("INSERT INTO asset(id,location,path,name,medium) "
- "VALUES(1,'guangya',?,'film.mp4','video')", (str(media),))
- for columns in ("id,location,path,snapshot_path", "id,path,snapshot_path"):
- with self.subTest(columns=columns):
- result = web_batch.purge_assets(connection, connection.execute(
- f"SELECT {columns} FROM asset").fetchall())
- self.assertEqual(result["purged"], 0)
- self.assertIn("只读", result["blocked"][0]["reason"])
- self.assertEqual(connection.execute("SELECT count(*) FROM asset").fetchone()[0], 1)
- self.assertEqual(media.read_bytes(), b"media")
+ for location in MOUNTED_SOURCES:
+ for columns in ("id,location,path,snapshot_path", "id,path,snapshot_path"):
+ with self.subTest(location=location, columns=columns):
+ media = self.root / "film.mp4"
+ media.write_bytes(b"media")
+ connection.execute("INSERT INTO asset(id,location,path,name,medium) "
+ "VALUES(1,?,?,'film.mp4','video')", (location, str(media)))
+ result = web_batch.purge_assets(connection,
+ connection.execute(f"SELECT {columns} FROM asset").fetchall())
+ self.assertEqual((result["purged"], result["blocked"]), (1, []))
+ self.assertFalse(media.exists())
+ self.assertEqual(result["_staged"][0][1].read_bytes(), b"media")
+ self.assertEqual(connection.execute("SELECT count(*) FROM asset").fetchone()[0], 0)
+ web_batch._restore_staged_media(result["_staged"])
+ self.assertEqual(media.read_bytes(), b"media")
- def test_missing_guangya_row_cleanup_never_cleans_remote_parents(self):
+ def test_mount_write_error_keeps_the_media_and_ledger_row(self):
with closing(sqlite3.connect(fresh_ledger(self.root))) as connection:
connection.row_factory = sqlite3.Row
- connection.execute("INSERT INTO asset(id,location,path,name,medium) "
- "VALUES(1,'guangya',?,'missing.mp4','video')", (str(self.root / "missing.mp4"),))
- rows = connection.execute("SELECT id,location,path,snapshot_path FROM asset").fetchall()
- result = web_batch.purge_assets(connection, rows, missing_only=True)
- self.assertEqual(result["purged"], 1)
- self.assertEqual(result["_parents"], [])
- with patch.object(web_batch, "LOCATION_ROOT_DECLARATIONS", {"guangya": (str(self.root),)}):
- self.assertEqual(web_batch._online_source_roots(), {})
-
- def test_resource_scan_does_not_offer_read_only_empty_directories(self):
- from contextlib import contextmanager
- database = fresh_ledger(self.root)
- @contextmanager
- def read_connection():
- with closing(sqlite3.connect(database)) as connection:
- yield connection
- contract = Mock(read_connection=read_connection)
- with patch.object(web_resource_sync, "LOCATION_ROOT_DECLARATIONS", {"guangya": (str(self.root),)}), \
- patch.object(web_resource_sync, "source_is_online", return_value=True), \
- patch.object(web_resource_sync, "vanished_asset_rows", return_value=[]), \
- patch.object(web_resource_sync, "_keeps_records", return_value=set()), \
- patch.object(web_resource_sync, "_empty_directories") as empty:
- result = web_resource_sync._scan_sources(contract)
- self.assertEqual(result["empty_dirs"], {"guangya": []})
- self.assertEqual(result["sources"][0]["empty"], 0)
- empty.assert_not_called()
+ for location in MOUNTED_SOURCES:
+ with self.subTest(location=location):
+ media = self.root / "film.mp4"
+ media.write_bytes(b"media")
+ connection.execute("INSERT OR REPLACE INTO asset(id,location,path,name,medium) "
+ "VALUES(1,?,?,'film.mp4','video')", (location, str(media)))
+ with patch.object(web_batch.os, "rename", side_effect=PermissionError("写入权限不足")):
+ result = web_batch.purge_assets(connection,
+ connection.execute("SELECT id,location,path,snapshot_path FROM asset").fetchall())
+ self.assertEqual(result["purged"], 0)
+ self.assertIn("写入权限不足", result["blocked"][0]["reason"])
+ self.assertEqual(media.read_bytes(), b"media")
+ self.assertEqual(connection.execute("SELECT count(*) FROM asset").fetchone()[0], 1)
- def test_resource_apply_rejects_read_only_directories_in_a_saved_scan(self):
- contract = Mock()
- scan = {"vanished_ids": [], "empty_dirs": {"guangya": [str(self.root / "empty")]},
- "result": {"sources": []}}
- with patch.object(web_resource_sync, "configured_resource_locations", return_value=("guangya",)), \
- patch.object(web_resource_sync, "_completed_scan", return_value=scan), \
- patch.object(web_resource_sync, "_remove_empty_directories") as remove:
- result = web_resource_sync.w_resource_sync_apply(contract,
- {"confirm": True, "scan_id": "scan", "clean_cache": False})
- self.assertEqual(result["dirs_removed"], 0)
- remove.assert_not_called()
+ def test_resource_scan_and_apply_clean_empty_mount_directories(self):
+ contract = WebContract(fresh_ledger(self.root))
+ for location in MOUNTED_SOURCES:
+ with self.subTest(location=location):
+ root = self.root / location
+ empty = root / "empty"
+ empty.mkdir(parents=True)
+ with patch.object(web_resource_sync, "LOCATION_ROOT_DECLARATIONS", {location: (str(root),)}), \
+ patch.object(web_resource_sync, "source_is_online", return_value=True), \
+ patch.object(web_resource_sync, "vanished_asset_rows", return_value=[]), \
+ patch.object(web_resource_sync, "_source_roots", return_value=[root]):
+ scan = web_resource_sync._scan_sources(contract)
+ self.assertEqual(scan["empty_dirs"], {location: [str(empty)]})
+ self.assertEqual(scan["sources"][0]["empty"], 1)
+ state = {**scan, "result": {"sources": scan["sources"]}}
+ with patch.object(web_resource_sync, "_completed_scan", return_value=state):
+ result = web_resource_sync.w_resource_sync_apply(contract,
+ {"confirm": True, "scan_id": "scan", "clean_cache": False})
+ self.assertEqual(result["dirs_removed"], 1)
+ self.assertFalse(empty.exists())
+ with patch.object(web_batch, "LOCATION_ROOT_DECLARATIONS", {location: (str(root),)}), \
+ patch.object(web_batch, "translate_ledger_path", return_value=root), \
+ patch.object(web_batch, "root_online", return_value=True):
+ self.assertEqual(web_batch._online_source_roots(), {location: (root,)})
diff --git a/tests/test_media_sources.py b/tests/test_media_sources.py
index e331391fc..60559ee06 100644
--- a/tests/test_media_sources.py
+++ b/tests/test_media_sources.py
@@ -19,8 +19,8 @@ class MediaSourceCostTests(unittest.TestCase):
"onedrive": ("O:/Public", "O:/Private"), "mounted": ("M:/",)},
media_costs={"g:/movies": "metered", "G:/Movies/Direct": "free", "O:/Public": "free"})
- def test_registry_has_mount_only_read_only_sources_and_proxy_defaults(self):
- self.assertTrue({"onedrive", "guangya", "mounted"}.issubset(media_sources.READ_ONLY_LOCATIONS))
+ def test_registry_has_mount_sources_and_proxy_defaults(self):
+ self.assertTrue({"onedrive", "guangya", "mounted"}.issubset(media_sources.SCANNABLE_LOCATIONS))
self.assertEqual(media_sources.SOURCE_COSTS["guangya"], "free")
self.assertEqual(media_sources.SOURCE_COSTS["115"], "free")
self.assertEqual(media_sources.SOURCE_COSTS["pikpak"], "metered")
@@ -30,9 +30,6 @@ class MediaSourceCostTests(unittest.TestCase):
{"location": "mounted", "path": "M:/", "cost": "metered"}], windows=True)
self.assertEqual(errors, [])
self.assertEqual(set(roots), {"onedrive", "mounted"})
- for location in ("onedrive", "mounted"):
- with self.assertRaisesRegex(ValueError, "只读"):
- media_sources.require_writable_location(location)
def test_minimal_configuration_objects_use_source_defaults(self):
for config in (SimpleNamespace(locations={"115": ("B:/",)}), SimpleNamespace()):
diff --git a/tests/test_scripts.py b/tests/test_scripts.py
index 36dc1ad31..fb949d318 100644
--- a/tests/test_scripts.py
+++ b/tests/test_scripts.py
@@ -531,6 +531,33 @@ class LibraryDirectoryTests(unittest.TestCase):
def setUpClass(cls):
cls.script = load_script('organize_library_dirs')
+ def test_directory_plan_includes_mounted_cloud_sources(self):
+ with tempfile.TemporaryDirectory() as directory:
+ root = Path(directory).resolve()
+ ledger = fresh_ledger(root)
+ locations = ('guangya', 'onedrive', 'mounted')
+ roots = {location: [rf'G:\{location}'] for location in locations}
+ sources = {location: rf'G:\{location}\1pon_092415_001-fhd' for location in locations}
+ with closing(sqlite3.connect(ledger)) as db:
+ for asset_id, location in enumerate(locations, 1):
+ db.execute('INSERT INTO asset(id,location,path,name,medium,code,studio) VALUES(?,?,?,?,?,?,?)',
+ (asset_id, location, sources[location] + r'\film.mp4', 'film.mp4',
+ 'video', '092415-001', '一本道'))
+ db.commit()
+ with mock.patch.object(self.script, 'DATABASE_PATH', ledger), \
+ mock.patch.object(self.script, 'OUT', root), \
+ mock.patch.object(self.script, 'location_roots', return_value=roots), \
+ mock.patch.object(self.script, 'root_online', return_value=True), redirect_stdout(io.StringIO()):
+ self.script.build_plan('rehome', 'mounted')
+ plan = json.loads((root / 'rehome-mounted-manifest.json').read_text(encoding='utf-8'))
+ self.assertEqual({op['source'] for op in plan['operations']}, set(sources.values()))
+
+ def test_template_cli_accepts_mounted_cloud_sources(self):
+ script = load_script('organize_media')
+ for location in ('guangya', 'onedrive', 'mounted'):
+ with self.subTest(location=location):
+ self.assertEqual(script.build_parser().parse_args(['--location', location]).location, location)
+
def test_release_pack_with_unattributed_images(self):
with tempfile.TemporaryDirectory() as directory:
root = Path(directory).resolve()
@@ -1887,10 +1914,14 @@ class OperationalScriptTests(unittest.TestCase):
"/tmp/peach/ABW-234.mp4",
)
- def test_filename_cleanup_ignores_read_only_mounts(self):
- self.assertEqual(self.clean_names.build_plan([
- (1, 'guangya', r'G:\media\abw-0234.mp4', 'abw-0234.mp4', 'ABW-234'),
- ]), [])
+ def test_filename_cleanup_supports_mounted_cloud_sources(self):
+ for location in ('guangya', 'onedrive', 'mounted'):
+ with self.subTest(location=location):
+ plan = self.clean_names.build_plan([
+ (1, location, r'G:\media\abw-0234.mp4', 'abw-0234.mp4', 'ABW-234'),
+ ])
+ self.assertEqual([(row['location'], row['new']) for row in plan],
+ [(location, 'ABW-234.mp4')])
def test_filename_cleanup_apply_renames_files_updates_ledger_and_validates_backup(self):
with tempfile.TemporaryDirectory() as tmp:
diff --git a/tests/test_trash_junk.py b/tests/test_trash_junk.py
index 23085e92f..6de99a542 100644
--- a/tests/test_trash_junk.py
+++ b/tests/test_trash_junk.py
@@ -86,6 +86,16 @@ class TrashJunkTests(unittest.TestCase):
self.assertIsNone(self.disposal(2))
self.assertTrue(self.backup.is_file())
+ def test_mounted_sources_can_be_selected_and_trashed(self):
+ locations = ('guangya', 'onedrive', 'mounted')
+ for asset_id, location in enumerate((*locations, 'online'), 1):
+ self.add(asset_id, location, rf'G:\{location}\tuu26.com.mp4', 'video', 10 * 1024**2, 60)
+ candidates = self.trash_junk.select_candidates(self.db_path, min_score=40)
+ self.assertEqual({row['id'] for row in candidates}, {1, 2, 3})
+ with closing(sqlite3.connect(self.db_path)) as connection:
+ self.assertEqual(self.trash_junk.trash_assets(connection, [1, 2, 3, 4]), 3)
+ self.assertEqual([self.disposal(aid) for aid in (1, 2, 3, 4)], ['trash', 'trash', 'trash', None])
+
def test_apply_without_backup_is_rejected(self):
self.add(1, "115", r"B:\广告\tuu26.com.mp4", "video", 10 * 1024**2, 60)
diff --git a/tests/test_web_media_repair.py b/tests/test_web_media_repair.py
index 636e2b471..25d4c4f7b 100644
--- a/tests/test_web_media_repair.py
+++ b/tests/test_web_media_repair.py
@@ -141,15 +141,19 @@ class MediaRepairRunTests(unittest.TestCase):
self.assertEqual(self.store.repaired[0], 2, "放得最多的那部没排在最前面")
- def test_read_only_mount_never_replaces_the_source_file(self):
- with self.contract.write_transaction() as connection:
- connection.execute("UPDATE asset SET location='guangya' WHERE id=6")
- with mock.patch.object(rm_repair.mp4recover, 'recover') as recover, \
- mock.patch.object(rm_repair.mp4recover, 'replace_original') as replace:
- self.assertFalse(rm_repair._recover(self.contract, 6, 'G:\\media\\cut.mp4',
- (Path('untrunc'), Path('ffmpeg'), Path('ffprobe'))))
- recover.assert_not_called()
- replace.assert_not_called()
+ def test_mounted_cloud_sources_replace_recovered_files(self):
+ for location in ('guangya', 'onedrive', 'mounted'):
+ with self.subTest(location=location):
+ source = self.media / f'{location}.mp4'
+ source.write_bytes(CUT_SHORT)
+ raw = f'B:\\{source.name}'
+ with self.contract.write_transaction() as connection:
+ connection.execute("UPDATE asset SET location=? WHERE id IN (1,2,3,6)", (location,))
+ connection.execute("UPDATE asset SET path=?,name=? WHERE id=6", (raw, source.name))
+ with mock.patch.object(rm_repair.mp4recover, 'recover', self.recover):
+ self.assertTrue(rm_repair._recover(self.contract, 6, raw,
+ (Path('untrunc'), Path('ffmpeg'), Path('ffprobe'))))
+ self.assertEqual(source.read_bytes(), b'repaired')
def test_a_library_has_to_be_named(self):
with self.assertRaisesRegex(ValueError, "先选一个媒体库"):
diff --git a/web/dist/peach-app.js b/web/dist/peach-app.js
index 8b25b660d..7957b6178 100644
--- a/web/dist/peach-app.js
+++ b/web/dist/peach-app.js
@@ -11050,7 +11050,6 @@ var Dt = [
label: "本地磁盘",
default_cost: "free",
cloud: !1,
- read_only: !1,
icon: "hard-drive"
},
{
@@ -11059,7 +11058,6 @@ var Dt = [
label: "CloudDrive · 115",
default_cost: "free",
cloud: !0,
- read_only: !1,
icon: "database"
},
{
@@ -11068,7 +11066,6 @@ var Dt = [
label: "CloudDrive · PikPak",
default_cost: "metered",
cloud: !0,
- read_only: !1,
icon: "database"
},
{
@@ -11077,7 +11074,6 @@ var Dt = [
label: "光鸭云盘",
default_cost: "free",
cloud: !0,
- read_only: !0,
icon: "database"
},
{
@@ -11086,7 +11082,6 @@ var Dt = [
label: "OneDrive",
default_cost: "metered",
cloud: !0,
- read_only: !0,
icon: "database"
},
{
@@ -11095,10 +11090,9 @@ var Dt = [
label: "其他已挂载网盘",
default_cost: "metered",
cloud: !0,
- read_only: !0,
icon: "database"
}
-], Ot = Dt, kt = Dt.map((e) => [e.id, e.label + (e.read_only ? "(只读)" : "")]), At = Dt.map((e) => e.id), jt = Dt.filter((e) => e.cloud).map((e) => e.id), Mt = Object.fromEntries(Dt.map((e) => [e.id, e.name])), Nt = (e) => Dt.find((t) => t.id === e)?.default_cost === "free" ? "free" : "metered", R = (e) => document.querySelector(e), Pt = {
+], Ot = Dt, kt = Dt.map((e) => [e.id, e.label]), At = Dt.map((e) => e.id), jt = Dt.filter((e) => e.cloud).map((e) => e.id), Mt = Object.fromEntries(Dt.map((e) => [e.id, e.name])), Nt = (e) => Dt.find((t) => t.id === e)?.default_cost === "free" ? "free" : "metered", R = (e) => document.querySelector(e), Pt = {
"text-aa": 1.435,
"mark-javdb": 326 / 111
}, z = (e, t = "") => {
@@ -12719,9 +12713,10 @@ function co(e) {
//#region src/ui-kit/media-source-icons.ts
var lo = {
local: "hard-drive",
- guangya: "database",
+ guangya: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAEWUlEQVR42sWXT2hcVRTGf/fNYCZdNNPGTaHaSUXFVQZSLLowoe3GdpEERHFhYqTQRBATcWlpSly56YQu4ipNZivYxCK46Z9EsBGkHdwItdhXrLixzaASo2bucXHve/feNzOagqQXHnPf/XPOd77z3XPfKLwmkxTZit4lkiEiykQK8wA5+5v0c5i5nNj3ZJ03nwPyKpmvEekFpGNZvV6PE58qdT7BEIoLRKqYOo0g6PtOogQEDkDWeS4DVgQ0MVpNqbGNpRSATDCEcLHJYcAAzWz4QHIqZCcdswwloWr7iBpWJzeWlIxTAq4CJSK7MNmQOhXrSGXeWzj205AGAiiLQAAt0JA6HZ09eRRDCKV0UmGoUsq8SzJoKRS7DgFJxpQxmjhRXsRg5pU4AAKIKvL7xmQeGPVWerJIHBACSX9TQw5EAlB75lLnnm1t18NgHqHsAPjGvCj8KHN27rEuONgPnV3w96/wVx3urZrotefMj0n5DABalfME59CjUXwGPGDlEegbgZ5+mtpmHW5fgusz8NtdF30AwKZCa9AKJeNIYERZ4anM0esuwWvzJurttK8+hLUZY1B5gaUpMIHlW+8Wh0YL7O2BU5dhb4lttxc/sEBmnE3lmba6yrf0re1RE7vj7RbOf1iBWhXqdw1D+3rh8DtQLIUgNuvwzXmaUm3T25yCJA3Kgjg+DS+fcXMPYvjkLYhXw1Ql/YHT0H861MXcs7C5bo+2BCzkpg8x3ZpDZTa8cQE6i274XB/8/K0TVt8oPDcI67FxFq9AYQ/sP2zm8wXIdcDWn7D7AOwuGdZsRWzNQFJMegfh1EU3tjoLy+85oR4agVfnzdydFZg/ZuY6izD1PRSKzXbjFageS2tF1FZEIvD0QDj29aKt41bJHV0Z7YiZ31iH7z5rbfdmFRruTsj/q5K7D4TvP9Ys9fZofXkeuntgz5Nw6X1jNDn363FzjbgyAzeqnhCzKXhmAKauuk2LY7C2YAWJExyJ6CyQ5LL5aMvtvVE1YlWZtBIexTAF9zOonyg7tCn1Ht2JohsCPS+Fe3+quas3eRpi6G9o82hpAWCj7t5fGIVdxRCE9mt5ereb0+C3ezWnCS1eXweAmkW4tuj6nUU4fiZTQPCMmijY1wvPj4a14vaKi1pjhScOsG6VAoArlZCFo5NwIgvCA/JUP5z8NLTxxVnn2Hx8uPUND1TbOnB0El45R1N6Ls8aagEeL5kUZY/qgximD3riU5n7Jbz62xeikQXj4GHa/RhmjxgQqkV5F3sSRKfA2hei6pvw+dntO791DSpH4Jc7nuCyAhT3NWTT0Z6BtBiV4MR0ezZuXTPCvb7Q8jpJo/aveNyF9N8AkrarCPvL7lr+o270kK0dD9mUTHAz/C7cwSbUIoRlHlWLWIwoUEGoPwL3McJSpCrUiRjbcfeKKfUxcQSg5lhCMQzEO5D3OophNcdS8O8YQMYpoRkix+j/LkxFDWGZAhVVcSn/Bw2n+w/oK+fWAAAAAElFTkSuQmCC",
115: "data:image/png;base64,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",
- pikpak: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACY0lEQVR4nNWXy2tTQRSHv7m5RUWttqlNW1OairhKNbrU+lhE/AOkdCOIIO7arty0QhSxCIIQ7VJwIfgfCIJdFB+rgC32AVIflD5CbFUsoohJRiZzb5Ne05p4kxv94HCTc+bO+c0MM3eOoICD/TJswAAQBdoBH5UhA8wDo1mIv7ojpuyAsH9EBuQgkmuASXVJI4lN3BXDawIifXIQwQ28RDA0ERfDwpr2cQ9G7iSdhcOGteZeJ1eYKreB5DS1I2oiCJba2hDQVA9tjdDaCHMfICuhMwDJz5D8BMtftK9E2s2NttrJMOxvzSdT1rIb6goW69KIXsjr5/K+nxlIWWKWrOebJIxNFhXgK7r20QjcPL+59PllGH8LarDvU3oWFHU+CDZpK+TKA3j88vd+zGKd93av/y8lrKxao7Ls6bROrrj6EE6E9WzZppZKrJ0y0Hu8RAGhZuhohqk5nShp2Y/0+nZqxPaoFQsr2my2mNDSkBe01w/7AvAu9QcB/nrYs0vboU4qSsNOwCHAoMYY/5WAsckNt1NJ8WKY5TS+fF8/E7f/Lu5aQDrjLu5agOlzF3ct4NYFd3HXAk51uYv/k9vQLPeFr9/h4gh0dcCBNu17vaiP7nt9sGNblQVs3wo9x+DZNCRm9aUyFICebh0rF9PpWP22+QvqC3f2qLZyKda34XTMLsGLGSrO8xndtxMR6ZfqQ+tz7uczRyDor0zyxY/6LlDkoMqYVsUSKvSqho8SVB/JglqCUWqF4ImharVcueQ96j4bN3KFoiDmeXpJTOXO7QJVoyEZ8mgm0rm6sLA4talFef4LaurBZfZxNPMAAAAASUVORK5CYII="
+ pikpak: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACY0lEQVR4nNWXy2tTQRSHv7m5RUWttqlNW1OairhKNbrU+lhE/AOkdCOIIO7arty0QhSxCIIQ7VJwIfgfCIJdFB+rgC32AVIflD5CbFUsoohJRiZzb5Ne05p4kxv94HCTc+bO+c0MM3eOoICD/TJswAAQBdoBH5UhA8wDo1mIv7ojpuyAsH9EBuQgkmuASXVJI4lN3BXDawIifXIQwQ28RDA0ERfDwpr2cQ9G7iSdhcOGteZeJ1eYKreB5DS1I2oiCJba2hDQVA9tjdDaCHMfICuhMwDJz5D8BMtftK9E2s2NttrJMOxvzSdT1rIb6goW69KIXsjr5/K+nxlIWWKWrOebJIxNFhXgK7r20QjcPL+59PllGH8LarDvU3oWFHU+CDZpK+TKA3j88vd+zGKd93av/y8lrKxao7Ls6bROrrj6EE6E9WzZppZKrJ0y0Hu8RAGhZuhohqk5nShp2Y/0+nZqxPaoFQsr2my2mNDSkBe01w/7AvAu9QcB/nrYs0vboU4qSsNOwCHAoMYY/5WAsckNt1NJ8WKY5TS+fF8/E7f/Lu5aQDrjLu5agOlzF3ct4NYFd3HXAk51uYv/k9vQLPeFr9/h4gh0dcCBNu17vaiP7nt9sGNblQVs3wo9x+DZNCRm9aUyFICebh0rF9PpWP22+QvqC3f2qLZyKda34XTMLsGLGSrO8xndtxMR6ZfqQ+tz7uczRyDor0zyxY/6LlDkoMqYVsUSKvSqho8SVB/JglqCUWqF4ImharVcueQ96j4bN3KFoiDmeXpJTOXO7QJVoyEZ8mgm0rm6sLA4talFef4LaurBZfZxNPMAAAAASUVORK5CYII=",
+ onedrive: "data:image/png;base64,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"
}, uo = Object.fromEntries(Ot.map((e) => [e.id, lo[e.id] || e.icon])), fo = "inline-flex items-center justify-center gap-0.5 whitespace-nowrap overflow-hidden font-sans", po = {
medium: "h-9 rounded-2lg p-2 text-body-medium",
small: "h-8 rounded-lg px-2 py-1.5 text-body-medium"
@@ -70294,7 +70289,7 @@ function $Ne() {
children: "挂载帮助"
})] }),
/* @__PURE__ */ (0, C.jsx)(NA, { children: "缓存按所在硬盘和可用内存选起步值,再根据播放表现调整。" }),
- /* @__PURE__ */ (0, C.jsx)(NA, { children: "光鸭云盘需要 CloudDrive2 v1.0.11 或更高版本,文件管理请使用光鸭云盘客户端。" }),
+ /* @__PURE__ */ (0, C.jsx)(NA, { children: "文件操作需要挂载工具和网盘账号授予写入权限。光鸭云盘的上传、建文件夹、改名和移动需要 CloudDrive2 v1.1.0 或更高版本,删除和复制暂不支持。" }),
/* @__PURE__ */ (0, C.jsx)("ul", {
"aria-label": "按缓存所在硬盘分档",
className: "flex flex-col gap-2",
diff --git a/web/dist/peach-pages.js b/web/dist/peach-pages.js
index 9579eda5c..f6a9b46a1 100644
--- a/web/dist/peach-pages.js
+++ b/web/dist/peach-pages.js
@@ -19354,7 +19354,6 @@ var am = [
label: "本地磁盘",
default_cost: "free",
cloud: !1,
- read_only: !1,
icon: "hard-drive"
},
{
@@ -19363,7 +19362,6 @@ var am = [
label: "CloudDrive · 115",
default_cost: "free",
cloud: !0,
- read_only: !1,
icon: "database"
},
{
@@ -19372,7 +19370,6 @@ var am = [
label: "CloudDrive · PikPak",
default_cost: "metered",
cloud: !0,
- read_only: !1,
icon: "database"
},
{
@@ -19381,7 +19378,6 @@ var am = [
label: "光鸭云盘",
default_cost: "free",
cloud: !0,
- read_only: !0,
icon: "database"
},
{
@@ -19390,7 +19386,6 @@ var am = [
label: "OneDrive",
default_cost: "metered",
cloud: !0,
- read_only: !0,
icon: "database"
},
{
@@ -19399,16 +19394,16 @@ var am = [
label: "其他已挂载网盘",
default_cost: "metered",
cloud: !0,
- read_only: !0,
icon: "database"
}
-], om = am, sm = am.map((e) => [e.id, e.label + (e.read_only ? "(只读)" : "")]);
+], om = am, sm = am.map((e) => [e.id, e.label]);
am.map((e) => e.id);
var cm = am.filter((e) => e.cloud).map((e) => e.id), lm = Object.fromEntries(am.map((e) => [e.id, e.name])), um = {
local: "hard-drive",
- guangya: "database",
+ guangya: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAEWUlEQVR42sWXT2hcVRTGf/fNYCZdNNPGTaHaSUXFVQZSLLowoe3GdpEERHFhYqTQRBATcWlpSly56YQu4ipNZivYxCK46Z9EsBGkHdwItdhXrLixzaASo2bucXHve/feNzOagqQXHnPf/XPOd77z3XPfKLwmkxTZit4lkiEiykQK8wA5+5v0c5i5nNj3ZJ03nwPyKpmvEekFpGNZvV6PE58qdT7BEIoLRKqYOo0g6PtOogQEDkDWeS4DVgQ0MVpNqbGNpRSATDCEcLHJYcAAzWz4QHIqZCcdswwloWr7iBpWJzeWlIxTAq4CJSK7MNmQOhXrSGXeWzj205AGAiiLQAAt0JA6HZ09eRRDCKV0UmGoUsq8SzJoKRS7DgFJxpQxmjhRXsRg5pU4AAKIKvL7xmQeGPVWerJIHBACSX9TQw5EAlB75lLnnm1t18NgHqHsAPjGvCj8KHN27rEuONgPnV3w96/wVx3urZrotefMj0n5DABalfME59CjUXwGPGDlEegbgZ5+mtpmHW5fgusz8NtdF30AwKZCa9AKJeNIYERZ4anM0esuwWvzJurttK8+hLUZY1B5gaUpMIHlW+8Wh0YL7O2BU5dhb4lttxc/sEBmnE3lmba6yrf0re1RE7vj7RbOf1iBWhXqdw1D+3rh8DtQLIUgNuvwzXmaUm3T25yCJA3Kgjg+DS+fcXMPYvjkLYhXw1Ql/YHT0H861MXcs7C5bo+2BCzkpg8x3ZpDZTa8cQE6i274XB/8/K0TVt8oPDcI67FxFq9AYQ/sP2zm8wXIdcDWn7D7AOwuGdZsRWzNQFJMegfh1EU3tjoLy+85oR4agVfnzdydFZg/ZuY6izD1PRSKzXbjFageS2tF1FZEIvD0QDj29aKt41bJHV0Z7YiZ31iH7z5rbfdmFRruTsj/q5K7D4TvP9Ys9fZofXkeuntgz5Nw6X1jNDn363FzjbgyAzeqnhCzKXhmAKauuk2LY7C2YAWJExyJ6CyQ5LL5aMvtvVE1YlWZtBIexTAF9zOonyg7tCn1Ht2JohsCPS+Fe3+quas3eRpi6G9o82hpAWCj7t5fGIVdxRCE9mt5ereb0+C3ezWnCS1eXweAmkW4tuj6nUU4fiZTQPCMmijY1wvPj4a14vaKi1pjhScOsG6VAoArlZCFo5NwIgvCA/JUP5z8NLTxxVnn2Hx8uPUND1TbOnB0El45R1N6Ls8aagEeL5kUZY/qgximD3riU5n7Jbz62xeikQXj4GHa/RhmjxgQqkV5F3sSRKfA2hei6pvw+dntO791DSpH4Jc7nuCyAhT3NWTT0Z6BtBiV4MR0ezZuXTPCvb7Q8jpJo/aveNyF9N8AkrarCPvL7lr+o270kK0dD9mUTHAz/C7cwSbUIoRlHlWLWIwoUEGoPwL3McJSpCrUiRjbcfeKKfUxcQSg5lhCMQzEO5D3OophNcdS8O8YQMYpoRkix+j/LkxFDWGZAhVVcSn/Bw2n+w/oK+fWAAAAAElFTkSuQmCC",
115: "data:image/png;base64,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",
- pikpak: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACY0lEQVR4nNWXy2tTQRSHv7m5RUWttqlNW1OairhKNbrU+lhE/AOkdCOIIO7arty0QhSxCIIQ7VJwIfgfCIJdFB+rgC32AVIflD5CbFUsoohJRiZzb5Ne05p4kxv94HCTc+bO+c0MM3eOoICD/TJswAAQBdoBH5UhA8wDo1mIv7ojpuyAsH9EBuQgkmuASXVJI4lN3BXDawIifXIQwQ28RDA0ERfDwpr2cQ9G7iSdhcOGteZeJ1eYKreB5DS1I2oiCJba2hDQVA9tjdDaCHMfICuhMwDJz5D8BMtftK9E2s2NttrJMOxvzSdT1rIb6goW69KIXsjr5/K+nxlIWWKWrOebJIxNFhXgK7r20QjcPL+59PllGH8LarDvU3oWFHU+CDZpK+TKA3j88vd+zGKd93av/y8lrKxao7Ls6bROrrj6EE6E9WzZppZKrJ0y0Hu8RAGhZuhohqk5nShp2Y/0+nZqxPaoFQsr2my2mNDSkBe01w/7AvAu9QcB/nrYs0vboU4qSsNOwCHAoMYY/5WAsckNt1NJ8WKY5TS+fF8/E7f/Lu5aQDrjLu5agOlzF3ct4NYFd3HXAk51uYv/k9vQLPeFr9/h4gh0dcCBNu17vaiP7nt9sGNblQVs3wo9x+DZNCRm9aUyFICebh0rF9PpWP22+QvqC3f2qLZyKda34XTMLsGLGSrO8xndtxMR6ZfqQ+tz7uczRyDor0zyxY/6LlDkoMqYVsUSKvSqho8SVB/JglqCUWqF4ImharVcueQ96j4bN3KFoiDmeXpJTOXO7QJVoyEZ8mgm0rm6sLA4talFef4LaurBZfZxNPMAAAAASUVORK5CYII="
+ pikpak: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACY0lEQVR4nNWXy2tTQRSHv7m5RUWttqlNW1OairhKNbrU+lhE/AOkdCOIIO7arty0QhSxCIIQ7VJwIfgfCIJdFB+rgC32AVIflD5CbFUsoohJRiZzb5Ne05p4kxv94HCTc+bO+c0MM3eOoICD/TJswAAQBdoBH5UhA8wDo1mIv7ojpuyAsH9EBuQgkmuASXVJI4lN3BXDawIifXIQwQ28RDA0ERfDwpr2cQ9G7iSdhcOGteZeJ1eYKreB5DS1I2oiCJba2hDQVA9tjdDaCHMfICuhMwDJz5D8BMtftK9E2s2NttrJMOxvzSdT1rIb6goW69KIXsjr5/K+nxlIWWKWrOebJIxNFhXgK7r20QjcPL+59PllGH8LarDvU3oWFHU+CDZpK+TKA3j88vd+zGKd93av/y8lrKxao7Ls6bROrrj6EE6E9WzZppZKrJ0y0Hu8RAGhZuhohqk5nShp2Y/0+nZqxPaoFQsr2my2mNDSkBe01w/7AvAu9QcB/nrYs0vboU4qSsNOwCHAoMYY/5WAsckNt1NJ8WKY5TS+fF8/E7f/Lu5aQDrjLu5agOlzF3ct4NYFd3HXAk51uYv/k9vQLPeFr9/h4gh0dcCBNu17vaiP7nt9sGNblQVs3wo9x+DZNCRm9aUyFICebh0rF9PpWP22+QvqC3f2qLZyKda34XTMLsGLGSrO8xndtxMR6ZfqQ+tz7uczRyDor0zyxY/6LlDkoMqYVsUSKvSqho8SVB/JglqCUWqF4ImharVcueQ96j4bN3KFoiDmeXpJTOXO7QJVoyEZ8mgm0rm6sLA4talFef4LaurBZfZxNPMAAAAASUVORK5CYII=",
+ onedrive: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAL30lEQVR42u2aa4xd11XHf2ufez2v6/GMY2dix4nHbRw7tI5TmyZgFToKtCKokitoigT9kAopFEFFGqkSAUrDowiJD614SEj5EEG/VUXllQgQLbQVCNqIokoVQmmVKKiNgELcUGfuPXuvtfiw9z73zPUjduxAC3dJW/uc0Zk7Z/3Xf/3XWvsOzG1uc5vb3OY2t7nNbW5z+/9o8r/xR898Kp1txb7fAriABcTFRAKhafwfhkv6x39/YvSv/2cAuO9J3z92e1cc2E+qcDQFRwNYY1gAGkcChMYhgDQOyLPi/tTyYPArnz2x8MVvSwDuf9L3fyPZB2LgvSpOCpCCowLWOCaONo402WkJEIJDAxKcEEDEIfEUxgc+f3r0Z982ANz3CX+oEf/lFnZHcRIQmwyCBScVELxxJDgyyE5Lk0GQUAABwPKLTvyJke7+iU+dka9+ywJw/5O+P415DOfsRCCKE4EY8m6hx4QGpLEc7WaaCtJAECeII5JZIBgAnnheUvPg586s/Om3HAD3P+n7mwl/m+C21iAaRIGJOFGK00BqsgZ4yfnQGDQZhBp5AgxwRAzBwcm7OO42aV5s3vt3b1l97FrfeXAtv7z5I184mybtXTHGtYWF8Eb5z8mpZrSwlAzcQB1UwUSw4JjJFATL6AfAEYJkB90F3AkGLpLLhIBgeOYA4izYUvqtu//iha9/7q3rn/gfZcDr3/P0Vrvd/kxs49tTG9E2kdrI6fvuYOPIPsYKrcHYYKIwcUgCLZDEu+hbcJpmmvcEp6l6UGkvjpDpL57dF3EcA3FwWraHP/rUD+z+g1edAXc99PxmGp9/PLZxS9XwskyV4/dscui12Xl1SJojnAzUIDrZaYGEYOY0jeA4UiIuQTCdpkEXHvfMBBwozgP5R7bLPf4u8IoBCFfy0KmHn3tA4/YzqrplxWlVRdVYWVvk+OmDRKVbybPjavk6ASlBVMETeBIsgUTBk+MRPDqSBItAufeJl+ctP9M6HgWiY9GxCI7uO/Hx/3jiVQPg1MPPfTi1+rgmRZNiKWFJu3X6rcew0GTBU4gJ2lSA0KwBqmAKnkCTgIJEsOhQQCDle0ngE6AtDreOTwogKe/WgrfgEayFZpf+4Os+9uKbrnsKnHr4Xx5NMT2kMdGtpGjK+8Hb97N6w4hxglaL4zZlQSwMUPLPTMg3ASxkGps6TdEECY4nx7w0QFKoXkpiTQME3Ot9ThPS5HeAk9dNBE89/NwDqdXHNSZScT61CY2R1CaaAdz7rruxpmGSyEszEBOF1qdlMBUg3PILh07ocimQxgjBaapDQQl4LgBiU/HbJcRRwIZCGoVcEsWRVmlaVxo5+/T37nnimgG466HnNy1ufyHFtKYxRzw7n0gxK//xrds5dPsG0XLkdzhveSUvouiQ3EvAHHHPJTA4BMtgBCO4IyEr/hQgx3Y3pBuHxJUGD56X5J6A4ITGGTS5irjxtVab33j2+PJHXrEGxPH5R+MkrqU2kmIktTFHvji/sm+FA0c3mCiMe863Wmjfy301SOqIgpgjmlHxZFhrOd/HuW7aWLGxYxPDJoZHJx1aIt6yTFoa4A5mZTkognnuFays0HBwZSl9+NhXXvzy4S+fv++qGfD69zy9Fdv0V1pErsv7mgYx8YYfOs3u/atoiXasANT8L12gaol86eRwz2Wt7GK9Oi+KeE4HdyesNsjRZXShQcVzIyV5UVkQcq/QlOg3hQ1NGaoEJufHwwefObb0+1csgu1LkwdUFU2l3M0AcPCuwyztXWWSprU+zjifDDSBVmcB8RI29253c0yNxi3X+CJ0zXpgeHyFtgkZM8lR93p+UD4GL52kg5nkaJaOEoQQfGG01P7ekX/e9meOLX30ygCI8WwucZYZkCoASjMUDty5Sau9Gm895S+1XxXMHbMaecsCWJx3s5IOmc+mhRFiNHsDiydHpOK8Ghi5glhxFMkfa5BHZ8tOm+QHpbTM7oIHWNqVHtv8p/G/PXvH4p9fFoDNd3x+K43jmqlianRpkBIalcNvvhMLTaZ26fVrxCsYSXPkO+etPFgTWJ1gjpti5ohqBsCMZhcsn9iND0J21ovzLtNr8XyIUhAwkTw8dYhkyriDhPxnRVgYDNJvAscuK4Jtm7ZSG0mT3ir3owPr7DlyICt8EbtYrqvjnfNaXqgIXq7Tlmt8SSdvDW8TNlG8VaxVll63Qlgdds5Xn1JpsWt36SYkLcJXRdEENcE07911WUG4/dCXxj99WQakNm5qUlwN1ZoCiptx8Lu/IzczpbGpL5WqIpd7M3bkuVh+c1PLlI+V9oZnlcTVWLh5yOJrl0hd1NnJAhNUsg6YFRaY9JTcqwDkHsKliORUG4Zi7wd++5IMGO4dnUiTSJxE0qQltRE3Y+P0bTRroxzxWaX3aTpY763FnGB1IMjC4Mnw0k57zJHXmAiNsX5mT3aUndGv9xXoVKNvsiPyeYF6ibpNo1+vHW7d+OLkxCUBWLp5Yzu1mfamuQNbXF/mhpO35T6/p/qxl/dqWfTEneBO8BxlT1URM1peBgSfGD5J3Qct3znClwc7I06vaFBZJ5l5VgGYgtAtFdTzdQUg9XYxfuySACwc2L96wxuOTu/Xljl473eSpEHNy0Q3zXfX3OR4ysIm6rj6VCBUy6BTqJ4SFhVXxZOirSLBGN2x0jmts9TvpUMqDKiptiPy/Yj3Iz+z3LnlkhrgItujY69h9fhrsrKWipqid9N4fUEtNA21wdGS70WVxLw4bx31iRmM2gWaKnvfsh8fNt1nzgKhfiEIoevfSt57J/54KGcl3SCV9+lvyPFLAiDOE2Z2twbp+nb3DIJJPuaqL9edURj5tKbU90x9R1JWTFfFa+ub8rWWfrnZHVg6OppqyGWiX++dUglKqXMvDZI7Ich0rwDQ2ylHzJdshIRPJvVfysdPUp6u0S/1uNdDS2ly8EL/Uu5ELQtipX6sjZV1OWSq7Nu6EdNpb2/9qPvMz8t1NaueBceLw15HbIHQj/7Ohv/SAHzpfcO/ue1D2980kVH2DlQyG6yjXBYOoUMFJ+e+mGUNKEXbk2OqeOdlLn+WjMVDCyzcskKK03ZBZ5y/GBCznjhCCNM2WQoILl1V7FIBwE0+fdlWOLl90k3OulNg7P1V6VXckiL9eu/JwUtnp9MSWFPAUzlLNGPvvQfQeBHq9523HiPs4sOM1zMWkY4BlQVysTSw8JXLAjAc2iOTl+Ssi2SnKnouID4VE+eCwUaKc7W5ccszgJdGyC0/t+e79iGLA1KaOthh5jPOXyL6s9alpshF6d/tA/7yZQ9Ebv3g+T9xs7d1LdTMVukv3i/UiueWLQteYYAnRaOXBkhpRg03veNwd1DSHZjYzuvovRnjCgC46Kxf1V+69/5Meqe8+WXPBIcj+/H2BXvGYXkHfJUMdebwPM/XMLrV4/J8b2ln5N1g/U03llF5GuHZ6z4DZsXvasx3JjA4H7ziM8HDv/hfPxwn6eNS4KuFIXQlM0deyFG30giZaQEgA2Epa4InY/XkGit3rO8QvB1TZe++32m+Qv9n7dO8W7au6puhm3/h3CO2rb/WTwWRWv58WgatnNJqzf06AOWx19XYtW+B9e85uDPnZ6jfP2Pog3Ed7BsM2OTdcu6qvxq7+WfP/byO4696EZjy/WRHsGCemxGtYpjTAM2nPWbOrj1D9p65CRtMO74+3S/GgrpfF+cbtnhQ/vEVfzd468+d+772m/Fjbra3+6V61GW5AfKy14R2Myw5u9Z2sX7PBtY0OxqdPgizAFQmmF8H5wNb/NTFnb+qL0cPf+jfD0xekF/3l9I73XyRrgvMYEzPAUrumzNcHbL3jTfhPeeNndHvpmW/cL9G+yPgAd53Ie2v6dvhw4+eO9Weiw+mcXq7tWmjdoOUbtDdkUZYvnUPK0fWulbBekPNLAAXsMCu2fGP8H7561f9HyQ2H/n6PZOxnrSJv01dgyBhsDxYWdwYHQnLC0ojLyAyrpOjWk6cVHXSp31TaRhJhvvVAVAdfZZF/vDlIj63uc1tbnOb29zmNre5zW1ucwP+G1ME77lSc/kUAAAAAElFTkSuQmCC"
}, dm = Object.fromEntries(om.map((e) => [e.id, um[e.id] || e.icon])), fm = bt({
base: [
"inline-flex items-center justify-center gap-1 whitespace-nowrap",