Skip to content

armgit / peach

Public Imported from GitHub
0

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

feat(downloads): 为可恢复的搜索与后处理故障安排有限重试

longmeidao9a6d4545716d
diff --git a/docs/JAV_BROWSER.md b/docs/JAV_BROWSER.md
index 4476fa5fc..9451793b5 100644
--- a/docs/JAV_BROWSER.md
+++ b/docs/JAV_BROWSER.md
@@ -48,6 +48,10 @@ Peach 配置页通过同源桥接页检测脚本版本和是否已为当前地
`POST /api/jav-browser/postprocess` 接收 `{"code": "..."}`,重试这个番号入库后失败的整理,与任务中心的「重试整理」同一入口,返回状态接口同一结构;没有失败的整理时返回 400。
+资源搜索与入库后处理遇到可恢复的网络超时、暂时服务错误、挂载离线或文件占用时,由 Peach 后台自动重试,最多 3 次,间隔为 1、5、30 分钟;来源要求的 `Retry-After` 更长时按来源等待。计划和次数持久保存,关闭网页或重启服务不丢失。已经入库的影片只重跑幂等后处理,不重新提交云下载。凭据、配额、身份、文件冲突、路径超长、完整性与程序错误不自动重试。
+
+等待期间状态响应带 `retry_at`(ISO-8601 UTC)、`retry_attempt` 和 `retry_limit`,任务仍属于进行中;用户脚本显示「待自动重试」,进度页说明时间与次数。重试耗尽带 `retry_exhausted: true`,保留失败与手动入口。手动重试会开启一轮新的有限后处理重试。
+
女优页的「订阅新作」走 `GET /api/jav-browser/performer?source_url=…&names=…` 与 `POST /api/jav-browser/performer`(正文 `{"source_url": "…", "names": [...], "enabled": true}`),两者都回 `{name, entity_id, following, avatar?}`。支持 JavDB 演员页 `/actors/<id>`、DMM 女优片单 `?actress=<编号>` 与旧版 `article=actress/id=<编号>`、MISSAV 女优页 `/actresses/<名字>`;`names` 是页面上的女优名,JavDB 标题栏的几种写法与 MISSAV 的「现名(旧名)」都会拆开。认人先看页面编号的持有者,再按名字认正名或唯一别名;编号没人持有时新建她并绑上编号,DMM 页没给名字时向 DMM 问。只有名字的页面,库里有编号的直接订,否则到 JavDB 搜,名字对得上又确认是同一个人才登记,同名不止一位、搜不到或 JavDB 冷却时返回 400 与原因。取舍见 [ADR-0143](adr/0143-userscript-performer-pages-subscribe.md)。
脚本通过专用令牌向 `POST /api/jav-browser/errors` 写入请求超时、连接失败、HTTP 拒绝和无效响应记录。记录只含发生时间、事件标识、脚本版本、站点标识、番号、操作类型、耗时和 HTTP 状态,不含令牌、账号、完整来源地址、页面正文或原始异常。每批最多 10 条、16 KiB,服务端每分钟最多接收 20 条并按事件标识去重;仅写本机 `errors-*.log`,随导出诊断包提供。脚本管理器暂存最多 20 条、保留 7 天,后续请求成功时按一分钟限频向原 Peach 地址补报;记录失败不重试添加,也不递归生成错误。
diff --git a/docs/REUSE.md b/docs/REUSE.md
index 4f6422f87..1480d0021 100644
--- a/docs/REUSE.md
+++ b/docs/REUSE.md
@@ -744,6 +744,7 @@ SFW 开关键可在偏好设置的「内容显示」里改。主键按 `Keyboard
- JAV 入库资源查询与新作页共用 `javdb_public.PublicAPI.resources`:匿名 API 的作品身份核对、0.5 秒间隔、请求预算、来源冷却和按发行日期保存的快照,加上 `downloads.parse_magnet` 与 `sources.javdb.parse_comment_text`。磁链区的 `size` 是 MiB 整数,换算成带单位的文字后才进入体积过滤与排序。Peach 负责评论链接、协议分流和去重,不新增依赖。待找清单读磁链区与前 4 页评论,预算跟随本轮查询期限;作品身份歧义按来源原文报告。磁链可交现有云下载服务,ed2k 与其他网页链接提供复制。
- 磁力优先链复用同一套 `SourceTransport`、`HostLimitedTransport`、`downloads.parse_magnet` 与 Torznab 后备,不引入新的抓取运行时。manko.fun 的页面请求实际落到 `healertanker.com/swx`,响应 `data` 是 basE91 包装的 JSON;实现只移植该公开响应形态与编号精确匹配,不复用会话脚本。Sukebei 直接读搜索表格;JavBus、16mag、OneJAV、Free JAV Torrent 由现有自配 Prowlarr/Jackett 索引器续接。Akiba Online 与 Reddit 只作线索,不自动取磁力。候选按分辨率、做种、推广附件数量与正片体积排序;总文件数不再是一票否决,manko.fun 候选绕过水印门槛,其他来源只能标为待到盘检查。
- 云下载后处理复用 `task_run` 后继串行、`process_library(retry_ids=...)`、`junk.isolate`、`organize.build_plan(asset_ids=...)`、SQLite backup 与整理批次日志。没有另造第二套刮削、垃圾词库或移动器。
+- 搜索与入库后处理的有限重试复用下载对账的 `next_check_at`、持久浏览器队列与既有错误分类;后处理独立保存重试次数,来源冷却和 `Retry-After` 继续生效。移动失败把可恢复类别带回批次结果,采集阶段沿用结构化来源诊断;不从错误文字猜测权限或暂时故障,不新增任务线程或依赖。
- `junk.scored_candidates` 统一复核与自动隔离的证据;`junk.isolate` 要求显式资产或来源目录,保护人工决定、个人记录、字幕与正片身份,写前重查证据,仅写可撤销的回收站状态。扫描、推送、媒体探测、资料处理、云下载与维护脚本共用该入口;页面只补展示成本与缩略图字段。复用当前树的词库、目录关系、`record_holders`、`LedgerDatabase` 与历史评分回归,使用 Python 标准库和现有 SQLite JSON 支持,无新增依赖、协议或媒体读取。流程顺序见[垃圾文件](OPERATIONS.md#垃圾文件)。
- 抓取入口的复用缺口见 [来源采集](SOURCING.md) ;跨用户安装、来源网络、Cookie GUI、最高可得画质与图像清单按 [ADR-0024](adr/0024-mark-manifest-not-bundled-bytes.md)。私有后缀判断用 tldextract 5.4.0(BSD-3-Clause),随包 PSL、`suffix_list_urls=()`、`cache_dir=None`、`include_psl_private_domains=True`;Instaloader 4.15.3 与 browser_cookie3 不进正式依赖。HTTPX(BSD-3-Clause)、curl_cffi(MIT)、Pillow、amane 桥与现有候选缓存是正式基础,请求节拍用 `scripting.RateLimiter`/`HostLimiter`。
- 采集 GUI 用 React island、CredentialStore、HTTPX、Pillow 与 BackgroundJob,`jav_cover_fetch` 同时服务界面与 CLI;Peach 保留域内凭据、来源路由、预算、冷却、番号身份与高清替换策略。Cookie 文本用标准库 SimpleCookie/MozillaCookieJar 解析,不导入 pickle。
diff --git a/migrations/0051_download_postprocess_retries.sql b/migrations/0051_download_postprocess_retries.sql
new file mode 100644
index 000000000..f7500972d
--- /dev/null
+++ b/migrations/0051_download_postprocess_retries.sql
@@ -0,0 +1,2 @@
+-- 后处理的重试计数独立于网盘进度查询;下一次领取时间沿用 next_check_at。
+ALTER TABLE download_task ADD COLUMN postprocess_retries INTEGER NOT NULL DEFAULT 0;
diff --git a/src/peach/download_postprocess.py b/src/peach/download_postprocess.py
index 46a72dc07..3c376ecb3 100644
--- a/src/peach/download_postprocess.py
+++ b/src/peach/download_postprocess.py
@@ -7,7 +7,7 @@ from pathlib import Path
from . import junk, ledger_backups, organize, settings_file
from .catalog_rules import same_release_code
-from .downloads import (INGESTED, POSTPROCESS_COMPLETE, POSTPROCESS_FAILED,
+from .downloads import (INGESTED, POSTPROCESS_COMPLETE,
POSTPROCESS_PENDING, POSTPROCESS_QUEUED, POSTPROCESS_RUNNING,
DownloadStore, iso)
from .field_owners import SCAN_FILENAME, write_owned_fields
@@ -17,6 +17,7 @@ from .jobs import JobDeferred
from .library_processing import COLLECT_STAGE, _ffprobe_path, process_library
from .media_probe import probe_unmeasured
from .task_runs import declared_rows
+from .task_retry import RetryableTaskError
TASK_KEY = "download-postprocess"
TASK_LABEL = "云下载后处理"
@@ -38,6 +39,9 @@ def enqueue(contract, task) -> int | None:
fresh = DownloadStore(contract.database).get(task.id)
if fresh is None or fresh.state != INGESTED or fresh.postprocess_state != POSTPROCESS_PENDING:
return None
+ from .downloads import parse_iso
+ if fresh.next_check_at and parse_iso(fresh.next_check_at) > contract.downloads.clock():
+ return None
parent = contract.task_runs.start(
TASK_KEY, trigger="scheduled", mutex_key=f"download-ingest:{task.id}",
conflict="skip", label=f"下载已入库:{task.code or task.display_name or task.id}")
@@ -122,11 +126,41 @@ def _collect(contract, main: int, handle) -> dict:
# 不为一项暂缺的资料把整条下载卡在云下载目录里。
issues, paused = int(state.get("issue_count") or 0), int(state.get("paused_count") or 0)
if not issues or paused < issues:
- raise RuntimeError(str(state.get("error") or "资料采集失败"))
+ message = str(state.get("error") or "资料采集失败")
+ delay = _collection_retry_delay(state, main)
+ if delay is not None:
+ raise RetryableTaskError(message, after=delay)
+ raise RuntimeError(message)
state = {**state, "paused_pending": [str(row.get("message") or "") for row in state.get("issue_preview") or ()]}
return state
+def _collection_retry_delay(state: dict, main: int) -> float | None:
+ """只重试采集器明确记录的暂时故障;登录、解析和手动跳过不进入自动队列。"""
+ path = state.get('issues_log')
+ if not path or not state.get('issue_count'):
+ return None
+ delays = []
+ with Path(path).open(encoding='utf-8') as stream:
+ for line in stream:
+ issue = json.loads(line)
+ if issue.get('asset_id') != main or issue.get('severity') == 'info':
+ continue
+ if not issue.get('retryable') or issue.get('failed_action') == 'skipped':
+ return None
+ if issue.get('failed_action') == 'network_offline':
+ delays.append(0.0)
+ continue
+ diagnostics = issue.get('diagnostics') or {}
+ failures = diagnostics.get('failures') or [diagnostics]
+ transient = [row['automatic_retry_delay'] for row in failures
+ if row.get('automatic_retry_delay') is not None]
+ if not transient:
+ return None
+ delays.append(max(transient))
+ return max(delays) if delays else None
+
+
def _organize(contract, task, main: int) -> dict:
templates = contract.download_organize_templates().get(task.location, {})
if not templates:
@@ -141,7 +175,10 @@ def _organize(contract, task, main: int) -> dict:
blocked = [row for row in plan['rows'] if row.get('reason') in {
organize.SKIP_TARGET_EXISTS, organize.SKIP_OFFLINE, organize.SKIP_TOO_LONG}]
if blocked:
- raise RuntimeError('文件整理未完成:' + ';'.join(str(row['reason']) for row in blocked))
+ message = '文件整理未完成:' + ';'.join(str(row['reason']) for row in blocked)
+ if all(row['reason'] == organize.SKIP_OFFLINE for row in blocked):
+ raise RetryableTaskError(message)
+ raise RuntimeError(message)
if not movable:
return {"moved": 0, "skipped": next(iter(plan["reasons"]), "无需整理")}
name = f"ledger.pre-download-{task.id}-{time.strftime('%Y%m%d-%H%M%S')}.db"
@@ -159,6 +196,9 @@ def _organize(contract, task, main: int) -> dict:
raise RuntimeError(f'整理后 ledger 校验失败:integrity={integrity} new_foreign_keys={len(introduced)}')
if result.get('failed'):
reasons = ';'.join(str(row['reason']) for row in result.get('failures', ()))
+ if all(row.get('retryable') for row in result.get('failures', ())):
+ raise RetryableTaskError(f'文件整理未完成:{reasons}',
+ after=max(row.get('retry_after') or 0 for row in result['failures']))
raise RuntimeError(f'文件整理未完成:{reasons}')
return {**result, 'backup': str(backup), 'existing_foreign_keys': len(baseline)}
@@ -196,8 +236,8 @@ def run(contract, key: str, handle) -> dict:
store.postprocess(task_id, POSTPROCESS_QUEUED, detail=str(error))
raise
except Exception as error:
- store.postprocess(task_id, POSTPROCESS_FAILED,
- detail=f"{type(error).__name__}: {error}")
+ store.fail_postprocess(task_id, error, now=contract.downloads.clock())
+ contract.downloads.wake()
raise
detail = (f"正片已绑定,资料已采集;整理跳过:{organized['skipped']}"
if organized.get('skipped') else "正片已绑定,资料已采集并完成整理")
diff --git a/src/peach/downloads.py b/src/peach/downloads.py
index f9b76610f..38e7aaab4 100644
--- a/src/peach/downloads.py
+++ b/src/peach/downloads.py
@@ -38,6 +38,7 @@ from .follow_secrets import CredentialStore
from .fsutil import atomic_write_text
from .push_discovery import CloudPathError, CloudPrefix, map_cloud_path, normalise_prefix
from .repository import LedgerDatabase, in_background
+from .task_retry import RETRY_DELAYS, retry_delay
LOGGER = logging.getLogger(__name__)
@@ -342,6 +343,13 @@ class DownloadTask:
postprocess_detail: str | None = None
postprocess_run_id: int | None = None
postprocessed_at: str | None = None
+ postprocess_retries: int = 0
+
+ @property
+ def postprocess_label(self) -> str:
+ if self.postprocess_state == POSTPROCESS_PENDING and self.next_check_at:
+ return f"等待自动重试({self.postprocess_retries}/{len(RETRY_DELAYS)})"
+ return POSTPROCESS_LABELS.get(self.postprocess_state, self.postprocess_state)
@property
def location(self) -> str:
@@ -384,10 +392,12 @@ class DownloadTask:
"submitted_at": self.submitted_at, "updated_at": self.updated_at,
"finished_at": self.finished_at, "blocked": bool(self.blocked_at),
"postprocess_state": self.postprocess_state,
- "postprocess_label": POSTPROCESS_LABELS.get(self.postprocess_state, self.postprocess_state),
+ "postprocess_label": self.postprocess_label,
"postprocess_detail": self.postprocess_detail,
"postprocess_run_id": self.postprocess_run_id,
"postprocessed_at": self.postprocessed_at,
+ "postprocess_retries": self.postprocess_retries,
+ "postprocess_retry_at": self.next_check_at if self.postprocess_state == POSTPROCESS_PENDING else None,
"postprocess_active": self.postprocess_state in {
POSTPROCESS_PENDING, POSTPROCESS_QUEUED, POSTPROCESS_RUNNING},
"postprocess_retryable": self.state == INGESTED and self.postprocess_state == POSTPROCESS_FAILED,
@@ -402,6 +412,7 @@ _TASK_COLUMNS = (
"ledger_path", "asset_id", "checks", "submitted_at", "remote_done_at", "updated_at",
"finished_at", "next_check_at", "blocked_at",
"postprocess_state", "postprocess_detail", "postprocess_run_id", "postprocessed_at",
+ "postprocess_retries",
)
@@ -473,8 +484,10 @@ class DownloadStore:
f"SELECT * FROM download_task WHERE (state IN ({marks}) "
"AND (next_check_at IS NULL OR next_check_at<=?)) "
"OR (state=? AND next_check_at IS NOT NULL AND next_check_at<=?) "
- "OR (state=? AND next_check_at IS NULL AND finished_at>=?) ORDER BY next_check_at, id",
- (*states, iso(now), STALLED, iso(now), STALLED, iso(_stall_cutoff(now)))).fetchall()
+ "OR (state=? AND next_check_at IS NULL AND finished_at>=?) "
+ "OR (state=? AND postprocess_state=? AND next_check_at<=?) ORDER BY next_check_at, id",
+ (*states, iso(now), STALLED, iso(now), STALLED, iso(_stall_cutoff(now)),
+ INGESTED, POSTPROCESS_PENDING, iso(now))).fetchall()
return [DownloadTask.from_row(row) for row in rows]
def next_due(self, now: float) -> float | None:
@@ -484,8 +497,9 @@ class DownloadStore:
row = connection.execute(
f"SELECT min(coalesce(next_check_at,'')) FROM download_task WHERE state IN ({marks}) "
"OR (state=? AND next_check_at IS NOT NULL) "
- "OR (state=? AND next_check_at IS NULL AND finished_at>=?)",
- (*states, STALLED, STALLED, iso(_stall_cutoff(now)))).fetchone()
+ "OR (state=? AND next_check_at IS NULL AND finished_at>=?) "
+ "OR (state=? AND postprocess_state=? AND next_check_at IS NOT NULL)",
+ (*states, STALLED, STALLED, iso(_stall_cutoff(now)), INGESTED, POSTPROCESS_PENDING)).fetchone()
if row is None or row[0] is None:
return None
return parse_iso(row[0]) or 0.0
@@ -548,16 +562,17 @@ class DownloadStore:
return (exact, not promo, duration, pixels, int(row.get("size") or 0), -int(row["id"]))
return int(max(rows, key=rank)["id"])
- def pending_postprocess(self) -> list[DownloadTask]:
+ def pending_postprocess(self, now: float | None = None) -> list[DownloadTask]:
with self.database.read_connection() as connection:
rows = connection.execute(
- "SELECT * FROM download_task WHERE state=? AND postprocess_state=? ORDER BY id",
- (INGESTED, POSTPROCESS_PENDING)).fetchall()
+ "SELECT * FROM download_task WHERE state=? AND postprocess_state=? "
+ "AND (next_check_at IS NULL OR next_check_at<=?) ORDER BY id",
+ (INGESTED, POSTPROCESS_PENDING, iso(time.time() if now is None else now))).fetchall()
return [DownloadTask.from_row(row) for row in rows]
def postprocess(self, task_id: int, state: str, *, detail: str | None = None,
run_id: int | None = None, finished: str | None = None) -> None:
- assignments = ["postprocess_state=?", "postprocess_detail=?"]
+ assignments = ["postprocess_state=?", "postprocess_detail=?", "next_check_at=NULL"]
values: list[object] = [state, detail]
if run_id is not None:
assignments.append("postprocess_run_id=?")
@@ -569,6 +584,23 @@ class DownloadStore:
connection.execute(f"UPDATE download_task SET {','.join(assignments)} WHERE id=?",
(*values, int(task_id)))
+ def fail_postprocess(self, task_id: int, error: Exception, *, now: float | None = None) -> bool:
+ """在原任务上排下一次后处理;终止条件与错误都保留,不重交磁力。"""
+ task = self.get(task_id)
+ delay = retry_delay(error, task.postprocess_retries)
+ detail = f'{type(error).__name__}: {error}'
+ if delay is None:
+ if task.postprocess_retries >= len(RETRY_DELAYS):
+ detail = f'自动重试 {task.postprocess_retries} 次后仍未完成;{detail}'
+ self.postprocess(task_id, POSTPROCESS_FAILED, detail=detail)
+ return False
+ with self.database.write_transaction(notify=False) as connection:
+ connection.execute(
+ 'UPDATE download_task SET postprocess_state=?,postprocess_detail=?,postprocess_retries=?,next_check_at=? WHERE id=?',
+ (POSTPROCESS_PENDING, detail, task.postprocess_retries + 1,
+ iso((time.time() if now is None else now) + delay), task_id))
+ return True
+
# ---------------------------------------------------------------- 设置
@@ -900,6 +932,8 @@ class DownloadService:
raise ValueError("没有这个下载任务")
if task.state != INGESTED or task.postprocess_state != POSTPROCESS_FAILED:
raise ValueError("这个任务没有失败的后处理可以重试")
+ task.postprocess_retries = 0
+ self.store.save(task)
self.store.postprocess(task.id, POSTPROCESS_PENDING, detail="等待重新处理")
task = self.store.get(task.id)
self._dispatch_postprocess(task)
@@ -923,7 +957,7 @@ class DownloadService:
self._thread.start()
if self.after_ingest is not None:
try:
- pending = self.store.pending_postprocess()
+ pending = self.store.pending_postprocess(self.clock())
except sqlite3.Error:
# 未配置实例的 lifespan 也会装配服务;账本尚不存在时没有待恢复任务。
pending = []
@@ -966,6 +1000,9 @@ class DownloadService:
def advance(self, task: DownloadTask) -> None:
now = self.clock()
+ if task.state == INGESTED and task.postprocess_state == POSTPROCESS_PENDING:
+ self._dispatch_postprocess(task)
+ return
if task.state == STALLED:
self._recheck_stalled(task, now)
return
@@ -1102,8 +1139,8 @@ class DownloadService:
self.after_ingest(task)
except Exception as error:
LOGGER.exception("云下载任务 %s 后处理入队失败", task.id)
- self.store.postprocess(task.id, POSTPROCESS_FAILED,
- detail=f"{type(error).__name__}: {error}")
+ if self.store.fail_postprocess(task.id, error, now=self.clock()):
+ self.wake()
# -- 设置
diff --git a/src/peach/jav_browser.py b/src/peach/jav_browser.py
index 9de98f80f..464c4e946 100644
--- a/src/peach/jav_browser.py
+++ b/src/peach/jav_browser.py
@@ -19,10 +19,12 @@ from .catalog_rules import (
)
from .config import PROJECT_ROOT
from .downloads import (
- CLOUDDRIVE_CREDENTIAL, INGESTED, POSTPROCESS_LABELS, POSTPROCESS_PENDING, POSTPROCESS_QUEUED,
+ CLOUDDRIVE_CREDENTIAL, INGESTED, POSTPROCESS_FAILED, POSTPROCESS_PENDING, POSTPROCESS_QUEUED,
POSTPROCESS_RUNNING, REMOTE_RUNNING, RESUBMITTABLE_STATES, STATE_LABELS, TRACKED_STATES, iso,
never_seen, submit_offline_download, parse_magnet,
+ parse_iso, DownloadError,
)
+from .task_retry import RETRY_DELAYS, RetryableTaskError, retry_delay
from .follow_secrets import CredentialError
from .feeds import scan_code
from .fsutil import atomic_write_text
@@ -149,6 +151,16 @@ def _download_candidate(items, code, skip=frozenset()):
return None
+def _postprocess_retry_status(task) -> dict:
+ """后处理的等待与耗尽状态,投影成浏览器可读的重试回执。"""
+ if task.postprocess_state == POSTPROCESS_PENDING and task.next_check_at:
+ return {'retry_at': task.next_check_at, 'retry_attempt': task.postprocess_retries,
+ 'retry_limit': len(RETRY_DELAYS)}
+ if task.postprocess_state == 'failed' and task.postprocess_retries >= len(RETRY_DELAYS):
+ return {'retry_exhausted': True, 'retry_attempt': task.postprocess_retries, 'retry_limit': len(RETRY_DELAYS)}
+ return {}
+
+
class JavBrowser:
"""本机持久队列;搜索完成前退出时,下一次启动继续处理。"""
@@ -179,6 +191,10 @@ class JavBrowser:
for key, row in payload.items():
if not isinstance(row, dict) or normalise_code_key(key) != key or row.get("state") not in MESSAGES:
raise ValueError("浏览器添加队列无法读取")
+ if 'retry_attempt' in row and (type(row['retry_attempt']) is not int or not 0 <= row['retry_attempt'] <= len(RETRY_DELAYS)):
+ raise ValueError('浏览器添加重试次数无效')
+ if 'retry_at' in row and (not isinstance(row['retry_at'], str) or parse_iso(row['retry_at']) is None):
+ raise ValueError('浏览器添加重试时间无效')
if row["state"] == "searching":
row["state"] = "queued"
# 店铺前缀归一之前记下的行(`107STZY-019`)改记到裸番号下,裸番号已有记录时以它为准。
@@ -294,11 +310,14 @@ class JavBrowser:
row = connection.execute(
"SELECT id FROM asset WHERE normalise_code_key(code)=? AND medium='video' "
"AND disposal IS NULL ORDER BY id LIMIT 1", (code,)).fetchone()
- if row:
- return {"state": "owned", "asset_id": row[0]}
tasks = connection.execute(
- "SELECT id,state FROM download_task WHERE normalise_code_key(code)=? "
+ "SELECT id,state,postprocess_state FROM download_task WHERE normalise_code_key(code)=? "
"ORDER BY id DESC", (code,)).fetchall()
+ if tasks and tasks[0]['state'] == INGESTED and tasks[0]['postprocess_state'] in {
+ POSTPROCESS_PENDING, POSTPROCESS_QUEUED, POSTPROCESS_RUNNING, POSTPROCESS_FAILED}:
+ return {'state': 'ingested', 'task_id': tasks[0]['id']}
+ if row:
+ return {"state": "owned", "asset_id": row[0]}
for task in tasks:
if task["state"] not in RESUBMITTABLE_STATES:
return {"state": "ingested" if task["state"] == INGESTED else "submitted", "task_id": task["id"]}
@@ -333,8 +352,9 @@ class JavBrowser:
"progress": min(1.0, max(0.0, progress)) if task.state in {REMOTE_RUNNING, "remote_done", "landed", INGESTED}
and type(progress) in (int, float) and math.isfinite(progress) else None,
"postprocess_state": task.postprocess_state,
- "postprocess_label": POSTPROCESS_LABELS.get(task.postprocess_state, ""),
+ "postprocess_label": task.postprocess_label,
"updated_at": task.updated_at}
+ row.update(_postprocess_retry_status(task))
state = row.get("state", "idle")
return {"ok": True, "code": code, **row, **detail, "state": state,
"stage": "submitting" if code in self._submitting else state,
@@ -433,7 +453,8 @@ class JavBrowser:
with self._lock:
if self._stop.is_set() or not self.downloads.available or not self._config().get("token_hash"):
return False
- code = next((key for key, row in self.rows.items() if row["state"] == "queued"), None)
+ code = next((key for key, row in self.rows.items() if row["state"] == "queued"
+ and (not row.get('retry_at') or parse_iso(row['retry_at']) <= self.downloads.clock())), None)
if code is None:
return False
row = self.rows[code]
@@ -443,6 +464,7 @@ class JavBrowser:
self._save()
return True
row["state"] = "searching"
+ row.pop('retry_at', None)
self._save()
provider = row["provider"]
try:
@@ -459,10 +481,7 @@ class JavBrowser:
elif existing := self._existing(code):
row.update(existing)
elif candidate is None:
- failed = result.get("state") in {"error", "unavailable"} or bool(result.get("error"))
- row.update(state="failed" if failed else "no_match", message=(
- "资源搜索暂不可用,请在 Peach 检查来源后重试" if failed
- else NO_OTHER_MAGNET if row.get("skip") else MESSAGES["no_match"]))
+ self._empty_search_result(row, result)
else:
self._submitting.add(code)
should_submit = True
@@ -485,10 +504,33 @@ class JavBrowser:
with self._lock:
self._submitting.discard(code)
if row["state"] == "searching":
- row.update(state="failed", message="搜索或云下载提交失败,请在 Peach 检查下载渠道后重试")
+ retry_error = RetryableTaskError(error.detail) if isinstance(error, DownloadError) and error.retryable else error
+ self._schedule_retry(row, retry_error)
self._save()
return True
+ def _empty_search_result(self, row: dict, result: dict) -> None:
+ """搜索没有正片磁力时,分别结算无命中、可恢复故障与永久故障。"""
+ failed = result.get('state') in {'error', 'unavailable'} or bool(result.get('error'))
+ message = ('资源搜索暂不可用,请在 Peach 检查来源后重试' if failed
+ else NO_OTHER_MAGNET if row.get('skip') else MESSAGES['no_match'])
+ after = result.get('retry_after')
+ if failed and type(after) in (int, float) and math.isfinite(after) and after >= 0:
+ self._schedule_retry(row, RetryableTaskError(message, after=after))
+ else:
+ row.update(state='failed' if failed else 'no_match', message=message)
+
+ def _schedule_retry(self, row: dict, error: Exception) -> None:
+ attempt = row.get('retry_attempt', 0)
+ delay = retry_delay(error, attempt)
+ if delay is None:
+ prefix = f'自动重试 {attempt} 次后仍未完成;' if attempt == len(RETRY_DELAYS) else ''
+ row.update(state='failed', message=prefix + '搜索或云下载提交失败,请在 Peach 检查来源和下载渠道后重试')
+ row['retry_exhausted'] = attempt == len(RETRY_DELAYS)
+ return
+ row.update(state='queued', retry_attempt=attempt + 1, retry_limit=len(RETRY_DELAYS),
+ retry_at=iso(self.downloads.clock() + delay), message='暂时不可用,等待自动重试')
+
def start(self):
if not self.downloads.available or self._thread is not None:
return
diff --git a/src/peach/library_processing.py b/src/peach/library_processing.py
index 64d1287a7..657f2ed99 100644
--- a/src/peach/library_processing.py
+++ b/src/peach/library_processing.py
@@ -256,7 +256,9 @@ def describe_failure(error):
def _source_failure_details(error, code, action, *, source=None):
"""采集问题保留脱敏异常链和阶段,页面摘要不暴露内部错误正文。"""
from .error_reporting import exception_facts, scrub
- return scrub({'stage': action, 'code': code, 'source': source, **exception_facts(error)})
+ from .task_retry import transient_delay
+ return scrub({'stage': action, 'code': code, 'source': source,
+ 'automatic_retry_delay': transient_delay(error), **exception_facts(error)})
#: 来源说「没有」不是待办:馆藏里本来就有大量独立资源和创作者作品,任何目录站都收不到
#: 它们。逐条记在日志里备查,界面只按这两类各报一个数(`state['notes']`),不进问题清单。
MISS_MESSAGES = {'querying_metadata': '外部来源没有这部片的资料,7 天内不再问',
diff --git a/src/peach/magnet_chain.py b/src/peach/magnet_chain.py
index 2acdd9331..53d23ebb4 100644
--- a/src/peach/magnet_chain.py
+++ b/src/peach/magnet_chain.py
@@ -25,6 +25,7 @@ from .javdb_public import (_CACHE_ROOT, PUBLIC_API, PublicIdentityAmbiguous, Pub
from .resource_search import qualities
from .scraping_access import SourceTransport
from .sources import FailureReason, Session, SourceFailure
+from .task_retry import transient_delay
HIGH_QUALITY = 1080
MAX_RESULTS = 8
@@ -279,7 +280,7 @@ def search(root: Path, code: str, *, transport=None, min_size: int = 0,
max_size: int = 1024 ** 4, goal: str = "quality", stop_on_preferred: bool = True) -> dict:
"""有界查询三个可直连来源;直接添加允许在 manko 高清命中时结束。"""
fetcher = Fetcher(root, transport=transport)
- trace, warnings, found = [], [], []
+ trace, warnings, found, retry_delays = [], [], [], []
try:
for source, collect in ((CHAIN[0], fetcher.manko), (CHAIN[1], fetcher.javdb),
(CHAIN[2], fetcher.sukebei)):
@@ -288,9 +289,13 @@ def search(root: Path, code: str, *, transport=None, min_size: int = 0,
except SourceFailure as error:
items = []
warnings.append(f"{source.label}:{error}")
- except Exception:
+ if (delay := transient_delay(error)) is not None:
+ retry_delays.append(delay)
+ except Exception as error:
items = []
warnings.append(f"{source.label}:未取得")
+ if (delay := transient_delay(error)) is not None:
+ retry_delays.append(delay)
items = [item for item in items if min_size <= item["size"] <= max_size]
found.extend(items)
if stop_on_preferred and source.key == "manko" and any(item["resolution"] >= HIGH_QUALITY for item in items):
@@ -301,6 +306,7 @@ def search(root: Path, code: str, *, transport=None, min_size: int = 0,
fetcher.close()
incomplete = bool(warnings) and not found
result = {"items": rank_candidates(found, goal), "warnings": warnings, "trace": trace,
+ 'retry_after': max(retry_delays) if retry_delays else None,
'state': 'error' if incomplete else 'ready',
'error': '部分来源未取得,请稍后重试或检查来源连接。' if incomplete else '',
"next_sources": [source.label for source in CHAIN[3:]],
diff --git a/src/peach/organize.py b/src/peach/organize.py
index 83a57592c..82d7f0509 100644
--- a/src/peach/organize.py
+++ b/src/peach/organize.py
@@ -23,6 +23,7 @@ from pathlib import Path, PureWindowsPath
from .catalog_rules import is_jav_code, is_uncensored_release, normalise_code_key, part_marker
from .jobs import ACTIVE_ASSET_SQL
+from .task_retry import transient_delay
from .organize_templates import MAX_PATH, TemplateError, clean_filename, render, validate_template
from .platform import (is_windows_path, location_mounts, location_roots, resolve_root, root_online,
translate_ledger_path, within_root)
@@ -377,6 +378,16 @@ def _update_row(connection: sqlite3.Connection, asset_id: int,
).rowcount
+class MoveFailure(str):
+ """保留原有原因字符串,并把可自动恢复的移动失败带回批次结果。"""
+
+ def __new__(cls, reason: str, *, retry_after: float | None):
+ value = super().__new__(cls, reason)
+ value.retryable = retry_after is not None
+ value.retry_after = retry_after
+ return value
+
+
def _move_one(connection: sqlite3.Connection, asset_id: int,
old_path: str, new_path: str) -> str:
"""动一个文件并同步账本;返回 `ok` 或跳过/失败原因。
@@ -400,7 +411,7 @@ def _move_one(connection: sqlite3.Connection, asset_id: int,
try:
_rename(old_path, new_path)
except OSError as error:
- return f"改名失败:{error.strerror or error}"
+ return MoveFailure(f"改名失败:{error.strerror or error}", retry_after=transient_delay(error))
try:
if not _update_row(connection, asset_id, old_path, new_path):
raise OrganizeError("数据库里这一行已经变了")
@@ -454,7 +465,9 @@ def apply_plan(connection: sqlite3.Connection, rows: Sequence[dict], *,
"old_path": old_path, "new_path": new_path})
else:
failures.append({"asset_id": int(row["asset_id"]),
- "path": old_path, "reason": outcome})
+ "path": old_path, "reason": outcome,
+ "retryable": isinstance(outcome, MoveFailure) and outcome.retryable,
+ "retry_after": outcome.retry_after if isinstance(outcome, MoveFailure) else None})
save()
if progress:
progress(checked=index, total=len(movable))
diff --git a/src/peach/organize_clouddrive.py b/src/peach/organize_clouddrive.py
index f493df26b..b5aa64182 100644
--- a/src/peach/organize_clouddrive.py
+++ b/src/peach/organize_clouddrive.py
@@ -19,6 +19,7 @@ from google.protobuf import descriptor_pb2, descriptor_pool, message_factory
from google.protobuf.empty_pb2 import Empty
from . import organize
+from .task_retry import TRANSIENT_STATUS, RetryableIOError, transient_delay
from .downloads_clouddrive import CloudDriveClient, SERVICE, discover
from .downloads import CLOUDDRIVE_CREDENTIAL, DownloadSettings
from .follow_secrets import CredentialStore
@@ -177,6 +178,11 @@ class PikPakDav:
def request(self, method, path, **kwargs):
try:
with self.http.stream(method, self.url(path), **kwargs) as response:
+ if response.status_code in TRANSIENT_STATUS:
+ error = httpx.HTTPStatusError('WebDAV 暂时不可用',
+ request=httpx.Request(method, self.url(path)), response=response)
+ raise RetryableIOError('WebDAV 暂时不可用:' + str(response.status_code),
+ after=transient_delay(error) or 0)
chunks, size = [], 0
for chunk in response.iter_bytes():
size += len(chunk)
@@ -184,7 +190,10 @@ class PikPakDav:
raise ValueError('WebDAV 响应超过预算')
chunks.append(chunk)
return response.status_code, b''.join(chunks)
- except httpx.HTTPError:
+ except httpx.HTTPError as error:
+ delay = transient_delay(error)
+ if delay is not None:
+ raise RetryableIOError('WebDAV 网络应答未取得', after=delay) from None
raise OSError('WebDAV 网络应答未取得') from None
def list(self, path):
@@ -319,7 +328,9 @@ def _cloud_listing(cloud, path, mapping):
if len(rows) > MAX_FILES:
raise ValueError('官方目录成员超过预算')
except grpc.RpcError as error:
- raise OSError('官方完整目录未取得:' + error.code().name) from None
+ kind = RetryableIOError if error.code() in {
+ grpc.StatusCode.UNAVAILABLE, grpc.StatusCode.DEADLINE_EXCEEDED, grpc.StatusCode.ABORTED} else OSError
+ raise kind('官方完整目录未取得:' + error.code().name) from None
finally:
stream.cancel()
previous = rows
diff --git a/src/peach/resource_search.py b/src/peach/resource_search.py
index 072a13869..6e296d3e9 100644
--- a/src/peach/resource_search.py
+++ b/src/peach/resource_search.py
@@ -21,6 +21,7 @@ from xml.etree.ElementTree import ParseError, fromstring
import bencode2
import httpx
+from .task_retry import transient_delay
from torznab.exceptions import TorznabAPIError
from torznab.parser import parse_capabilities, parse_torznab
@@ -199,14 +200,14 @@ def _xml(client: httpx.Client, indexer: dict, params: dict, deadline: float) ->
params = {**params, "apikey": indexer.get("api_key", "")}
remaining = deadline - time.monotonic()
if remaining <= 0:
- raise ValueError("索引器查询超时")
+ raise TimeoutError("索引器查询超时")
with client.stream("GET", indexer["url"], params=params, timeout=min(10, remaining)) as response:
if response.status_code != 200:
- raise ValueError(f"索引器返回 HTTP {response.status_code}")
+ raise httpx.HTTPStatusError(f"索引器返回 HTTP {response.status_code}", request=response.request, response=response)
content = bytearray()
for chunk in response.iter_bytes(chunk_size=16384):
if time.monotonic() > deadline:
- raise ValueError("索引器查询超时")
+ raise TimeoutError("索引器查询超时")
content.extend(chunk)
if len(content) > MAX_BYTES:
raise ValueError("索引器响应超过 2 MiB")
@@ -268,7 +269,7 @@ class Search:
"error": "请在本机「配置 → 下载」中添加并启用索引器"}
if not self.lock.acquire(blocking=False):
return {"ok": False, "state": "busy", "items": [], "warnings": [],
- "error": "资源搜索正在进行,请稍后重试"}
+ "error": "资源搜索正在进行,请稍后重试", "retry_after": 0.0}
try:
key = (json.dumps(active, sort_keys=True), code, filters)
cached = self.cache.get(key)
@@ -288,6 +289,7 @@ class Search:
def _search(self, indexers: list[dict], code: str, filters: Filters) -> dict:
found: dict[str, dict] = {}
+ retry_delays = []
warnings = []
rejected: Counter = Counter()
successful = 0
@@ -321,8 +323,10 @@ class Search:
prior["seeders"] = max(prior["seeders"], row["seeders"])
else:
found[row["info_hash"]] = row
- except (httpx.HTTPError, UnicodeError, ParseError, TorznabAPIError):
+ except (httpx.HTTPError, TimeoutError, UnicodeError, ParseError, TorznabAPIError) as error:
warnings.append(f"{indexer['name']}:请求失败或响应格式不正确,请检查索引器")
+ if (delay := transient_delay(error)) is not None:
+ retry_delays.append(delay)
except ValueError as error:
warnings.append(f"{indexer['name']}:{error}")
def rank(row):
@@ -333,6 +337,7 @@ class Search:
counts = "、".join(f"{label} {rejected[key]} 条" for key, label in REJECT_REASONS.items() if rejected[key])
warnings.append(f"索引器返回了 {sum(rejected.values())} 条结果,都没通过筛选:{counts}")
return {"ok": successful > 0, "state": "ready" if successful else "error",
+ "retry_after": max(retry_delays) if retry_delays else None,
"items": sorted(found.values(), key=rank), "warnings": warnings,
"rejected": dict(rejected),
"error": "" if successful else "所有索引器都未能完成搜索"}
diff --git a/src/peach/task_retry.py b/src/peach/task_retry.py
new file mode 100644
index 000000000..3412c7113
--- /dev/null
+++ b/src/peach/task_retry.py
@@ -0,0 +1,81 @@
+"""搜索和入库后处理的有限重试策略,不重新提交已接受的云下载。"""
+from __future__ import annotations
+
+import errno
+import math
+import sqlite3
+import ssl
+import time
+from email.utils import parsedate_to_datetime
+
+import httpx
+
+RETRY_DELAYS = (60.0, 300.0, 1800.0)
+TRANSIENT_STATUS = frozenset({408, 425, 429, 500, 502, 503, 504})
+
+
+class RetryableTaskError(RuntimeError):
+ """底层已经确认属于暂时故障,保留来源要求的最早重试间隔。"""
+
+ def __init__(self, message: str, *, after: float = 0):
+ super().__init__(message)
+ self.after = after
+
+
+class RetryableIOError(OSError):
+ """文件服务已确认的暂时故障,仍沿用整理器的 OSError 契约。"""
+
+ def __init__(self, message: str, *, after: float = 0):
+ super().__init__(message)
+ self.after = after
+
+
+def transient_delay(error: BaseException) -> float | None:
+ """返回来源要求的间隔;None 表示同样的输入不应自动重试。"""
+ from .sources.base import FailureReason, SourceFailure
+ from .metadata import MetadataProviderError
+ cause = error
+ for _ in range(8):
+ if isinstance(cause, ssl.SSLCertVerificationError):
+ return None
+ cause = cause.__cause__
+ if cause is None:
+ break
+ if isinstance(error, (RetryableTaskError, RetryableIOError)):
+ return error.after
+ if isinstance(error, SourceFailure):
+ if error.reason == FailureReason.RATE_LIMITED:
+ return 900.0
+ return 0.0 if error.reason in {
+ FailureReason.NETWORK, FailureReason.TIMEOUT, FailureReason.SERVER_ERROR} else None
+ if isinstance(error, MetadataProviderError):
+ return (900.0 if error.detail == 'rate_limited' else 0.0) if error.retryable else None
+ if isinstance(error, httpx.HTTPStatusError):
+ if error.response.status_code not in TRANSIENT_STATUS:
+ return None
+ raw = error.response.headers.get('Retry-After', '')
+ try:
+ delay = float(raw) if raw.isdecimal() else parsedate_to_datetime(raw).timestamp() - time.time()
+ if math.isfinite(delay):
+ return max(0.0, delay)
+ except (TypeError, ValueError, OverflowError):
+ pass
+ return 900.0 if error.response.status_code == 429 else 0.0
+ if isinstance(error, httpx.TransportError):
+ return 0.0
+ if isinstance(error, sqlite3.OperationalError):
+ code = getattr(error, 'sqlite_errorcode', 0)
+ return 0.0 if code & 255 in {sqlite3.SQLITE_BUSY, sqlite3.SQLITE_LOCKED} else None
+ if isinstance(error, (ConnectionError, TimeoutError)):
+ return 0.0
+ if isinstance(error, OSError):
+ return 0.0 if error.errno in {
+ errno.EAGAIN, errno.EBUSY, errno.ETIMEDOUT, errno.ECONNRESET, errno.ECONNREFUSED,
+ errno.ENETDOWN, errno.ENETUNREACH, errno.EHOSTUNREACH,
+ } or getattr(error, 'winerror', None) in {21, 32, 33, 53, 64, 121, 1231, 1232} else None
+ return None
+
+
+def retry_delay(error: BaseException, completed_retries: int) -> float | None:
+ delay = transient_delay(error)
+ return max(RETRY_DELAYS[completed_retries], delay) if delay is not None and completed_retries < len(RETRY_DELAYS) else None
diff --git a/src/peach/web_resource_search.py b/src/peach/web_resource_search.py
index 8be3104d4..9199b52e3 100644
--- a/src/peach/web_resource_search.py
+++ b/src/peach/web_resource_search.py
@@ -48,4 +48,6 @@ def q_resource_search(contract, args) -> dict:
"trace": direct["trace"] + (["索引器后备:已查询"] if indexed.get("state") != "unavailable" else []),
"next_sources": direct["next_sources"], "reference_only": direct["reference_only"],
"error": "" if direct["items"] or indexed.get("ok") else indexed.get("error", ""),
+ "retry_after": max((value for value in (direct.get('retry_after'), indexed.get('retry_after'))
+ if value is not None), default=None),
}
diff --git a/tests/test_downloads_clouddrive_organize.py b/tests/test_downloads_clouddrive_organize.py
index 1751a22d2..73403e8ee 100644
--- a/tests/test_downloads_clouddrive_organize.py
+++ b/tests/test_downloads_clouddrive_organize.py
@@ -1,4 +1,5 @@
"""已声明来源的官方移动:冲突、成员核验、确定性拒绝与状态未知、路径边界。"""
+import ssl
import unittest
from pathlib import PureWindowsPath
from types import SimpleNamespace
@@ -11,6 +12,7 @@ import grpc
from peach.organize_clouddrive import (ACCEPTED, DAV_ORIGIN, REJECTED, MoveNotExecuted, PikPakDav,
UnconfirmedMove)
from peach import organize_clouddrive
+from peach.task_retry import transient_delay
MAPPING = organize_clouddrive.PikPakPaths('A:\\', '/Pikpak')
@@ -27,6 +29,37 @@ class ConfiguredPaths(unittest.TestCase):
def setUp(self):
self.mapping = organize_clouddrive.PikPakPaths('P:\\Library', '/My cloud/Movies', '/Movies')
+ def test_parent_creation_keeps_server_retry_after_but_stops_for_authentication(self):
+ for status, delay in ((429, 1200), (503, 1200), (401, None), (403, None)):
+ with self.subTest(status=status), httpx.Client(transport=httpx.MockTransport(
+ lambda request, status=status: httpx.Response(status, headers={'Retry-After': '1200'}))) as http:
+ dav = PikPakDav(http, self.mapping, Mock(), listing=lambda path: [], rename=Mock(), move_remote=Mock())
+ with self.assertRaises(OSError) as failure:
+ dav.ensure_parent('P:\\Library\\new\\film.mp4')
+ self.assertEqual(transient_delay(failure.exception), delay)
+
+ def test_certificate_failure_does_not_become_a_retryable_file_error(self):
+ error = httpx.ConnectError('证书校验失败')
+ error.__cause__ = ssl.SSLCertVerificationError('证书不可信')
+ with httpx.Client(transport=httpx.MockTransport(Mock(side_effect=error))) as http:
+ dav = PikPakDav(http, self.mapping, Mock(), listing=lambda path: [], rename=Mock(), move_remote=Mock())
+ with self.assertRaises(OSError) as failure:
+ dav.ensure_parent('P:\\Library\\new\\film.mp4')
+ self.assertIsNone(transient_delay(failure.exception))
+
+ def test_directory_network_failure_retries_but_permission_failure_stops(self):
+ for code, delay in ((grpc.StatusCode.UNAVAILABLE, 0), (grpc.StatusCode.DEADLINE_EXCEEDED, 0),
+ (grpc.StatusCode.PERMISSION_DENIED, None)):
+ with self.subTest(code=code):
+ stream = Mock()
+ stream.__iter__ = Mock(side_effect=Status(code))
+ cloud = Mock(token='test-token')
+ cloud.channel.unary_stream.return_value.return_value = stream
+ with self.assertRaises(OSError) as failure:
+ organize_clouddrive._cloud_listing(cloud, 'P:\\Library', self.mapping)
+ self.assertEqual(transient_delay(failure.exception), delay)
+ stream.cancel.assert_called_once()
+
def test_custom_drive_subdirectory_and_remote_name(self):
self.assertEqual(self.mapping.cloud_path('p:\\library\\人名\\a.mp4'), '/My cloud/Movies/人名/a.mp4')
self.assertEqual(self.mapping.dav_path('P:\\Library\\人名\\a.mp4'), '/Movies/人名/a.mp4')
diff --git a/tests/test_downloads_jav_browser.py b/tests/test_downloads_jav_browser.py
index d84f4fb26..3cecdd1ea 100644
--- a/tests/test_downloads_jav_browser.py
+++ b/tests/test_downloads_jav_browser.py
@@ -67,6 +67,45 @@ class BrowserTests(unittest.TestCase):
def status(self):
return self.client.get("/api/jav-browser", params={"code": "ABC-123"}, headers=self.script_headers)
+ def test_temporary_search_retries_persist_and_wait_until_due(self):
+ now = [1_800_000_000.0]
+ self.downloads.clock = lambda: now[0]
+ self.service.search.return_value = {'state': 'error', 'items': [], 'error': '请求超时', 'retry_after': 120.0}
+ self.add()
+ self.service.process_one()
+ status = self.status().json()
+ self.assertEqual((status['state'], status['retry_attempt']), ('queued', 1))
+ restored = JavBrowser(self.service.contract, search=self.service.search)
+ self.assertFalse(restored.process_one())
+ self.assertEqual(self.service.search.call_count, 1)
+ now[0] += 120
+ self.service.search.return_value = {'items': [{'name': 'ABC-123 1080p', 'uri': MAGNET}]}
+ self.assertTrue(restored.process_one())
+ self.assertEqual(restored.status('ABC-123')['state'], 'submitted')
+ self.remote.submit.assert_called_once()
+
+ def test_permanent_search_failure_is_not_automatically_requeued(self):
+ self.service.search.return_value = {'state': 'unavailable', 'items': [], 'error': '需要配置索引器'}
+ self.add()
+ self.service.process_one()
+ self.assertEqual(self.status().json()['state'], 'failed')
+ self.assertFalse(self.service.process_one())
+
+ def test_postprocess_retry_is_dispatched_by_the_download_scheduler_after_restart(self):
+ now = [1_800_000_000.0]
+ self.downloads.clock = lambda: now[0]
+ task = self.downloads.store.save(dl.DownloadTask(id=0, info_hash=HASH, provider='115', source_uri=MAGNET,
+ display_name='ABC-123', target='/115/Movies', state=dl.INGESTED, postprocess_state=dl.POSTPROCESS_PENDING))
+ self.downloads.store.fail_postprocess(task.id, TimeoutError('暂时超时'), now=now[0])
+ restored = dl.DownloadStore(self.downloads.store.database)
+ self.assertEqual(restored.pending_postprocess(now[0]), [])
+ self.assertEqual(self.downloads.poll_once(), 0)
+ self.downloads.after_ingest = lambda value: self.downloads.store.postprocess(value.id, dl.POSTPROCESS_QUEUED)
+ now[0] += 60
+ self.assertEqual(self.downloads.poll_once(), 1)
+ self.assertEqual(restored.get(task.id).postprocess_state, dl.POSTPROCESS_QUEUED)
+ self.remote.submit.assert_not_called()
+
def test_queued_request_searches_then_uses_the_cloud_download_contract(self):
self.assertEqual(self.status().json()["state"], "idle")
response = self.add()
@@ -360,6 +399,26 @@ class BrowserTests(unittest.TestCase):
self.downloads.store.save(task)
self.assertEqual(self.status().json()["state"], "failed")
+ def test_library_ownership_keeps_the_latest_unfinished_postprocessing_visible_without_queue_cache(self):
+ self.add()
+ self.service.process_one()
+ task = self.downloads.store.get(self.status().json()['task_id'])
+ with self.downloads.store.database.write_transaction() as connection:
+ asset_id = connection.execute('INSERT INTO asset(path,name,location,medium,code) VALUES(?,?,?,?,?)',
+ (r'C:\Media\ABC-123.mp4', 'ABC-123.mp4', 'local', 'video', 'ABC-123')).lastrowid
+ task.state, task.asset_id = dl.INGESTED, asset_id
+ self.downloads.store.save(task)
+ self.downloads.store.postprocess(task.id, dl.POSTPROCESS_FAILED, detail='需要检查挂载')
+ self.service.rows.clear()
+ status = self.status().json()
+ self.assertEqual((status['state'], status['task_id'], status['download']['postprocess_state']),
+ ('ingested', task.id, dl.POSTPROCESS_FAILED))
+ self.assertEqual(self.service.active()['items'][0]['download']['postprocess_state'], dl.POSTPROCESS_FAILED)
+ self.downloads.store.fail_postprocess(task.id, TimeoutError('暂时断开'))
+ self.assertEqual(self.status().json()['retry_attempt'], 1)
+ self.downloads.store.postprocess(task.id, dl.POSTPROCESS_COMPLETE)
+ self.assertEqual(self.status().json()['state'], 'owned')
+
def test_status_projects_remote_progress_and_postprocessing_without_private_task_fields(self):
self.add()
self.service.process_one()
diff --git a/tests/test_downloads_postprocess.py b/tests/test_downloads_postprocess.py
index c993a308c..73b62cfe6 100644
--- a/tests/test_downloads_postprocess.py
+++ b/tests/test_downloads_postprocess.py
@@ -47,6 +47,7 @@ class DownloadPostprocessTests(unittest.TestCase):
postprocess_state=POSTPROCESS_PENDING))
self.contract = SimpleNamespace(
database=self.database, db_path=self.database.db_path,
+ downloads=SimpleNamespace(wake=Mock(), clock=time.time),
candidate_root=self.root / 'generated',
download_organize_templates=lambda: {'115': {'file': '{code}'}}, cache_bust=lambda: None)
self.handle = SimpleNamespace(progress=lambda **_: None)
@@ -66,6 +67,53 @@ class DownloadPostprocessTests(unittest.TestCase):
def run_task(self):
return post.run(self.contract, post.followup_key(self.task.id), self.handle)
+ def test_temporary_failure_is_scheduled_and_only_three_retries_are_allowed(self):
+ from peach.downloads import parse_iso
+ from peach.task_retry import RETRY_DELAYS
+ started = 1_800_000_000.0
+ self.contract.downloads.clock = lambda: started
+ with patch.object(post, '_collect', side_effect=TimeoutError('来源连接超时')):
+ for attempt, delay in enumerate(RETRY_DELAYS, 1):
+ with self.assertRaises(TimeoutError):
+ self.run_task()
+ task = self.store.get(self.task.id)
+ self.assertEqual((task.postprocess_state, task.postprocess_retries), ('pending', attempt))
+ self.assertEqual(parse_iso(task.next_check_at), started + delay)
+ self.assertEqual(self.store.pending_postprocess(started), [])
+ self.assertEqual([row.id for row in self.store.pending_postprocess(parse_iso(task.next_check_at))], [task.id])
+ started += delay
+ with self.assertRaises(TimeoutError):
+ self.run_task()
+ task = self.store.get(self.task.id)
+ self.assertEqual(task.postprocess_state, 'failed')
+ self.assertIsNone(task.next_check_at)
+ self.assertIn('自动重试 3 次', task.postprocess_detail)
+
+ def test_offline_mount_retries_but_target_collision_stops_immediately(self):
+ with patch.object(post.organize, 'build_plan', return_value={
+ 'rows': [{'action': 'skip', 'reason': post.organize.SKIP_OFFLINE}],
+ 'reasons': {post.organize.SKIP_OFFLINE: 1}}), self.assertRaises(RuntimeError):
+ self.run_task()
+ self.assertEqual(self.store.get(self.task.id).postprocess_state, 'pending')
+ with patch.object(post.organize, 'build_plan', return_value={
+ 'rows': [{'action': 'skip', 'reason': post.organize.SKIP_TARGET_EXISTS}],
+ 'reasons': {post.organize.SKIP_TARGET_EXISTS: 1}}), self.assertRaises(RuntimeError):
+ self.run_task()
+ self.assertEqual(self.store.get(self.task.id).postprocess_state, 'failed')
+ self.assertIsNone(self.store.get(self.task.id).next_check_at)
+
+ def test_collection_retry_uses_structured_failure_instead_of_the_error_message(self):
+ log = self.root / 'issues.jsonl'
+ import json
+ state = {'issues_log': str(log), 'issue_count': 1}
+ issue = {'asset_id': self.asset_id, 'severity': 'error', 'retryable': True,
+ 'diagnostics': {'failures': [{'automatic_retry_delay': 900.0}]}}
+ log.write_text(json.dumps(issue) + '\n', encoding='utf-8')
+ self.assertEqual(post._collection_retry_delay(state, self.asset_id), 900)
+ issue['diagnostics'] = {'failures': [{'automatic_retry_delay': None}]}
+ log.write_text(json.dumps(issue) + '\n', encoding='utf-8')
+ self.assertIsNone(post._collection_retry_delay(state, self.asset_id))
+
def test_existing_unrelated_foreign_key_violation_is_reported_without_failing_the_move(self):
with self.database.write_transaction() as connection:
connection.execute("INSERT INTO media_binding(asset_id,backend,external_id) VALUES(99999,'test','x')")
diff --git a/tests/test_downloads_retry.py b/tests/test_downloads_retry.py
new file mode 100644
index 000000000..3c3e26003
--- /dev/null
+++ b/tests/test_downloads_retry.py
@@ -0,0 +1,88 @@
+"""后台暂时故障的分类、退避与停止条件,只使用临时任务和假响应。"""
+import errno
+from contextlib import closing
+from pathlib import Path
+import shutil
+import sqlite3
+import ssl
+import tempfile
+import unittest
+
+import httpx
+
+from peach.task_retry import RETRY_DELAYS, retry_delay, transient_delay
+from peach.sources.base import FailureReason, SourceFailure
+from peach import migrations
+
+
+class RetryPolicyTests(unittest.TestCase):
+ def test_network_and_temporary_file_errors_back_off_then_stop(self):
+ for error in [TimeoutError(), ConnectionResetError(), OSError(errno.EBUSY, '文件暂时被占用'),
+ SourceFailure(FailureReason.NETWORK, '请求未取得')]:
+ with self.subTest(error=type(error).__name__):
+ self.assertEqual([retry_delay(error, index) for index in range(4)], [*RETRY_DELAYS, None])
+
+ def test_credentials_integrity_disk_and_program_errors_do_not_retry(self):
+ for error in [PermissionError(), FileNotFoundError(), OSError(errno.ENOSPC, '磁盘已满'),
+ sqlite3.IntegrityError(), ValueError(), RuntimeError(),
+ SourceFailure(FailureReason.AUTH_REQUIRED, '需要登录'),
+ SourceFailure(FailureReason.PARSE_ERROR, '页面已改版')]:
+ with self.subTest(error=type(error).__name__):
+ self.assertIsNone(transient_delay(error))
+
+ def test_http_retry_after_is_respected_and_authentication_is_not_replayed(self):
+ request = httpx.Request('GET', 'https://example.invalid/source')
+ for status, expected in [(429, 1200.0), (503, 1200.0), (401, None), (403, None), (404, None)]:
+ response = httpx.Response(status, headers={'Retry-After': '1200'}, request=request)
+ error = httpx.HTTPStatusError('来源未取得', request=request, response=response)
+ self.assertEqual(retry_delay(error, 0), expected)
+ error = httpx.ConnectError('证书未通过校验')
+ error.__cause__ = ssl.SSLCertVerificationError('证书不可信')
+ self.assertIsNone(transient_delay(error))
+
+ def test_invalid_retry_after_keeps_a_finite_schedule(self):
+ request = httpx.Request('GET', 'https://example.invalid/source')
+ for header in ('invalid', '9' * 400):
+ with self.subTest(header=header[:20]):
+ response = httpx.Response(429, headers={'Retry-After': header}, request=request)
+ error = httpx.HTTPStatusError('来源限流', request=request, response=response)
+ self.assertEqual(retry_delay(error, 0), 900)
+
+ def test_sqlite_lock_codes_are_transient_but_missing_schema_is_not(self):
+ with sqlite3.connect(':memory:') as db:
+ try:
+ db.execute('SELECT * FROM missing_table')
+ except sqlite3.OperationalError as error:
+ self.assertIsNone(transient_delay(error))
+ error = sqlite3.OperationalError('数据库被占用')
+ error.sqlite_errorcode = sqlite3.SQLITE_BUSY
+ self.assertEqual(transient_delay(error), 0)
+
+
+class RetryUpgradeTests(unittest.TestCase):
+ def test_existing_task_keeps_its_remote_identity_path_and_failure_during_upgrade(self):
+ directory = Path(__file__).resolve().parents[1] / 'migrations'
+ with tempfile.TemporaryDirectory() as temporary:
+ root = Path(temporary).resolve()
+ previous = root / 'previous'
+ previous.mkdir()
+ for migration in migrations.discover(directory):
+ if migration.version < '0051':
+ shutil.copyfile(migration.path, previous / migration.path.name)
+ database = root / 'ledger.db'
+ migrations.upgrade(database, previous)
+ with closing(sqlite3.connect(database)) as connection:
+ connection.row_factory = sqlite3.Row
+ connection.execute("INSERT INTO download_task(provider,source_uri,target,state,updated_at,remote_id,"
+ "ledger_path,postprocess_state,postprocess_detail) VALUES(?,?,?,?,?,?,?,?,?)",
+ ('115', 'test-magnet', '/Movies', 'ingested', '2026-01-01T00:00:00Z', 'remote-1',
+ r'C:\Media\film.mp4', 'failed', '需要检查挂载'))
+ connection.commit()
+ before = dict(connection.execute('SELECT * FROM download_task').fetchone())
+ self.assertEqual([item.version for item in migrations.upgrade(database, directory)], ['0051'])
+ with closing(sqlite3.connect(database)) as connection:
+ connection.row_factory = sqlite3.Row
+ after = dict(connection.execute('SELECT * FROM download_task').fetchone())
+ self.assertEqual(after.pop('postprocess_retries'), 0)
+ self.assertEqual(after, before)
+ self.assertEqual(migrations.upgrade(database, directory), [])
diff --git a/web/integrations/jav-userscript-release.json b/web/integrations/jav-userscript-release.json
index 2a31ae6b6..001599106 100644
--- a/web/integrations/jav-userscript-release.json
+++ b/web/integrations/jav-userscript-release.json
@@ -1,12 +1,12 @@
{
- "version": "0.7.4",
+ "version": "0.7.5",
"repository": "https://github.com/peach-mitao/peach-userscript",
- "commit": "3f39494a9f2d734474f97d89948cdbc2f606476e",
+ "commit": "118fa6907ea3ba3535372a62b1eb53e23deeea85",
"install_url": "/integrations/peach-jav.user.js",
"bridge_min_version": "0.5.1",
"site_schema_version": 1,
"files": {
- "peach-jav.user.js": "cfd5ac58881f8b50f30eeb51533e2bfdc0c4d6304e9ce5df2cb56af17fce6b48",
+ "peach-jav.user.js": "2baf76f625ba42d54a02a30073d7ad6a12ea482132635616212cfaf166001a9f",
"jav-sites.json": "e443e6372bf41c918c8fec9fd3c1f0a22f854ab0541f3ad2fbda2c0f25ad2d4e"
}
}
diff --git a/web/integrations/peach-jav.user.js b/web/integrations/peach-jav.user.js
index 4e3fc4191..7a25434ec 100644
--- a/web/integrations/peach-jav.user.js
+++ b/web/integrations/peach-jav.user.js
@@ -12,7 +12,7 @@
// @updateURL https://update.sleazyfork.org/scripts/600821/Peach%20%C2%B7%20JAV%20%E5%85%A5%E5%BA%93.meta.js
// @downloadURL https://update.sleazyfork.org/scripts/600821/Peach%20%C2%B7%20JAV%20%E5%85%A5%E5%BA%93.user.js
// @license AGPL-3.0-or-later
-// @version 0.7.4
+// @version 0.7.5
// @description Detect video codes on web pages, select titles, and send them to Peach for download and library import.
// @description:zh-CN 识别网页中的番号,选择影片并交给 Peach 下载入库。
// @description:zh-TW 識別網頁中的番號,選擇影片並交給 Peach 下載入庫。
@@ -291,7 +291,7 @@
const STORAGE_POSITION = 'peach.jav.position';
const STORAGE_APPEARANCE = 'peach.jav.appearance';
const ROOT_ID = 'peach-jav-action';
- const SCRIPT_VERSION = "0.7.4";
+ const SCRIPT_VERSION = "0.7.5";
// 0.6.3 起默认名改为英文;发布页切换前仍返回原名。
const PUBLISHED_NAMES = ['Peach Userscript', 'Peach · JAV 入库'];
const PEACH_LOGO = "data:image/png;base64,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";
@@ -803,12 +803,22 @@
function savedPosition() {
try {
const value = JSON.parse(GM_getValue(STORAGE_POSITION, '{}'));
- return value.version === 1 && ['right','bottom'].every(key => typeof value[key] === 'number'
- && Number.isFinite(value[key]) && value[key] >= 0 && value[key] <= 1) ? value : null;
+ if (!['right','bottom'].every(key => typeof value[key] === 'number'
+ && Number.isFinite(value[key]) && value[key] >= 0)) return null;
+ if (value.version === 2) return value;
+ if (value.version === 1 && value.right <= 1 && value.bottom <= 1) {
+ const migrated = {version:2,
+ right:16 + value.right * Math.max(0, document.documentElement.clientWidth - 80),
+ bottom:16 + value.bottom * Math.max(0, innerHeight - 80)};
+ GM_setValue(STORAGE_POSITION, JSON.stringify(migrated));
+ return migrated;
+ }
+ return null;
} catch { return null; }
}
function placeSurface(root) {
+ if (root.hasAttribute('data-dragging')) return;
const value = savedPosition();
if (!value) return;
const viewportWidth=document.documentElement.clientWidth;
@@ -816,8 +826,8 @@
: root.dataset.panelMode === 'minimized' ? 48 : Math.min(320, viewportWidth - 32);
const dialog = (root.shadowRoot || root).querySelector('dialog[open]');
const height = Math.min((dialog || root).getBoundingClientRect().height || 48, innerHeight - 32);
- const right = Math.max(16, Math.min(16 + value.right * Math.max(0, viewportWidth - 80), viewportWidth - width - 16));
- const bottom = Math.max(16, Math.min(16 + value.bottom * Math.max(0, innerHeight - 80), innerHeight - height - 16));
+ const right = Math.max(16, Math.min(value.right, viewportWidth - width - 16));
+ const bottom = Math.max(16, Math.min(value.bottom, innerHeight - height - 16));
root.style.right = `${right}px`; root.style.bottom = `${bottom}px`;
root.style.setProperty('--panel-right', `${right}px`); root.style.setProperty('--panel-bottom', `${bottom}px`);
}
@@ -855,10 +865,8 @@
const finish = event => {
if (!drag || event.pointerId !== drag.id) return;
if (drag.moved && event.type === 'pointerup') {
- const box = root.getBoundingClientRect();
- GM_setValue(STORAGE_POSITION, JSON.stringify({version:1,
- right:Math.max(0, Math.min(1, (document.documentElement.clientWidth-box.right-16)/Math.max(1, document.documentElement.clientWidth-80))),
- bottom:Math.max(0, Math.min(1, (innerHeight-box.bottom-16)/Math.max(1, innerHeight-80)))}));
+ GM_setValue(STORAGE_POSITION, JSON.stringify({version:2,
+ right:Number.parseFloat(root.style.right), bottom:Number.parseFloat(root.style.bottom)}));
suppressClickUntil = performance.now()+250;
}
if (drag.handle.hasPointerCapture(event.pointerId)) drag.handle.releasePointerCapture(event.pointerId);
@@ -1484,7 +1492,7 @@
paintPerformer(performer);
const folded = expanded && entryCollapsed;
updateEntry.root.dataset.panelMode = !expanded ? 'minimized' : folded ? 'collapsed' : 'expanded';
- updateEntry.body.hidden = folded; updateEntry.body.inert = folded;
+ updateEntry.body.hidden = folded || Boolean(updateEntry.panel.taskPage); updateEntry.body.inert = folded;
updateEntry.collapse.setAttribute('aria-expanded', String(!folded));
updateEntry.collapse.setAttribute('aria-label', folded ? '展开 Peach 详情' : '折叠 Peach 详情');
placeSurface(updateEntry.root);
@@ -1711,8 +1719,13 @@
function rowState(body) {
const download = body.download;
if (body.state === 'idle') return ['pending'];
+ const retry = automaticRetryText(body);
+ if (retry) return [body.state === 'ingested' ? 'organizing' : 'queued', retry, '待自动重试'];
if (body.state === 'failed') return ['failed', failureText(body), {magnet:'磁力失效', cloud:'网盘问题'}[body.cause] || '失败'];
if (body.state === 'no_match') return ['no_match', failureText(body)];
+ if (organizeFailed(body)) return ['failed', body.retry_exhausted === true
+ ? '影片已入库,整理自动重试已用尽,可在任务进度页手动重试整理。'
+ : '影片已入库,后续整理失败,可在任务进度页重试整理。', '整理失败'];
if (body.state === 'submitted' && ['remote_done', 'landed'].includes(download?.state)) return ['importing', download.label || '入库中'];
if (body.state === 'submitted' && download?.state === 'submit_pending') return ['submitted', '等待自动重新提交', '待重新提交'];
if (body.state === 'submitted' && download?.state === 'remote_running' && typeof download.progress === 'number' && Number.isFinite(download.progress)) {
@@ -2299,6 +2312,15 @@
&& ['pending', 'queued', 'running'].includes(body.download?.postprocess_state));
}
+ function automaticRetryText(body) {
+ if (body.state !== 'queued' && !(body.state === 'ingested' && body.download?.postprocess_state === 'pending')) return '';
+ if (typeof body.retry_at !== 'string' || !Number.isFinite(Date.parse(body.retry_at))
+ || !Number.isSafeInteger(body.retry_attempt) || !Number.isSafeInteger(body.retry_limit)
+ || body.retry_attempt < 1 || body.retry_limit < body.retry_attempt || body.retry_limit > 10) return '';
+ const time = new Date(body.retry_at).toLocaleString([], {month:'numeric', day:'numeric', hour:'2-digit', minute:'2-digit'});
+ return `${body.state === 'ingested' ? '影片已入库,整理暂时失败' : '搜索暂时不可用'},等待 ${time} 自动重试(${body.retry_attempt}/${body.retry_limit})`;
+ }
+
function organizeFailed(body) {
return body.state === 'ingested' && body.download?.postprocess_state === 'failed';
}
@@ -2887,6 +2909,8 @@
// 状态说明:下载任务的具体阶段、整理状态与百分比,失败时给出原因;浮卡与其他任务的进度页共用。
function statusLabel(body) {
+ const retry = automaticRetryText(body);
+ if (retry) return retry;
const download = body.download;
const known = download && ['submit_pending', 'submitted', 'remote_running', 'remote_done', 'landed', 'ingested', 'failed', 'cancelled', 'stalled'].includes(download.state);
let label = body.stage === 'submitting' ? '正在提交网盘' : LABELS[body.state];
@@ -2900,7 +2924,7 @@
}
}
if (['failed', 'no_match'].includes(body.state) && body.stage !== 'submitting') label = failureText(body);
- return label;
+ return body.retry_exhausted === true ? `${label};自动重试已用尽,请手动重试。` : label;
}
// 五段整体进度;结构与尺寸复用 Peach 生产 Progress 的 SVG 快照。