Peach: Local-first video metadata scraper and media manager.
fix(diagnostics): 诊断包收集封面处理结果与资料任务状态
longmeidaocf9d6cfcae5e
diff --git a/docs/DIAGNOSTICS.md b/docs/DIAGNOSTICS.mdindex 05aab98bc..4e83182d1 100644--- a/docs/DIAGNOSTICS.md+++ b/docs/DIAGNOSTICS.md@@ -120,8 +120,9 @@- `logs/<目录序号>/`:托盘、服务、重启、首次扫描、源码更新、隧道、错误及崩溃日志;固定日志包含近期自然月分段。- `processing/`:馆藏处理状态与近期问题清单、启动准备、自动更新、独立包更新及隧道状态。- `updates/`:近期更新迁移日志。+- `covers/`:发现页逐番号的封面处理结果(`feed-cover-attempts/<番号>.json`)与资料任务状态;资料缓存本身留在本机。-每个文件读取尾部最多 96 KiB;错误日志最多 8 份、崩溃日志最多 4 份、处理问题清单最多 8 份、迁移日志最多 2 份。截断和读取失败进入收集回执,单个不可读文件不影响其他证据。JSON 与 JSONL 分别解析,正在写入的残行不进入共享报告。日志保留周期沿用半年及自然月分段策略。+每个文件读取尾部最多 96 KiB;错误日志最多 8 份、崩溃日志最多 4 份、处理问题清单最多 8 份、迁移日志最多 2 份、封面处理结果按修改时间取最近 500 份。截断和读取失败进入收集回执,单个不可读文件不影响其他证据。JSON 与 JSONL 分别解析,正在写入的残行不进入共享报告。日志保留周期沿用半年及自然月分段策略。ZIP 不包含 ledger、配置文件、私钥、登录 Cookie 或媒体文件。路径、网址、地址、凭据字段及命令行凭据值脱敏;处理记录中的媒体名称隐藏。故障注入的默认日志落在测试进程临时目录。diff --git a/src/peach/support_bundle.py b/src/peach/support_bundle.pyindex c520d05ec..f6f7025df 100644--- a/src/peach/support_bundle.py+++ b/src/peach/support_bundle.py@@ -17,6 +17,8 @@ LOG_NAMES = ("tray.log", "tray-lifecycle.log", "tray-setup.err.log", "tray-setupSTATE_NAMES = ('library-processing.json', 'runtime-prepare.json', 'standalone-update.json','automatic-updates.json', 'windows-source-sync.json', 'cloudflare-tunnel.json','remote-reporting-delivery.json', 'library-sharing-attempt.json')+#: 发现页封面逐番号处理结果的份数上限;每份只有几十字节,排查缺封面靠它们。+COVER_ATTEMPT_LIMIT = 500TAIL_BYTES = 96 * 1024@@ -106,10 +108,16 @@ def _archive_state(archive, directory, entries):_archive_files(archive, directory, migrations, 'updates', entries)+def _archive_covers(archive, directory, entries):+ candidates = [directory / 'jav-discovery-metadata.job.json']+ candidates += _recent(directory, 'feed-cover-attempts/*.json', COVER_ATTEMPT_LIMIT, entries)+ _archive_files(archive, directory, candidates, 'covers', entries, structured=True)++def bundle_bytes(*, report: dict | None = None, config=None) -> bytes:facts = {"created_at": datetime.now(timezone.utc).isoformat(), "system": error_reporting.system_facts()}directories = error_reporting.log_directories()- processing_directory = None+ processing_directory = generated_directory = Nonetry:from . import settings_fileconfig = config or settings_file.load_config()@@ -117,6 +125,7 @@ def bundle_bytes(*, report: dict | None = None, config=None) -> bytes:"port": config.server.port}directories.insert(0, config.directory("logs"))processing_directory = config.directory('state')+ generated_directory = config.directory('generated')from .ffmpeg import FFmpegResolver, binary_diagnosticsresolver = FFmpegResolver(config.directory('tools') / 'ffmpeg')facts['media_tools'] = {'ffmpeg': binary_diagnostics(resolver.ffmpeg(), decoders=True),@@ -125,7 +134,7 @@ def bundle_bytes(*, report: dict | None = None, config=None) -> bytes:facts["configuration"] = {"status": "unavailable", **error_reporting.exception_facts(error)}try:root, _ = settings_file.discover_data_root()- processing_directory = root / 'state'+ processing_directory, generated_directory = root / 'state', root / 'generated'except Exception:passif report:@@ -151,6 +160,11 @@ def bundle_bytes(*, report: dict | None = None, config=None) -> bytes:_archive_state(archive, processing_directory, entries)except OSError as error:entries.append({'name': '<state>', 'status': type(error).__name__})+ if generated_directory is not None:+ try:+ _archive_covers(archive, generated_directory, entries)+ except OSError as error:+ entries.append({'name': '<covers>', 'status': type(error).__name__})facts["logs"] = entriesarchive.writestr("report.json", json.dumps(error_reporting.scrub(facts), ensure_ascii=False, indent=2))return output.getvalue()diff --git a/tests/test_error_reporting.py b/tests/test_error_reporting.pyindex 642f9aca5..0356d30ef 100644--- a/tests/test_error_reporting.py+++ b/tests/test_error_reporting.py@@ -90,6 +90,28 @@ class ErrorReportingTests(unittest.TestCase):self.assertEqual(json.loads(archive.read('processing/library-sharing-attempt.json'))['status'], 'unknown')self.assertNotIn('processing/remote-reporting-frequency.json', archive.namelist())+ def test_support_bundle_contains_recent_cover_attempts_and_discovery_job(self):+ from peach.settings_file import PeachConfig+ config = PeachConfig(self.root, self.root / 'config.toml', present=True)+ attempts = config.directory('generated') / 'feed-cover-attempts'+ attempts.mkdir(parents=True)+ for index in range(3):+ path = attempts / f'ABC-00{index}.json'+ path.write_text(json.dumps({'code': f'ABC-00{index}', 'ok': False, 'error_type': 'Unavailable',+ 'reason': '来源地址 返回 403'}), encoding='utf-8')+ os.utime(path, (100 + index, 100 + index))+ (attempts.parent / 'jav-discovery-metadata.job.json').write_text(json.dumps({+ 'status': 'complete', 'total': 3, 'failed_codes': ['ABC-002']}), encoding='utf-8')+ (attempts.parent / 'jav-discovery-metadata.json').write_text('private-metadata-cache', encoding='utf-8')+ with mock.patch.object(error_reporting, 'log_directories', return_value=[]), \+ mock.patch.object(support_bundle, 'COVER_ATTEMPT_LIMIT', 2), \+ zipfile.ZipFile(io.BytesIO(support_bundle.bundle_bytes(config=config))) as archive:+ names = sorted(name for name in archive.namelist() if name.startswith('covers/'))+ self.assertEqual(names, ['covers/feed-cover-attempts/ABC-001.json', 'covers/feed-cover-attempts/ABC-002.json',+ 'covers/jav-discovery-metadata.job.json'])+ self.assertEqual(json.loads(archive.read('covers/feed-cover-attempts/ABC-002.json'))['error_type'], 'Unavailable')+ self.assertEqual(json.loads(archive.read('covers/jav-discovery-metadata.job.json'))['failed_codes'], ['ABC-002'])+def test_bundle_contains_update_tunnel_rotated_and_startup_evidence_with_invalid_config(self):from peach import settings_fileself.logs.mkdir()