Peach: Local-first video metadata scraper and media manager.
feat(web): 统一详情与实体规范路由
longmeidao8ffcfbb478e4
diff --git a/src/peach/routes_pages.py b/src/peach/routes_pages.pyindex 95eb3eabb..13cc91a28 100644--- a/src/peach/routes_pages.py+++ b/src/peach/routes_pages.py@@ -23,7 +23,7 @@ from collections.abc import Mapping, Sequenceimport refrom pathlib import Path-from urllib.parse import quote+from urllib.parse import quote, urlencodefrom fastapi import APIRouter, Depends, HTTPException, Requestfrom fastapi.responses import (@@ -37,7 +37,7 @@ from fastapi.responses import (from . import distribution, onboarding, settings_filefrom .config import PROJECT_ROOT-from .entities import resolve_entity+from .entities import resolve_entity, resolve_entity_idfrom .routes_auth import require_asset_auth, require_page_auth, set_auth_cookiefrom .web_entry import page_shell, runtime_fact_entriesfrom .web_state import FAVICON@@ -623,24 +623,113 @@ def index_directory_redirect(request: Request, args: dict[str, str] = Depends(rereturn RedirectResponse(request.url.path.rstrip("/") + query, status_code=307)+def _page_redirect(request: Request, path: str, *, context: tuple[str, int] | None = None):+ """导航使用临时重定向,重复查询参数与会话继续有效。"""+ query = request.scope.get("query_string", b"").decode("utf-8")+ if context:+ key, value = context+ pairs = [(key_, value_) for key_, value_ in request.query_params.multi_items() if key_ != key]+ pairs.append((key, str(value)))+ query = urlencode(pairs)+ response = RedirectResponse(path + (f"?{query}" if query else ""), status_code=307)+ response.headers["Cache-Control"] = "no-store"+ set_auth_cookie(response, request)+ return response++@router.api_route("/item/{item_id}", methods=["GET", "HEAD"])[email protected]_route("/mix/{seed_id}/{mix_item_id}", methods=["GET", "HEAD"])[email protected]_route("/parts/{part_seed_id}/{part_item_id}", methods=["GET", "HEAD"])[email protected]_route("/editions/{edition_seed_id}/{edition_item_id}", methods=["GET", "HEAD"])[email protected]_route("/playlists", methods=["GET", "HEAD"])[email protected]_route("/playlists/{playlist_id}/{playlist_item_id}", methods=["GET", "HEAD"])[email protected]_route("/mix/{seed_id}/{item_id}", methods=["GET", "HEAD"])[email protected]_route("/parts/{seed_id}/{item_id}", methods=["GET", "HEAD"])[email protected]_route("/editions/{seed_id}/{item_id}", methods=["GET", "HEAD"])[email protected]_route("/playlists/{seed_id}/{item_id}", methods=["GET", "HEAD"])+def asset_route_redirect(request: Request, item_id: int, seed_id: int | None = None,+ args: dict[str, str] = Depends(require_page_auth)):+ prefix = request.url.path.split("/", 2)[1]+ context_key = "playlist" if prefix == "playlists" else prefix+ context = (context_key, seed_id) if seed_id is not None else None+ return _page_redirect(request, f"/assets/{item_id}", context=context)++[email protected]_route("/jav/movie/{code}", methods=["GET", "HEAD"])[email protected]_route("/works/{code}", methods=["GET", "HEAD"])+def work_route(request: Request, code: str, args: dict[str, str] = Depends(require_page_auth)):+ from .sample_images import code_key++ key = code_key(code)+ if not key:+ raise HTTPException(404, "not found")+ path = f"/works/{quote(key, safe='')}"+ if request.url.path != path:+ return _page_redirect(request, path)+ return index(request, args)++[email protected]_route("/follow/item/{item_id}", methods=["GET", "HEAD"])+def post_route_redirect(request: Request, item_id: int,+ args: dict[str, str] = Depends(require_page_auth)):+ return _page_redirect(request, f"/posts/{item_id}")++[email protected]_route("/activity", methods=["GET", "HEAD"])[email protected]_route("/scraping", methods=["GET", "HEAD"])[email protected]_route("/configuration", methods=["GET", "HEAD"])[email protected]_route("/follow-manage", methods=["GET", "HEAD"])+def management_route_redirect(request: Request, args: dict[str, str] = Depends(require_page_auth)):+ paths = {"/activity": "/tasks", "/scraping": "/sources",+ "/configuration": "/settings/library", "/follow-manage": "/subscriptions"}+ return _page_redirect(request, paths[request.url.path])++[email protected]_route("/settings/{section}", methods=["GET", "HEAD"])+def settings_section_route(request: Request, section: str,+ args: dict[str, str] = Depends(require_page_auth)):+ if section not in {"appearance", "playback", "jav", "search", "content", "library",+ "subscriptions", "downloads", "network", "maintenance"}:+ raise HTTPException(404, "not found")+ return index(request, args)++@router.api_route("/performers/{name:path}", methods=["GET", "HEAD"])@router.api_route("/studios/{name:path}", methods=["GET", "HEAD"])@router.api_route("/creators/{name:path}", methods=["GET", "HEAD"])@router.api_route("/series/{name:path}", methods=["GET", "HEAD"])@router.api_route("/agencies/{name:path}", methods=["GET", "HEAD"])[email protected]_route("/tags/{name:path}", methods=["GET", "HEAD"])+def entity_route(request: Request, name: str,+ args: dict[str, str] = Depends(require_page_auth)):+ if not request.app.state.settings.configured:+ return index(request, args)+ from .web_entity import INDEX_ENTITY_KINDS++ prefix = request.url.path.split("/", 2)[1]+ kind = {**INDEX_ENTITY_KINDS, "series": "series", "tags": "tag"}[prefix]+ with request.app.state.web_contract.read_connection() as connection:+ if name.isascii() and name.isdecimal():+ if len(name) > 19 or not 0 < int(name) < 2**63:+ raise HTTPException(404, "not found")+ entity_id = resolve_entity_id(connection, int(name))+ entity = connection.execute("SELECT * FROM entity WHERE id=? AND kind=?",+ (entity_id, kind)).fetchone() if entity_id else None+ if entity is None:+ raise HTTPException(404, "not found")+ else:+ entity = resolve_entity(connection, kind, name)+ if entity is not None:+ path = f"/{prefix}/{entity['id']}"+ if request.url.path != path:+ return _page_redirect(request, path)+ return index(request, args)++[email protected]_route("/assets/{item_id}", methods=["GET", "HEAD"])[email protected]_route("/posts/{item_id}", methods=["GET", "HEAD"])[email protected]_route("/playlists", methods=["GET", "HEAD"])@router.api_route("/performers", methods=["GET", "HEAD"])@router.api_route("/creators", methods=["GET", "HEAD"])@router.api_route("/studios", methods=["GET", "HEAD"])@router.api_route("/agencies", methods=["GET", "HEAD"])@router.api_route("/tags", methods=["GET", "HEAD"])@router.api_route("/jav", methods=["GET", "HEAD"])[email protected]_route("/jav/movie/{code}", methods=["GET", "HEAD"])@router.api_route("/unseen", methods=["GET", "HEAD"])@router.api_route("/watch-later", methods=["GET", "HEAD"])@router.api_route("/flagged", methods=["GET", "HEAD"])@@ -656,37 +745,15 @@ def index_directory_redirect(request: Request, args: dict[str, str] = Depends(re@router.api_route("/quality-goals", methods=["GET", "HEAD"])# 任务中心那一屏(island),数据走 `/api/tasks`。深链要能直接打开:定时任务被挡下时# 留下的记录是「刚才为什么没跑」的唯一答案,从别处贴过来的地址不该是 404。[email protected]_route("/activity", methods=["GET", "HEAD"])[email protected]_route("/scraping", methods=["GET", "HEAD"])[email protected]_route("/tasks", methods=["GET", "HEAD"])[email protected]_route("/sources", methods=["GET", "HEAD"])@router.api_route("/resource-sync", methods=["GET", "HEAD"])@router.api_route("/follow", methods=["GET", "HEAD"])[email protected]_route("/follow-manage", methods=["GET", "HEAD"])[email protected]_route("/follow/item/{item_id}", methods=["GET", "HEAD"])[email protected]_route("/subscriptions", methods=["GET", "HEAD"])# 配置页是主站里的一屏(island),数据走 `/api/configuration`。未配置时 `index()` 给的是# 首次运行表单,正好就是「请先完成首次设置」该长的样子。[email protected]_route("/configuration", methods=["GET", "HEAD"])[email protected]_route("/settings", methods=["GET", "HEAD"])@router.api_route("/diagnostics", methods=["GET", "HEAD"])def client_route(request: Request, item_id: int | None = None,- seed_id: int | None = None, mix_item_id: int | None = None,- part_seed_id: int | None = None, part_item_id: int | None = None,- edition_seed_id: int | None = None, edition_item_id: int | None = None,- playlist_id: int | None = None, playlist_item_id: int | None = None,- kind: str | None = None, name: str | None = None, code: str | None = None,args: dict[str, str] = Depends(require_page_auth)):- settings = request.app.state.settings- if name and "name" in request.path_params and settings.configured and not (settings.token and args.get("t")):- from .web_entity import INDEX_ENTITY_KINDS-- prefix = request.url.path.split("/", 2)[1]- entity_kind = {**INDEX_ENTITY_KINDS, "series": "series"}.get(prefix)- if entity_kind:- with request.app.state.web_contract.read_connection() as connection:- entity = resolve_entity(connection, entity_kind, name)- if entity is not None and entity["canonical_name"] != name:- raw_query = request.scope.get("query_string", b"").decode("utf-8")- query = f"?{raw_query}" if raw_query else ""- response = RedirectResponse(- f"/{prefix}/{quote(entity['canonical_name'], safe='')}" + query, status_code=307)- response.headers["Cache-Control"] = "no-store"- return responsereturn index(request, args)diff --git a/src/peach/web_entity.py b/src/peach/web_entity.pyindex 0433ef588..675b000bf 100644--- a/src/peach/web_entity.py+++ b/src/peach/web_entity.py@@ -17,7 +17,7 @@ from urllib.parse import urlsplitfrom . import (company_profiles, entry_links, feeds, link_status, performer_header, web_feeds,web_follow)from .catalog_rules import (LENGTH_TAGS, dir_expr, photo_set_title, solo_performer_clause, tag_cat)-from .entities import normalize_entity_name, resolve_entity, rewrite_flat_projection+from .entities import normalize_entity_name, resolve_entity, resolve_entity_id, rewrite_flat_projectionfrom .social_links import ARCHIVE_HOSTS, is_archivefrom .web_catalog import (COST,@@ -35,6 +35,26 @@ from . import entity_classification#: 有资料页的实体种类。事务所(agency)和厂牌是两件事:厂牌出片、事务所出人,#: 一位女优可以在同一年里给多个厂牌拍片而只属于一家事务所。PROFILE_KINDS = {"performer", "studio", "creator", "series", "agency"}+READ_ENTITY_KINDS = PROFILE_KINDS | {"tag"}+++def _query_entity_id(args) -> int | None:+ """显式 ID 使用正整数,名称查询不占用数字名称的契约。"""+ if "id" not in args:+ return None+ value = str(args["id"])+ if not value.isascii() or not value.isdecimal() or len(value) > 19 or not 0 < int(value) < 2**63:+ raise ValueError("invalid entity id")+ return int(value)+++def _query_entity(connection, kind: str, name: str, entity_id: int | None):+ if entity_id is None:+ return resolve_entity(connection, kind, name)+ target = resolve_entity_id(connection, entity_id)+ return connection.execute("SELECT * FROM entity WHERE id=? AND kind=?",+ (target, kind)).fetchone() if target else None+#: 资料页与索引页数作品的口径:视频,且没有标「已消失」(ADR-0087)。回收站里的照旧算;#: 代表作的取图不套这一条。@@ -153,20 +173,27 @@ def q_entity(contract: WebContract, args):"""kind = args.get("kind", "")name = args.get("name", "")- if kind not in PROFILE_KINDS or not name:+ try:+ entity_id = _query_entity_id(args)+ except ValueError:+ return {"error": "invalid entity"}+ if kind not in READ_ENTITY_KINDS or (entity_id is None and not name):return {"error": "invalid entity"}with contract.read_connection() as c:- row = resolve_entity(c, kind, name)+ row = _query_entity(c, kind, name, entity_id)if not row:+ if entity_id is not None:+ return {"error": "not found"}merged = c.execute(- "SELECT DISTINCT e.kind,e.canonical_name FROM entity e "+ "SELECT DISTINCT e.id,e.kind,e.canonical_name FROM entity e ""JOIN entity_alias al ON al.entity_id=e.id ""JOIN entity_redirect r ON r.target_id=e.id AND r.source=al.source ""WHERE al.alias=? AND al.source=? ORDER BY e.id LIMIT 2",(name, f'user:identity-merge:{kind}'),).fetchall()if len(merged) == 1:- return {'redirect': {'kind': merged[0]['kind'], 'name': merged[0]['canonical_name']}}+ return {'redirect': {'id': merged[0]['id'], 'kind': merged[0]['kind'],+ 'name': merged[0]['canonical_name']}}return {"error": "not found"}d = dict(row)from .web_library_shortcuts import favorite_ids@@ -428,7 +455,11 @@ def q_entity_photos(contract: WebContract, args):"""实体名下的照片:本地图片分页放在 `items`;`sets` 是分组,`kind` 为 `dir` 的是本地目录图集,为 `code` 的是番号样张集(`entity_code_sets`)。`total` 只数本地图片,`sample_total` 数样张。"""kind, name = args.get("kind", ""), args.get("name", "")- if kind not in PROFILE_KINDS or not name:+ try:+ entity_id = _query_entity_id(args)+ except ValueError:+ return {"error": "invalid entity"}+ if kind not in READ_ENTITY_KINDS or (entity_id is None and not name):return {"error": "invalid entity"}try:limit = max(1, min(int(args.get("limit") or 120), 600))@@ -439,7 +470,7 @@ def q_entity_photos(contract: WebContract, args):except (TypeError, ValueError):return {"error": "invalid pagination"}with contract.read_connection() as c:- row = resolve_entity(c, kind, name)+ row = _query_entity(c, kind, name, entity_id)if not row:return {"error": "not found"}# 图集和分页数的是同一批图,`total` 由图集相加,才对得上翻到底的张数。diff --git a/tests/test_entity_classification.py b/tests/test_entity_classification.pyindex 84b17c6fe..0653298c7 100644--- a/tests/test_entity_classification.py+++ b/tests/test_entity_classification.py@@ -492,7 +492,7 @@ class EntityClassificationTests(unittest.TestCase):merge_entity(self.connection,target_id=target,source_id=source,source_name='Old Account Name',alias_source='user:identity-merge:creator')self.assertEqual(q_entity(WebContract(self.db),{'kind':'creator','name':'Old Account Name'}),- {'redirect':{'kind':'performer','name':'Known Person'}})+ {'redirect':{'id':target,'kind':'performer','name':'Known Person'}})self.assertEqual(q_entity(WebContract(self.db),{'kind':'studio','name':'Known Person'}),{'error':'not found'})self.assertEqual(self.connection.execute('PRAGMA foreign_key_check').fetchall(),[])diff --git a/tests/test_entity_redirect.py b/tests/test_entity_redirect.pyindex 138357fb4..e8e856461 100644--- a/tests/test_entity_redirect.py+++ b/tests/test_entity_redirect.py@@ -234,6 +234,46 @@ class EntityRedirectRouteTests(unittest.TestCase):self.assertEqual(response.json()["id"], 10)self.assertEqual(response.json()["canonical_name"], "橋本ありな")+ def test_entity_and_photo_queries_accept_current_and_merged_ids(self):+ for path in ('/api/entity', '/api/photos'):+ named = self.client.get(path, params={+ 'kind': 'performer', 'name': '橋本ありな', 't': 'secret'})+ self.assertEqual(named.status_code, 200, named.text)+ for entity_id in (10, 11):+ response = self.client.get(path, params={+ 'kind': 'performer', 'id': entity_id, 'name': 'ignored', 't': 'secret'})+ self.assertEqual(response.status_code, 200, response.text)+ self.assertEqual(response.json(), named.json())++ def test_entity_id_queries_refuse_invalid_missing_or_other_kind_ids(self):+ for path in ('/api/entity', '/api/photos'):+ for entity_id in ('', '0', '-1', '1.0', 'ten', '10', str(2**63), '9' * 50):+ response = self.client.get(path, params={+ 'kind': 'performer', 'id': entity_id, 't': 'secret'})+ self.assertEqual(response.json(), {'error': 'invalid entity'}, (path, entity_id))+ for kind, entity_id in (('studio', '10'), ('performer', '999')):+ response = self.client.get(path, params={'kind': kind, 'id': entity_id, 't': 'secret'})+ self.assertEqual(response.json(), {'error': 'not found'}, (path, kind, entity_id))++ def test_tag_profiles_and_photos_use_the_same_identity_by_name_and_id(self):+ with sqlite3.connect(self.app.state.settings.db_path) as connection:+ connection.execute("INSERT INTO entity(id,kind,canonical_name,normalized_name,created_at,updated_at)"+ " VALUES(20,'tag','Tag A','tag a','t','t')")+ connection.execute("INSERT INTO asset_entity(asset_id,entity_id,role,source,confidence) VALUES(1,20,'tag','test',1)")+ connection.execute("INSERT INTO asset(id,location,path,name,medium) VALUES(2,'local',?,'2.jpg','image')",+ (r'R:\media\2.jpg',))+ connection.execute("INSERT INTO asset_entity(asset_id,entity_id,role,source,confidence) VALUES(2,20,'tag','test',1)")+ for path in ('/api/entity', '/api/photos'):+ named = self.client.get(path, params={'kind': 'tag', 'name': 'Tag A', 't': 'secret'})+ by_id = self.client.get(path, params={'kind': 'tag', 'id': '20', 't': 'secret'})+ self.assertEqual(named.status_code, 200, named.text)+ self.assertEqual(by_id.json(), named.json())+ if path == '/api/entity':+ self.assertEqual(by_id.json()['asset_count'], 1)+ else:+ self.assertEqual(by_id.json()['total'], 1)+ self.assertEqual(by_id.json()['items'][0]['id'], 2)+def test_an_old_image_address_redirects_to_the_target(self):body = picture("navy")(self.avatars / "performer-10.img").write_bytes(body)diff --git a/tests/test_fastapi_api.py b/tests/test_fastapi_api.pyindex 54fc399b1..da729f546 100644--- a/tests/test_fastapi_api.py+++ b/tests/test_fastapi_api.py@@ -10,7 +10,7 @@ from contextlib import closingfrom pathlib import Pathfrom unittest.mock import patchfrom types import SimpleNamespace-from urllib.parse import quote+from urllib.parse import parse_qs, quote, urlsplitfrom peach import __version__from support.ledger import fresh_ledger@@ -51,6 +51,7 @@ CREATE TABLE entity(id INTEGER PRIMARY KEY,kind TEXT,canonical_name TEXT,normalized_name TEXT,metadata_json TEXT DEFAULT '{}',created_at TEXT,updated_at TEXT,region TEXT,UNIQUE(kind,normalized_name));+CREATE TABLE entity_redirect(old_id INTEGER PRIMARY KEY,target_id INTEGER,source TEXT,merged_at TEXT);CREATE TABLE entity_alias(entity_id INTEGER,alias TEXT,normalized_alias TEXT,source TEXT,confidence REAL DEFAULT 1.0);CREATE TABLE entity_external_ref(@@ -1764,11 +1765,11 @@ class FastApiContractTests(unittest.IsolatedAsyncioTestCase):self.assertEqual(response.status_code, 307, (index, method))self.assertEqual(response.headers['location'], f'/{index}?q=A%2FB&view=cloud')- async def test_entity_alias_urls_redirect_to_canonical_names_and_keep_query(self):+ async def test_entity_name_urls_redirect_to_ids_and_keep_query(self):await self.client.post('/login', content='token=secret&next=%2F',headers={'Content-Type': 'application/x-www-form-urlencoded'})kinds = [('performer', 'performers'), ('creator', 'creators'), ('studio', 'studios'),- ('series', 'series'), ('agency', 'agencies')]+ ('series', 'series'), ('agency', 'agencies'), ('tag', 'tags')]canonical = 'Canonical / 名%? #&'with closing(sqlite3.connect(self.db)) as connection, connection:for entity_id, (kind, prefix) in enumerate(kinds, 300):@@ -1777,9 +1778,9 @@ class FastApiContractTests(unittest.IsolatedAsyncioTestCase):connection.execute("INSERT INTO entity_alias VALUES(?,?,?,'test',1)",(entity_id, f'old-{kind}', f'old-{kind}'))query = '?tag=a%2Fb&tag=second&media=photos&set=9&offset=48&sort=release&dir=asc'- for kind, prefix in kinds:- names = [f'old-{kind}'] + ([canonical.upper()] if kind == 'studio' else [])- target = f'/{prefix}/{quote(canonical, safe="")}' + query+ for entity_id, (kind, prefix) in enumerate(kinds, 300):+ names = [canonical, f'old-{kind}'] + ([canonical.upper()] if kind == 'studio' else [])+ target = f'/{prefix}/{entity_id}' + queryfor name in names:for method in ('GET', 'HEAD'):response = await self.client.request(method, f'/{prefix}/{quote(name, safe="")}' + query,@@ -1812,17 +1813,17 @@ class FastApiContractTests(unittest.IsolatedAsyncioTestCase):"/login", content="token=secret&next=%2F",headers={"Content-Type": "application/x-www-form-urlencoded"},)- for path in ("/item/1", "/performers/Alice", "/studios/Prestige",+ for path in ("/assets/1", "/performers/Alice", "/studios/Prestige","/creators/luckydog11", "/series/Example", "/performers","/creators", "/tags", "/stats", "/taste", "/immerse", "/wall", "/trash", "/review",# 前端路由写好了不等于能直接打开:SPA 路径是逐条登记的,# 漏登记时源码断言照样全绿,只有真的请求一次才会露出 404。"/unseen", "/watch-later", "/flagged", "/junk-files",- "/data-cleanup", "/duplicates", "/quality-goals", "/activity",- "/mix/1/2", "/parts/1/2", "/editions/1/2", "/playlists",+ "/data-cleanup", "/duplicates", "/quality-goals", "/tasks",+ "/assets/2?mix=1", "/assets/2?parts=1", "/assets/2?editions=1", "/playlists","/resource-sync", "/diagnostics",- "/playlists/1/1", "/follow", "/follow-manage",- "/follow/item/190"):+ "/assets/1?playlist=1", "/follow", "/subscriptions",+ "/posts/190", "/sources", "/settings", "/works/ABC-001"):response = await self.client.get(path)self.assertEqual(response.status_code, 200, path)self.assertIn("Peach test", response.text)@@ -1830,6 +1831,61 @@ class FastApiContractTests(unittest.IsolatedAsyncioTestCase):removed = await self.client.get("/entity/performer/Alice")self.assertEqual(removed.status_code, 404)+ async def test_canonical_page_urls_require_authentication(self):+ for path in ('/assets/1', '/posts/1', '/works/ABC-001', '/performers/1',+ '/tags/1', '/tasks', '/sources', '/subscriptions', '/settings/library',+ '/item/1', '/mix/1/2', '/jav/movie/ABC-001', '/follow/item/1'):+ response = await self.client.get(path, follow_redirects=False)+ self.assertEqual(response.status_code, 303, path)+ self.assertTrue(response.headers['location'].startswith('/login?next='), path)++ async def test_compatibility_page_urls_redirect_with_query_and_context(self):+ await self.client.post('/login', content='token=secret&next=%2F',+ headers={'Content-Type': 'application/x-www-form-urlencoded'})+ routes = {'/item/42': '/assets/42', '/follow/item/42': '/posts/42',+ '/jav/movie/abc001': '/works/ABC-001', '/works/abc001': '/works/ABC-001',+ '/activity': '/tasks', '/scraping': '/sources',+ '/configuration': '/settings/library', '/follow-manage': '/subscriptions'}+ query = '?tag=a%2Fb&tag=second&sort=release'+ for source, target in routes.items():+ for method in ('GET', 'HEAD'):+ response = await self.client.request(method, source + query, follow_redirects=False)+ self.assertEqual(response.status_code, 307, (source, method))+ self.assertEqual(response.headers['location'], target + query)+ for prefix, key in (('mix', 'mix'), ('parts', 'parts'), ('editions', 'editions'),+ ('playlists', 'playlist')):+ for method in ('GET', 'HEAD'):+ response = await self.client.request(+ method, f'/{prefix}/7/42' + query + f'&{key}=999&{key}=888', follow_redirects=False)+ self.assertEqual(response.status_code, 307)+ location = urlsplit(response.headers['location'])+ self.assertEqual(location.path, '/assets/42')+ self.assertEqual(parse_qs(location.query),+ {'tag': ['a/b', 'second'], 'sort': ['release'], key: ['7']})++ async def test_settings_sections_serve_the_page_and_unknown_sections_are_missing(self):+ await self.client.post('/login', content='token=secret&next=%2F',+ headers={'Content-Type': 'application/x-www-form-urlencoded'})+ for section in ('appearance', 'playback', 'jav', 'search', 'content', 'library',+ 'subscriptions', 'downloads', 'network', 'maintenance'):+ for method in ('GET', 'HEAD'):+ response = await self.client.request(method, f'/settings/{section}')+ self.assertEqual(response.status_code, 200, (section, method))+ self.assertEqual((await self.client.get('/settings/missing')).status_code, 404)++ async def test_entity_id_pages_validate_kind_and_follow_merge_ids(self):+ await self.client.post('/login', content='token=secret&next=%2F',+ headers={'Content-Type': 'application/x-www-form-urlencoded'})+ with closing(sqlite3.connect(self.db)) as connection, connection:+ connection.execute("INSERT INTO entity_redirect(old_id,target_id,source,merged_at) VALUES(399,1,'test','now')")+ for method in ('GET', 'HEAD'):+ response = await self.client.request(method, '/tags/399?tag=a%2Fb&tag=c', follow_redirects=False)+ self.assertEqual(response.status_code, 307)+ self.assertEqual(response.headers['location'], '/tags/1?tag=a%2Fb&tag=c')+ self.assertEqual((await self.client.request(method, '/tags/1')).status_code, 200)+ self.assertEqual((await self.client.request(method, '/performers/1')).status_code, 404)+ self.assertEqual((await self.client.request(method, '/tags/999999')).status_code, 404)+async def test_jav_section_deep_links_serve_the_authenticated_application_shell(self):paths = ("/jav", "/jav?tab=discover", "/jav?tab=wants")for path in paths: