Peach: Local-first video metadata scraper and media manager.
fix(downloads): 清理乱码 tracker、细分网盘未收下的任务,换磁力查完所有来源
longmeidao80e8dfa75877
diff --git a/docs/CLOUDDRIVE.md b/docs/CLOUDDRIVE.mdindex c604d623e..2ab9342e7 100644--- a/docs/CLOUDDRIVE.md+++ b/docs/CLOUDDRIVE.md@@ -145,6 +145,8 @@ Peach 不实时监视网盘目录,因为每列一次目录都是一次网络- 115 每提交一次扣一条离线配额,年费会员每月 1500 条、月费 200 条,重新提交也算。- 115 判为违规的资源(错误码 50038)不重试,以后再贴同一个磁力会直接拒绝。+- 提交前丢掉解不开或不像地址的 tracker,其余参数原样保留。资源站给出的磁力偶尔带乱码 tracker,115 对这种磁力报 10004「错误的链接」,有时不报错也不建任务。+- 提交后 15 分钟内离线列表一直看不到这个任务、目标目录里也没有文件,报「网盘没有收下任务」;列表里出现过、后来不见了,报「网盘任务被删除」。两种都算网盘问题,可以原样重新提交。- PikPak 免费与会员账号的离线任务上限:未取得。- 接口失效时任务报错,复制磁力到网盘客户端里手动添加即可。diff --git a/docs/JAV_BROWSER.md b/docs/JAV_BROWSER.mdindex 704c975fc..6258df069 100644--- a/docs/JAV_BROWSER.md+++ b/docs/JAV_BROWSER.md@@ -34,7 +34,7 @@ Peach 配置页通过同源桥接页检测脚本版本和是否已为当前地2. 脚本用整体进度显示排队、搜索、下载、入库与整理五个阶段,完成阶段打勾、当前阶段高亮,并显示提交网盘、文件可访问等具体状态。网盘百分比仅属于下载阶段,其他阶段按真实状态推进。馆藏已有的影片显示「馆藏已有该番号影片」,按钮显示「已有该影片」。同一番号的进行中任务会复用。3. 云下载提交后,在 Peach 任务中心查看下载与入库后整理进度。-搜索期间可以关闭源站页面,队列由 Peach 保存;Peach 重启后继续尚未完成的搜索。提交后脚本自动刷新状态,最长一小时。失败时区分原因:磁力问题(网盘拒绝、链接无效、没有下载源、内容不符)可点击「换一个磁力」,Peach 跳过已失败的磁力,取搜索结果里的下一个;网盘问题(配置或登录、额度、网络、文件未落地)需要先在 Peach 检查网盘,再点击「重试加入 Peach 馆藏」,重试仍使用原来的磁力。没有可换的磁力时显示未找到资源。网络超时只提供状态查询,确认服务器结果后再决定是否重试。+搜索期间可以关闭源站页面,队列由 Peach 保存;Peach 重启后继续尚未完成的搜索。提交后脚本自动刷新状态,最长一小时。失败时区分原因:磁力问题(网盘拒绝、链接无效、没有下载源、内容不符)可点击「换一个磁力」,Peach 跳过已失败的磁力,查完所有来源后取下一个,不在第一条高清结果处提前结束;网盘问题(配置或登录、额度、网络、文件未落地)需要先在 Peach 检查网盘,再点击「重试加入 Peach 馆藏」,重试仍使用原来的磁力。没有可换的磁力时显示未找到资源。网络超时只提供状态查询,确认服务器结果后再决定是否重试。浮卡标题栏可折叠详情,也可收起为右下角的 Peach 标志小球。点击小球展开并查询现有任务,不会再次添加。设置面板打开时隐藏浮卡,关闭后恢复;开关过渡遵循系统的减少动效偏好。diff --git a/docs/REUSE.md b/docs/REUSE.mdindex 4e24eb826..e05e60e6b 100644--- a/docs/REUSE.md+++ b/docs/REUSE.md@@ -12,7 +12,7 @@ YuNet 与 SFace 沿用既有模型哈希校验,Python 读取模型字节后交## 浏览器添加的本地人物资料-`/api/jav-browser/people` 复用现有专用令牌与浏览器权限检查、规范实体关联和男优排除判据。人物名只读本地账本与发现资料快照;查询单个番号时还可带上详情页的出演者名字,按既有 `resolve_entity` 先规范名后唯一别名匹配,括号里的别名一并尝试,未匹配的只返回名字。头像通过既有 `PreviewService.entity_image` 查找已安装文件;已有 Pillow 将其在内存缩为 64px JPEG,不落新头像、不抓外站。未初始化发现资料服务时直接读取快照,避免初始化恢复外站任务。缺头像省略图片字段,缺人物信息返回空数组,接口失败与正常缺失分别反馈。用户脚本显示灰底首字母,不显示作品封面,无新增依赖。+`/api/jav-browser/people` 复用现有专用令牌与浏览器权限检查、规范实体关联和男优排除判据。人物名只读本地账本与发现资料快照;查询单个番号时还可带上详情页的出演者名字,按既有 `resolve_entity` 先规范名后唯一别名匹配,括号里的别名一并尝试,未匹配的只返回名字。头像通过既有 `PreviewService.entity_image` 查找已安装文件,按 `avatar_focus` 的人脸记录沿用 `frontend/src/card-art/face-frame.ts` 的放大与夹持判据取景;已有 Pillow 将其在内存缩为 64px JPEG,不落新头像、不抓外站。未初始化发现资料服务时直接读取快照,避免初始化恢复外站任务。缺头像省略图片字段,缺人物信息返回空数组,接口失败与正常缺失分别反馈。用户脚本显示灰底首字母,不显示作品封面,无新增依赖。## README Star 图@@ -297,7 +297,7 @@ Windows 复用 FFmpeg 的 D3D11VA 解码与 `h264_amf`、`h264_qsv` 编码,沿用户脚本由 [peach-mitao/peach-userscript](https://github.com/peach-mitao/peach-userscript)(AGPL-3.0-or-later)独立维护,使用 [Tampermonkey 官方 GM API](https://www.tampermonkey.net/documentation.php) 的本机存储、菜单与 `GM_xmlhttpRequest`;SPA 通知依据 `window.onurlchange` 契约。上游使用 Node.js 24 LTS 内置模块确定性构建,运行时零依赖。Peach 的 `web/integrations/` 消费同一发布的完整安装脚本与站点快照,固定版本、上游提交与 SHA256 见 `jav-userscript-release.json`。安装端点直接返回制品,后端独立校验已登记域名与作品参数;上游导出工具在隔离工作树同步这两份制品和来源记录。Sleazy 热门脚本只提供显式域名与镜像发现证据,不复制其实现或执行第三方代码。宿主扩展由用户安装,兼容性以实际浏览器及脚本管理器授权为准;模拟 GM API 的真实 Chromium 页面完成回归,DMM 与 MGS 实页通过隔离只读 GM 适配核验番号、页面浮层与设置窗口。真实扩展、Peach 与网盘联合下载验收未取得。-Peach 保留页面粗提取与身份冲突提示,服务端复用 `catalog_rules` 的唯一番号规则、`feeds.scan_code`、`web_resource_search.q_resource_search` 的来源顺序与质量排序、`submit_offline_download` 的 infohash 幂等、现有云下载落地与后处理。浏览器添加在共享提交锁内按番号接管已有任务,覆盖其他入口同时提交不同磁力的情况。失败原因直接复用下载任务的 `FAILURE_KINDS` 分为磁力与网盘两类;换磁力把失败任务的 infohash 记入该番号的跳过名单,候选挑选沿用同一份搜索结果与番号判据。专用令牌经 `CredentialStore` 仅保存 SHA-256 摘要,不声明跨机同步字段。队列用已有 `atomic_write_text` 保存本机运行状态,关闭功能会撤销令牌并停止尚未提交的添加。+Peach 保留页面粗提取与身份冲突提示,服务端复用 `catalog_rules` 的唯一番号规则、`feeds.scan_code`、`web_resource_search.q_resource_search` 的来源顺序与质量排序、`submit_offline_download` 的 infohash 幂等、现有云下载落地与后处理。浏览器添加在共享提交锁内按番号接管已有任务,覆盖其他入口同时提交不同磁力的情况。失败原因直接复用下载任务的 `FAILURE_KINDS` 分为磁力与网盘两类;换磁力把失败任务的 infohash 记入该番号的跳过名单,带名单的搜索不在 manko.fun 高清命中处短路,并在直连与索引器结果中一并排除;候选挑选沿用同一番号判据。专用令牌经 `CredentialStore` 仅保存 SHA-256 摘要,不声明跨机同步字段。队列用已有 `atomic_write_text` 保存本机运行状态,关闭功能会撤销令牌并停止尚未提交的添加。DMM / MGS 的只读商品号识别复用 `sources.dmm` 的 CID 结构与 `catalog_rules.release_code_from_product`。浏览器提交净化后的详情地址及可选厂家番号;DMM 的目录数字头按来源解释,MGS 保留三位发行前缀,尾字母和日期分隔符保留为身份。`release_code_from_text` 继续处理普通文件名的字幕与画质标记,不用文件名噪声规则改写明确商品身份。资源名称的完整商品号匹配复用同一编目模式,元数据身份校验与 DMM 搜索核对尾字母。运行时不新增 HTTP 请求或依赖;已有 DMM/OpenAver 取证与来源协议足以覆盖转换,不引入第二套外部番号库。完整脚本连接临时账本的真实识别接口,联合验证 DMM/MGS 桌面与手机场景;保留基于模拟响应的跨站交互回归。diff --git a/src/peach/downloads.py b/src/peach/downloads.pyindex 4632a5dad..077937c43 100644--- a/src/peach/downloads.py+++ b/src/peach/downloads.py@@ -32,7 +32,7 @@ from dataclasses import dataclass, fieldfrom datetime import datetime, timezonefrom pathlib import Path, PureWindowsPathfrom typing import Callable, Protocol-from urllib.parse import parse_qs, urlsplit+from urllib.parse import parse_qs, unquote, urlsplitfrom .follow_secrets import CredentialStorefrom .fsutil import atomic_write_text@@ -90,6 +90,8 @@ FAILURE_KINDS: dict[str, FailureKind] = {kind.key: kind for kind in (FailureKind("rejected", "网盘拒绝下载该资源"),FailureKind("invalid_link", "链接无效"),FailureKind("no_source", "没有可用下载源或进度长时间未更新"),+ FailureKind("not_accepted", "网盘没有收下任务"),+ FailureKind("removed", "网盘任务被删除"),FailureKind("duplicate", "下载任务已存在"),FailureKind("not_landed", "目标目录中未找到下载文件"),FailureKind("mismatch", "下载内容与目标作品不符"),@@ -97,6 +99,11 @@ FAILURE_KINDS: dict[str, FailureKind] = {kind.key: kind for kind in ()}+def never_seen(task: "DownloadTask") -> bool:+ """提交后从没在网盘离线列表里见过:没有远端编号,也没读到过进度。名字不算,提交时就取自磁力。"""+ return task.progress is None and not task.remote_id++class DownloadError(RuntimeError):"""一次远端操作失败。`detail` 是给用户看的中文原因,不含凭据。@@ -164,6 +171,33 @@ def normalise_info_hash(raw: str) -> str:raise ValueError("磁力链接里的 infohash 不是 40 位十六进制或 32 位 base32")+_TRACKER = re.compile(r"^(?:udp|https?|wss?)://[A-Za-z0-9.\-]+(?::\d{1,5})?(?:/[!-~]*)?$")+++def clean_magnet(text: str) -> str:+ """去掉无法解析的 tracker 参数,其余原样保留。++ 有的来源给出的磁力里夹着一段打乱的 tracker(`exoduecnuonnaF2%9696A3%moc.cnysed.s`,+ 倒过来是 `exodus.desync.com`),115 开放平台把整条链接判为「错误的链接」(10004),+ 有时还不报错、只是不建任务。2026-10-28 对照实验:同一个 DASD-911 磁力原样提交被拒,+ 只去掉这一段后五秒内就出现在离线列表里。+ """+ split = urlsplit(text)+ kept = []+ for part in split.query.split("&"):+ key, _, value = part.partition("=")+ if key == "tr":+ try:+ decoded = unquote(value, errors="strict")+ except UnicodeDecodeError:+ continue+ if not _TRACKER.match(decoded):+ continue+ if part:+ kept.append(part)+ return f"{split.scheme}:?{'&'.join(kept)}"++def parse_magnet(raw: str) -> Magnet:"""解析用户粘贴的磁力,或一个裸 infohash。只认 `urn:btih`,v2 的 `btmh` 不在幂等键口径内。"""text = str(raw or "").strip()@@ -177,7 +211,7 @@ def parse_magnet(raw: str) -> Magnet:if value.casefold().startswith("urn:btih:"):info_hash = normalise_info_hash(value[len("urn:btih:"):])name = (query.get("dn") or [""])[0].strip()- return Magnet(info_hash, text, name[:300])+ return Magnet(info_hash, clean_magnet(text), name[:300])raise ValueError("磁力链接里没有 urn:btih,Peach 只接受 BitTorrent 磁力")@@ -245,6 +279,9 @@ LANDING_GRACE = 60.0LANDING_TIMEOUT = 6 * 3600.0#: 远端列表里找不到任务时,提交后这么久之内当作列表还没刷新,不判失败。MISSING_GRACE = 180.0+#: 提交后从没在离线列表里出现过的任务多等一会儿:批量提交时 CloudDrive2 与 115 登记慢,+#: 2026-10-16 一批 83 个提交里 25 个三到十分钟内被判失败,期间同一接口超时 17 次。+UNSEEN_GRACE = 900.0DEFAULT_WAIT_HOURS = 168MAX_WAIT_HOURS = 24 * 60#: 已落地的目录最多登记这么多个文件;种子里成千上万个小文件交给全量扫描。@@ -902,10 +939,15 @@ class DownloadService:if status.state == MISSING:if not provider.landed(task):started = parse_iso(task.submitted_at) or now- if now - started < MISSING_GRACE:+ # 磁力本身失败时 115 会把任务留在列表里标为离线失败;从没出现过说明网盘没有收下,+ # 出现过又不见了说明任务在网盘一侧被删除或清理,两种都不是换磁力能解决的。+ unseen = never_seen(task)+ if now - started < (UNSEEN_GRACE if unseen else MISSING_GRACE):self._reschedule(task, now)return- raise DownloadError("no_source", "远端任务列表里找不到这个任务,目标目录里也没有文件")+ if unseen:+ raise DownloadError("not_accepted", "网盘没有收下这个任务:提交后离线列表里始终没有它,目标目录里也没有文件")+ raise DownloadError("removed", "网盘里的这个任务不见了:离线列表里找不到它,目标目录里也没有文件")task.remote_name = status.name or task.remote_nametask.remote_id = status.remote_id or task.remote_idtask.state = REMOTE_DONEdiff --git a/src/peach/jav_browser.py b/src/peach/jav_browser.pyindex 15e3f0d22..8d44c0e97 100644--- a/src/peach/jav_browser.py+++ b/src/peach/jav_browser.py@@ -17,7 +17,7 @@ from .catalog_rules import is_jav_code, normalise_code_key, release_code_from_prfrom .config import PROJECT_ROOTfrom .downloads import (CLOUDDRIVE_CREDENTIAL, INGESTED, POSTPROCESS_LABELS, REMOTE_RUNNING, RESUBMITTABLE_STATES,- STATE_LABELS, submit_offline_download, parse_magnet,+ STATE_LABELS, never_seen, submit_offline_download, parse_magnet,)from .follow_secrets import CredentialErrorfrom .feeds import scan_code@@ -34,8 +34,10 @@ MESSAGES = {}#: 下载失败按原因分给用户脚本:磁力本身的问题换一个磁力,网盘一侧的问题修好后重试同一个磁力。MAGNET_FAILURES = frozenset({"rejected", "invalid_link", "no_source", "mismatch"})-CLOUD_FAILURES = frozenset({"config", "quota", "network", "not_landed", "duplicate"})+CLOUD_FAILURES = frozenset({"config", "quota", "network", "not_landed", "duplicate", "not_accepted", "removed"})NO_OTHER_MAGNET = "没有其他可用磁力,可在 Peach 手动选择资源"+#: 细分之前「列表里找不到」统一记为 no_source 的原文;这些旧任务从没被网盘列出过,按网盘问题处理。+LEGACY_MISSING = "远端任务列表里找不到这个任务"@lru_cache(maxsize=1)@@ -260,8 +262,12 @@ class JavBrowser:row.update(state=state, message=task.failure_detail or MESSAGES[state])if state == "failed":detail["failure"] = task.failure or ""- detail["cause"] = ("magnet" if task.blocked_at or task.failure in MAGNET_FAILURES- else "cloud" if task.failure in CLOUD_FAILURES else "")+ # 旧任务把「列表里找不到」记成 no_source;从没被网盘列出过的按网盘问题处理。+ legacy_unseen = (task.failure == "no_source" and never_seen(task)+ and (task.failure_detail or "").startswith(LEGACY_MISSING))+ detail["cause"] = ("magnet" if task.blocked_at+ else "cloud" if legacy_unseen or task.failure in CLOUD_FAILURES+ else "magnet" if task.failure in MAGNET_FAILURES else "")if task.asset_id:row["asset_id"] = task.asset_idprogress = task.progress@@ -332,7 +338,8 @@ class JavBrowser:provider = row["provider"]try:self._ready(provider)- result = self.search(self.contract, {"code": code, "goal": "quality"})+ skip = list(row.get("skip", ()))+ result = self.search(self.contract, {"code": code, "goal": "quality", **({"skip": skip} if skip else {})})candidate = _download_candidate(result.get("items", ()), code, frozenset(row.get("skip", ())))should_submit = Falsewith self._lock:diff --git a/src/peach/web_jav_browser_people.py b/src/peach/web_jav_browser_people.pyindex 891053e9f..9f7d7d590 100644--- a/src/peach/web_jav_browser_people.py+++ b/src/peach/web_jav_browser_people.py@@ -1,4 +1,4 @@-"""用户脚本的人物补充:只读馆藏、元数据快照、详情页出演者与已安装头像。"""+"""用户脚本的人物补充:只读馆藏、元数据快照、详情页出演者与已安装头像,头像按人脸记录取景。"""from __future__ import annotationsimport base64@@ -33,6 +33,44 @@ def _snapshots(contract, codes):raise ValueError('本地人物快照未取得') from error+#: 用户脚本的人物头像是 24 CSS px 圆框,返回 64 px 图;取景沿用 `frontend/src/card-art/face-frame.ts`。+FRAME_PX, OUTPUT_PX = 24, 64+FACE_TARGET, MIN_FACE_PX, FACE_CEILING = 0.32, 13, 0.6+++def _face_zoom(box: dict) -> float:+ """与页面 `faceZoom` 同一判据:脸要够大、要摆正,不超过构图上限,也不上采样。"""+ base = max(FRAME_PX / box['imgW'], FRAME_PX / box['imgH'])+ shown = box['faceW'] * base+ if shown <= 0:+ return 1.0+ wanted = max(FACE_TARGET, MIN_FACE_PX / FRAME_PX) * FRAME_PX / shown+ edges = (min(box['cx'], 1 - box['cx']) * box['imgW'], min(box['cy'], 1 - box['cy']) * box['imgH'])+ centred = max(FRAME_PX / (2 * edge * base) if edge > 0 else float('inf') for edge in edges)+ lossless = box['faceW'] / (shown * OUTPUT_PX / FRAME_PX)+ return max(1.0, min(max(wanted, min(centred, FACE_CEILING * FRAME_PX / shown)), lossless))+++def _framed(original: Image.Image, focus: dict | None) -> Image.Image:+ """按实体图的人脸记录裁出圆头像:有脸框时脸心对准框心再放大,只有取景轴时按 object-position 平移。++ 记录的源图尺寸与文件对不上时退回几何居中,与页面核对 `naturalWidth` 的做法一致。+ """+ image = original.convert('RGB')+ box = (focus or {}).get('box')+ if box and (box['imgW'], box['imgH']) == image.size:+ zoom = _face_zoom(box)+ if zoom > 1:+ side = FRAME_PX / (max(FRAME_PX / box['imgW'], FRAME_PX / box['imgH']) * zoom)+ left = min(max(0.0, box['cx'] * box['imgW'] - side / 2), box['imgW'] - side)+ top = min(max(0.0, box['cy'] * box['imgH'] - side / 2), box['imgH'] - side)+ return image.resize((OUTPUT_PX, OUTPUT_PX), Image.LANCZOS, box=(left, top, left + side, top + side))+ centering = [0.5, 0.5]+ if focus and focus.get('axis') in {'x', 'y'}:+ centering[0 if focus['axis'] == 'x' else 1] = focus['pct'] / 100+ return ImageOps.fit(image, (OUTPUT_PX, OUTPUT_PX), centering=tuple(centering))++def _page_names(performers) -> list[str]:"""详情页出演者原文:去掉 ♀ 标记,男演员(♂)不参与;只在查询单个番号时使用。"""names = [str(name).strip() for name in performers or ()]@@ -93,7 +131,7 @@ def cached_people(contract, preview, value: str, performers=()) -> dict:try:path, _ = preview.entity_image('performer', entity_id)with Image.open(path) as original:- image = ImageOps.fit(original.convert('RGB'), (64, 64))+ image = _framed(original, contract.avatar_focus('performer', entity_id))output = io.BytesIO()image.save(output, format='JPEG', quality=75)avatars[entity_id] = 'data:image/jpeg;base64,' + base64.b64encode(output.getvalue()).decode('ascii')diff --git a/src/peach/web_resource_search.py b/src/peach/web_resource_search.pyindex 7e80354f0..80212139d 100644--- a/src/peach/web_resource_search.py+++ b/src/peach/web_resource_search.py@@ -18,16 +18,20 @@ def q_resource_search(contract, args) -> dict:with contract.database.read_connection() as connection:blocked = [row[0] for row in connection.execute("SELECT info_hash FROM download_task WHERE blocked_at IS NOT NULL")]+ # 浏览器添加换磁力时传入已失败的 infohash:它们和违规拦截一样不再作为候选,+ # 而且不能在 manko.fun 那一步短路——被跳过的往往正是那条高清结果,短路会让其他来源一条都不查。+ skip = [str(value) for value in args.get("skip") or () if isinstance(args.get("skip"), (list, tuple))]+ excluded = set(blocked) | set(skip)code = str(args.get("code") or "")direct = direct_search(contract.follow_secrets_root, code, min_size=filters.min_size,- max_size=filters.max_size, goal=filters.goal)- direct["items"] = [row for row in direct["items"] if row["info_hash"] not in set(blocked)]+ max_size=filters.max_size, goal=filters.goal, stop_on_preferred=not skip)+ direct["items"] = [row for row in direct["items"] if row["info_hash"] not in excluded]# manko.fun 给出高清候选时按用户指定的优先级短路,不再消耗后备索引器请求。- if direct["items"] and direct["items"][0]["source"] == "manko.fun" \+ if not skip and direct["items"] and direct["items"][0]["source"] == "manko.fun" \and direct["items"][0]["resolution"] >= HIGH_QUALITY:return {"ok": True, "state": "ready", **direct}- indexed = _SEARCH.run(Indexers(service.credentials).load(), code, filters, blocked)+ indexed = _SEARCH.run(Indexers(service.credentials).load(), code, filters, sorted(excluded))combined = list(direct["items"])for row in indexed.get("items", ()):combined.append({diff --git a/tests/test_downloads.py b/tests/test_downloads.pyindex dc0955eaa..7051c9fed 100644--- a/tests/test_downloads.py+++ b/tests/test_downloads.py@@ -88,13 +88,20 @@ class MagnetTests(unittest.TestCase):magnet = dl.parse_magnet(MAGNET)self.assertEqual((magnet.info_hash, magnet.name, magnet.uri), (HASH, "ABC-123", MAGNET))+ def test_scrambled_trackers_are_dropped_before_submission(self):+ # DASD-911 的原始磁力:最后一个 tracker 被打乱,115 因此整条判为「错误的链接」。+ good = "&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce"+ raw = f"magnet:?xt=urn:btih:{HASH}&dn=ABC-123{good}&tr=udp%3A%2F%2FexoduecnuonnaF2%9696A3%moc.cnysed.s"+ self.assertEqual(dl.parse_magnet(raw).uri, f"magnet:?xt=urn:btih:{HASH}&dn=ABC-123{good}")+ self.assertEqual(dl.parse_magnet(MAGNET).uri, MAGNET)+def test_links_without_a_btih_are_refused(self):for bad in ("", "magnet:?dn=x", "magnet:?xt=urn:btmh:1220abcd", "https://example.com/a","abc"):with self.subTest(bad=bad), self.assertRaises(ValueError):dl.parse_magnet(bad)- def test_remote_messages_are_sorted_into_the_nine_kinds(self):+ def test_remote_messages_are_sorted_into_the_eleven_kinds(self):cases = {"errno 50038 涉嫌违规": ("rejected", True),"本月离线配额已用完": ("quota", False),@@ -108,7 +115,7 @@ class MagnetTests(unittest.TestCase):self.assertEqual((error.failure, error.block), (failure, block))self.assertEqual(set(dl.FAILURE_KINDS), {"config", "quota", "rejected", "invalid_link", "no_source", "duplicate",- "not_landed", "mismatch", "network"})+ "not_landed", "mismatch", "network", "not_accepted", "removed"})self.assertEqual([key for key, kind in dl.FAILURE_KINDS.items() if kind.retryable],["network"])@@ -267,13 +274,26 @@ class PollingTests(_Deployment):task = self.service.store.get(task_id)self.assertEqual((task.state, task.failure), (dl.STALLED, "no_source"))- def test_a_task_missing_from_the_list_waits_then_fails(self):+ def test_a_task_the_cloud_never_listed_waits_longer_then_fails_as_not_accepted(self):+ # 真实的 CloudDrive2 提交不回远端编号,编号要等离线列表里看见任务才有。+ self.provider.submit_result = dl.RemoteStatus(dl.RUNNING, name="ABC-123")task_id = self.submit()["task"]["id"]self.provider.statuses = [dl.RemoteStatus(dl.MISSING)]self.tick(10)+ self.tick(dl.MISSING_GRACE)self.assertEqual(self.service.store.get(task_id).state, dl.SUBMITTED)+ self.tick(dl.UNSEEN_GRACE)+ task = self.service.store.get(task_id)+ self.assertEqual((task.state, task.failure), (dl.FAILED, "not_accepted"))++ def test_a_listed_task_that_disappears_fails_as_removed(self):+ task_id = self.submit()["task"]["id"]+ self.provider.statuses = [dl.RemoteStatus(dl.RUNNING, "r1", "ABC-123", 0.2), dl.RemoteStatus(dl.MISSING)]+ self.tick(10)+ self.assertEqual(self.service.store.get(task_id).state, dl.REMOTE_RUNNING)+ self.tick(dl.MISSING_GRACE)self.tick(dl.MISSING_GRACE)- self.assertEqual(self.service.store.get(task_id).failure, "no_source")+ self.assertEqual(self.service.store.get(task_id).failure, "removed")def test_a_task_missing_from_the_list_with_files_in_the_folder_counts_as_done(self):task_id = self.submit()["task"]["id"]diff --git a/tests/test_downloads_jav_browser.py b/tests/test_downloads_jav_browser.pyindex 79f1cb740..d8cb2eaf0 100644--- a/tests/test_downloads_jav_browser.py+++ b/tests/test_downloads_jav_browser.py@@ -1,7 +1,9 @@"""JAV 用户脚本请求、持久队列与真实云下载服务的隔离回归。"""from __future__ import annotations+import base64import hashlib+import ioimport jsonimport shutilimport subprocess@@ -153,6 +155,37 @@ class BrowserTests(unittest.TestCase):headers=self.script_headers).status_code, 400)self.assertEqual(self.service.rows, {})+ def test_people_avatar_is_framed_on_the_recorded_face(self):+ from PIL import Image+ from peach.entities import upsert_asset_entity+ contract = self.app.state.web_contract+ contract.avatar_root = self.root / 'avatars'+ contract.cover_root = self.root / 'covers'+ self.app.state.preview_service.avatar_root = contract.avatar_root+ with contract.database.write_transaction() as connection:+ asset_id = connection.execute(+ 'INSERT INTO asset(path,name,location,medium,code) VALUES(?,?,?,?,?)',+ ('R:\Media\ABC-123.mp4', 'ABC-123.mp4', 'local', 'video', 'ABC-123')).lastrowid+ person = upsert_asset_entity(connection, asset_id=asset_id, kind='performer', name='测试演员',+ role='performer', source='user:test')+ contract.avatar_root.mkdir(parents=True, exist_ok=True)+ portrait = Image.new('RGB', (400, 800), 'white')+ portrait.paste((220, 0, 0), (180, 100, 220, 140))+ portrait.save(contract.avatar_root / f'performer-{person}.img', format='JPEG')++ def centre():+ response = self.client.get('/api/jav-browser/people', params={'codes': 'ABC-123'}, headers=self.script_headers)+ data = response.json()['items']['ABC-123'][0]['avatar'].split(',', 1)[1]+ with Image.open(io.BytesIO(base64.b64decode(data))) as avatar:+ return avatar.convert('RGB').getpixel((32, 32))++ self.assertGreater(centre()[1], 200)+ (contract.avatar_root / f'performer-{person}.face.json').write_text(json.dumps({+ 'face': {'cx': 0.5, 'cy': 0.15, 'w': 0.1}, 'px': [400, 800], 'focus': {'axis': 'y', 'pct': 10}}), encoding='utf-8')+ red, green, blue = centre()+ self.assertGreater(red, 150)+ self.assertLess(green, 90)+def test_people_rejects_unpaired_or_invalid_queries_and_leaves_missing_avatar_empty(self):self.assertEqual(self.client.get('/api/jav-browser/people', params={'codes':'ABC-123'}).status_code, 401)for codes in ('bad code', ','.join(['ABC-123']*51)):@@ -239,6 +272,7 @@ class BrowserTests(unittest.TestCase):self.remote.submit.side_effect = Noneself.assertEqual(self.add(switch=True).json()["state"], "queued")self.service.process_one()+ self.assertEqual(self.service.search.call_args.args[1]["skip"], [HASH])switched = self.status().json()self.assertEqual(switched["state"], "submitted")self.assertNotEqual(switched["task_id"], failed["task_id"])@@ -251,6 +285,20 @@ class BrowserTests(unittest.TestCase):exhausted = self.status().json()self.assertEqual((exhausted["state"], exhausted["message"]), ("no_match", "没有其他可用磁力,可在 Peach 手动选择资源"))+ def test_tasks_the_cloud_never_listed_count_as_cloud_problems_including_legacy_rows(self):+ self.add()+ self.service.process_one()+ task = self.downloads.store.get(self.status().json()["task_id"])+ task.remote_id = task.remote_name = task.progress = None+ for failure, detail in (("not_accepted", "网盘没有收下这个任务"),+ ("no_source", "远端任务列表里找不到这个任务,目标目录里也没有文件")):+ task.state, task.failure, task.failure_detail = dl.FAILED, failure, detail+ self.downloads.store.save(task)+ self.assertEqual(self.status().json()["cause"], "cloud")+ task.failure, task.failure_detail = "no_source", "没有可用下载源"+ self.downloads.store.save(task)+ self.assertEqual(self.status().json()["cause"], "magnet")+def test_cloud_failure_is_visible_and_a_manual_retry_uses_existing_task(self):self.remote.submit.side_effect = dl.DownloadError("config", "请更新网盘账号")self.add()diff --git a/tests/test_web_downloads.py b/tests/test_web_downloads.pyindex e7e8cbac2..82591fc3c 100644--- a/tests/test_web_downloads.py+++ b/tests/test_web_downloads.py@@ -527,6 +527,21 @@ class ResourceIndexerRoutes(_App):self.assertEqual(direct.call_args.kwargs["goal"], "chinese")self.assertEqual(self.client.get("/api/resources/search?code=ABC-123&min_size=-1").status_code, 400)+ def test_switching_magnets_searches_every_source_and_drops_skipped_hashes(self):+ from peach.web_resource_search import q_resource_search+ failed, other = "a" * 40, "b" * 40+ hd = {"source": "manko.fun", "resolution": 1080, "info_hash": failed, "name": "ABC-123"}+ fallback = {"source": "sukebei", "resolution": 1080, "info_hash": other, "name": "ABC-123 FHD"}+ with mock.patch("peach.web_resource_search.direct_search", return_value={+ "items": [hd, fallback], "warnings": [], "trace": [], "next_sources": [], "reference_only": []}) as direct, mock.patch("peach.web_resource_search._SEARCH.run", return_value={+ "ok": True, "state": "ready", "items": [], "warnings": [], "error": ""}) as search, mock.patch("peach.web_resource_search.rank_candidates", side_effect=lambda rows, goal: rows):+ result = q_resource_search(self.app.state.web_contract, {"code": "ABC-123", "skip": [failed]})+ self.assertFalse(direct.call_args.kwargs["stop_on_preferred"])+ self.assertIn(failed, search.call_args.args[3])+ self.assertEqual([row["info_hash"] for row in result["items"]], [other])+ q_resource_search(self.app.state.web_contract, {"code": "ABC-123", "skip": "not-a-list"})+ self.assertTrue(direct.call_args.kwargs["stop_on_preferred"])+if __name__ == "__main__":unittest.main()