Skip to content

armgit / peach

Public Imported from GitHub
0

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

feat(covers): 详情页可按番号立即重取官方封面

longmeidao59c375fb58df
diff --git a/src/peach/web_jav_detail.py b/src/peach/web_jav_detail.py
index bdf015175..3605b530e 100644
--- a/src/peach/web_jav_detail.py
+++ b/src/peach/web_jav_detail.py
@@ -230,6 +230,32 @@ def q_jav_reviews(contract, args) -> dict:
"message": ""}
+def w_jav_cover(contract, body) -> dict:
+ """详情页「立即重试」:按番号取官方封面装进本机封面目录,与后台补封面同一条路。
+
+ 只写封面目录与取图记录,不写账本;同步等到取完,`feed_followup.COVER_SECONDS` 封顶。
+ 没取到时 `message` 是取图记录里那句去掉来源地址的原因。
+ """
+ from . import feed_followup
+ code = detail_code(body)
+ with contract.database.read_connection() as connection:
+ row = connection.execute("SELECT cover_url FROM feed_discovery WHERE code=? COLLATE NOCASE LIMIT 1",
+ (code,)).fetchone()
+ message = ''
+ try:
+ feed_followup.ensure_cover(contract, code, row[0] if row else None)
+ except Exception: # noqa: BLE001 - 原因已写进取图记录,下面读它
+ try:
+ record = json.loads(feed_followup.cover_attempt_path(contract.cover_root, code).read_text(encoding='utf-8'))
+ except (OSError, ValueError):
+ record = {}
+ message = str(record.get('reason') or '') if isinstance(record, dict) else ''
+ contract.cache_bust()
+ covered = contract.has_cover(code)
+ return {"ok": True, "code": code, "has_cover": covered, "cover_version": contract.cover_version(code),
+ "message": '' if covered else message or '没有找到可用的官方封面'}
+
+
#: 来源图片在浏览器里留多久。样张与来源封面落盘后不再刷新;来源头像在服务端按
#: `AVATAR_REFRESH_SECONDS` 换新,浏览器只留一天,换过的图第二天就看得到。
JAV_IMAGE_MAX_AGE = 30 * 86400
diff --git a/src/peach/web_router.py b/src/peach/web_router.py
index fa0b9363b..d756721ef 100644
--- a/src/peach/web_router.py
+++ b/src/peach/web_router.py
@@ -53,7 +53,7 @@ from .web_entity import (
from .web_downloads import (q_downloads, w_download_cancel, w_download_postprocess,
w_download_submit)
from .web_resource_search import q_resource_search
-from .web_jav_detail import q_jav_detail, q_jav_resources, q_jav_reviews
+from .web_jav_detail import q_jav_detail, q_jav_resources, q_jav_reviews, w_jav_cover
from .web_jav_discovery import q_jav_discoveries
from .web_feeds import (
q_feed_check,
@@ -429,6 +429,7 @@ POST_HANDLERS = {
"/api/thumbnail-jobs": w_thumbnail_jobs,
"/api/scraping/settings": w_scraping_settings,
"/api/scraping/cover": w_scraping_cover,
+ "/api/jav/cover": w_jav_cover,
"/api/scraping/check": w_scraping_check,
"/api/scraping/amane-bridge/check": w_scraping_amane_check,
"/api/scraping/amane-bridge/rebuild": w_scraping_amane_rebuild,
diff --git a/tests/test_feeds_web.py b/tests/test_feeds_web.py
index fc3d9b15e..c83e8930c 100644
--- a/tests/test_feeds_web.py
+++ b/tests/test_feeds_web.py
@@ -713,6 +713,16 @@ class FeedWebTest(FeedWebFixture):
self.assertFalse(attempt['ok'])
self.assertIn('error_type', attempt)
+ def test_detail_retry_installs_the_cover_or_reports_the_recorded_reason(self):
+ self.cover_misses.add("HMN-071")
+ missed = dispatch_api_post(self.contract, "/api/jav/cover", {"code": "hmn-071"})
+ self.assertEqual((missed["code"], missed["has_cover"], missed["message"]),
+ ("HMN-071", False, "封面处理未完成"))
+ got = dispatch_api_post(self.contract, "/api/jav/cover", {"code": "SSIS-950"})
+ self.assertEqual((got["has_cover"], got["message"]), (True, ""))
+ self.assertTrue(got["cover_version"])
+ self.assertTrue((self.contract.cover_root / "SSIS-950.poster.json").is_file())
+
def test_official_miss_does_not_install_a_bound_javdb_image(self):
from peach.jav_cover_fetch import Unavailable
self._add()
diff --git a/tests/test_rm_web.py b/tests/test_rm_web.py
index 4749f822b..4679989f6 100644
--- a/tests/test_rm_web.py
+++ b/tests/test_rm_web.py
@@ -1542,7 +1542,7 @@ class WebDataTests(unittest.TestCase):
"/api/downloads", "/api/downloads/cancel", "/api/downloads/postprocess",
"/api/library-processing", "/api/thumbnail-jobs", "/api/media-repair",
"/api/media-processing",
- "/api/scraping/settings", "/api/scraping/check", "/api/scraping/cover",
+ "/api/scraping/settings", "/api/scraping/check", "/api/scraping/cover", "/api/jav/cover",
"/api/scraping/amane-bridge/check", "/api/scraping/amane-bridge/rebuild",
"/api/activity", "/api/play", "/api/feedback", "/api/watch-later",
"/api/playlist",