Peach: Local-first video metadata scraper and media manager.
feat(follow): 新作接口按发行日期分页并给出订阅新作的筛选项
longmeidao168d232ffbc2
diff --git a/src/peach/web_jav_discovery.py b/src/peach/web_jav_discovery.pyindex 040c30f1b..18becc792 100644--- a/src/peach/web_jav_discovery.py+++ b/src/peach/web_jav_discovery.py@@ -208,3 +208,84 @@ def q_jav_discoveries(contract, args):"limited": len(candidates) > 4000, "source": "library" if scope == "library" else "known-works"}response.update(_metadata_response(contract, args, bounded, picked, limit, scope))return response+++RELEASE_PAGE_SIZE = 24+#: 新作的三个筛选维度:每部的女优(解析后的规范名)、厂牌(规范名)与标签。+RELEASE_FACETS = ("performer", "studio", "tag")+++def _release_values(row, facet):+ if facet == "performer":+ return [ref["name"] for ref in row["performer_refs"]]+ if facet == "studio":+ return [row["studio"]] if row["studio"] else []+ return row["tags"]+++def q_jav_releases(contract, args):+ """订阅发现的全部未入库新作:按发行日期倒序分页,可按女优、厂牌、标签与文字筛选。++ 候选与「发现」同一批(`_external`),只换成时间顺序、不按口味截断。筛选项只取这批新作里+ 出现过的女优、厂牌与标签;每个维度的计数按「文字与其他维度已生效、本维度不计」的行集算,+ 计数为 0 的不列。只读本机缓存的来源资料,不为翻页联网补资料。+ """+ try:+ size = max(1, min(int(args.get("size") or RELEASE_PAGE_SIZE), 100))+ page = max(1, int(args.get("page") or 1))+ except (TypeError, ValueError):+ size, page = RELEASE_PAGE_SIZE, 1+ chosen = {facet: str(args.get(facet) or "").strip() for facet in RELEASE_FACETS}+ query = str(args.get("q") or "").strip().casefold()+ with contract.read_connection() as connection:+ unique = {}+ for row in _external(connection, contract):+ unique.setdefault(web_catalog.normalise_code_key(row["code"]) or row["id"], row)+ rows = list(unique.values())+ refs = web_feeds._discovery_performers(connection, contract, rows)+ studios = {}+ for row in rows:+ row.pop("_source_actors", None)+ row["performer_refs"] = refs[int(row["id"])]+ row["performers"] = "、".join(ref["name"] for ref in row["performer_refs"])+ if row["studio"] and row["studio"] not in studios:+ studios[row["studio"]] = web_feeds._studio_name(connection, row["studio"])+ row["studio"] = studios.get(row["studio"], row["studio"])+ row.pop("entities", None)+ rows.sort(key=lambda row: (row["release_date"] or row["discovered_at"] or "", row["id"]), reverse=True)++ def matches(row, skip=None):+ if query and query not in " ".join([row["code"] or "", row["title"] or "", row["performers"], row["studio"] or "",+ *row["tags"]]).casefold():+ return False+ return all(not value or facet == skip or value in _release_values(row, facet)+ for facet, value in chosen.items())++ facets = {}+ for facet in RELEASE_FACETS:+ counts, first = {}, {}+ for row in rows:+ if matches(row, skip=facet):+ for value in dict.fromkeys(_release_values(row, facet)):+ counts[value] = counts.get(value, 0) + 1+ first.setdefault(value, row)+ facets[facet] = sorted(counts.items(), key=lambda pair: (-pair[1], pair[0]))+ if facet == "performer":+ facets[facet] = [{**next(ref for ref in first[name]["performer_refs"] if ref["name"] == name), "count": count}+ for name, count in facets[facet]]+ elif facet == "studio":+ facets[facet] = [{"name": name, "count": count, "has_logo": contract.has_logo(name),+ "logo_version": contract.logo_version(name)} for name, count in facets[facet]]+ else:+ facets[facet] = [{"name": name, "count": count} for name, count in facets[facet]]+ shown = [row for row in rows if matches(row)]+ picked = shown[(page - 1) * size:page * size]+ wanted = wants.wanted_keys(connection, (web_catalog.normalise_code_key(row["code"]) for row in picked))+ for row in picked:+ row["wanted"] = web_catalog.normalise_code_key(row["code"]) in wanted+ row["has_cover"] = contract.has_cover(row["code"])+ row["cover_frame"] = contract.cover_frame(row["code"])+ row["cover_version"] = contract.cover_version(row["code"])+ row["poster_box"] = contract.poster_box(row["code"])+ return {"items": picked, "total": len(shown), "candidate_total": len(rows), "page": page, "size": size,+ "facets": {"performers": facets["performer"], "studios": facets["studio"], "tags": facets["tag"]}}diff --git a/src/peach/web_router.py b/src/peach/web_router.pyindex d756721ef..3a82ba225 100644--- a/src/peach/web_router.py+++ b/src/peach/web_router.py@@ -54,7 +54,7 @@ from .web_downloads import (q_downloads, w_download_cancel, w_download_postprocew_download_submit)from .web_resource_search import q_resource_searchfrom .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_jav_discovery import q_jav_discoveries, q_jav_releasesfrom .web_feeds import (q_feed_check,q_feed_discoveries,@@ -355,6 +355,7 @@ GET_HANDLERS = {"/api/jav/reviews": q_jav_reviews,"/api/jav/resources": q_jav_resources,"/api/jav/discoveries": q_jav_discoveries,+ "/api/jav/releases": q_jav_releases,"/api/library-processing": q_library_processing,"/api/library-processing/issues": q_library_processing_issues,"/api/thumbnail-jobs": q_thumbnail_jobs,diff --git a/tests/test_feeds_web.py b/tests/test_feeds_web.pyindex c83e8930c..da9458cce 100644--- a/tests/test_feeds_web.py+++ b/tests/test_feeds_web.py@@ -1314,6 +1314,37 @@ class JavDiscoveryTest(FeedWebFixture):self.assertEqual([row["rank"] for row in result["items"]], [1, 2])self.assertTrue(all(row["taste_score"] == row["score"] for row in result["items"]))+ def test_releases_page_by_date_and_facets_come_only_from_unowned_releases(self):+ from peach import web_jav_discovery+ self._add()+ self._check()+ with self.contract.database.write_transaction() as connection:+ connection.execute("INSERT INTO feed_discovery(code,release_date,discovered_at) VALUES('OWN-001','2026-09-25','t')")+ connection.execute("INSERT INTO asset(location,path,name,medium,code) VALUES('local','x.mp4','x.mp4','video','OWN-001')")+ movies = {"SSIS-950": {"actors": [{"name": "女优甲"}], "tags": [{"name": "中出"}], "maker_name": "厂牌甲"},+ "HMN-071": {"actors": [{"name": "女优乙"}], "tags": [], "maker_name": "厂牌乙"},+ "OWN-001": {"actors": [{"name": "馆藏女优"}], "tags": [{"name": "巨乳"}], "maker_name": "馆藏厂牌"}}++ def releases(**args):+ with patch.object(web_jav_discovery, "_cached_movie", side_effect=lambda code, contract: movies.get(code, {})), \+ patch("peach.javdb_public.PUBLIC_API.movie") as movie:+ result = web_jav_discovery.q_jav_releases(self.contract, args)+ movie.assert_not_called()+ return result++ every = releases()+ self.assertEqual(([row["code"] for row in every["items"]], every["total"]), (["SSIS-950", "HMN-071"], 2))+ self.assertEqual([(ref["name"], ref["count"]) for ref in every["facets"]["performers"]], [("女优乙", 1), ("女优甲", 1)])+ self.assertEqual([ref["name"] for ref in every["facets"]["studios"]], ["厂牌乙", "厂牌甲"])+ self.assertEqual(every["facets"]["tags"], [{"name": "中出内射", "count": 1}])+ one = releases(performer="女优乙")+ self.assertEqual([row["code"] for row in one["items"]], ["HMN-071"])+ self.assertEqual(len(one["facets"]["performers"]), 2, "本维度不计,另一位女优照样能点")+ self.assertEqual(one["facets"]["tags"], [])+ second = releases(page=2, size=1)+ self.assertEqual(([row["code"] for row in second["items"]], second["total"], second["page"]), (["HMN-071"], 2, 2))+ self.assertEqual([row["code"] for row in releases(q="中出")["items"]], ["SSIS-950"])+def _discover(self, scope="external", rankings=None, metadata=None, args=None):from peach import web_jav_discoverywith patch.object(web_jav_discovery, "preference_profile", return_value=self._preference_fixture(rankings or {})), \diff --git a/tests/test_rm_web.py b/tests/test_rm_web.pyindex 4679989f6..9cbf90363 100644--- a/tests/test_rm_web.py+++ b/tests/test_rm_web.py@@ -1535,7 +1535,7 @@ class WebDataTests(unittest.TestCase):"/api/feeds/schedule","/api/downloads", "/api/resources/search","/api/wants", "/api/wants/magnets",- "/api/jav/detail", "/api/jav/reviews", "/api/jav/resources", "/api/jav/discoveries",+ "/api/jav/detail", "/api/jav/reviews", "/api/jav/resources", "/api/jav/discoveries", "/api/jav/releases",})self.assertEqual(set(rm_web.POST_HANDLERS), {"/api/tag-management", "/api/tag-management/preview", "/api/follow/tag",