Skip to content

armgit / peach

Public Imported from GitHub
0

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

fix(metadata): r18.dev 封面按 jacket_image 对象取地址

longmeidaof52b273b32b5
diff --git a/src/peach/sources/r18dev.py b/src/peach/sources/r18dev.py
index b9371f852..0abd933ed 100644
--- a/src/peach/sources/r18dev.py
+++ b/src/peach/sources/r18dev.py
@@ -106,7 +106,10 @@ class R18DevSource(SiteSource):
if not identifies_code(code, {'content_id': raw.get('content_id')}):
raise SourceFailure(FailureReason.PARSE_ERROR, '来源返回的番号不匹配')
name = lambda key: (raw.get(key) or {}).get('name', '')
+ # `{"large": " ", "large2": "https://…pl.jpg"}`:空着的那一格是一个空格,按出现顺序取有值的。
jacket = (raw.get('images') or {}).get('jacket_image')
+ covers = tuple(dict.fromkeys(url.strip() for url in jacket.values()
+ if isinstance(url, str) and url.strip())) if isinstance(jacket, dict) else ()
return SiteRecord(
source=self.config.name, provenance=self.config.provider, code=code, source_url=page.url,
title=raw.get('title') or '',
@@ -115,7 +118,7 @@ class R18DevSource(SiteSource):
director=raw.get('director') or '', release_date=raw.get('release_date') or '',
runtime=raw.get('runtime_minutes'),
tags=tuple(row.get('name', '') for row in raw.get('categories', [])),
- cover_urls=(jacket,) if jacket else (),
+ cover_urls=covers,
extra={'content_id': raw.get('content_id'), 'raw': raw})
def japanese(self, record: SiteRecord, *, session: Session) -> SiteRecord:
diff --git a/tests/test_metadata_r18dev.py b/tests/test_metadata_r18dev.py
index 798afdefc..320910e3f 100644
--- a/tests/test_metadata_r18dev.py
+++ b/tests/test_metadata_r18dev.py
@@ -18,7 +18,7 @@ JACKET = "https://pics.dmm.co.jp/digital/video/118abw00358/118abw00358pl.jpg"
DETAIL = {"content_id": "118abw358", "dvd_id": "ABW-358", "title": "Remu Style", "release_date": "2023-05-26",
"runtime_minutes": 210, "director": "Charlie Nakata", "maker": {"name": "Prestige"},
"label": {"name": "ABSOLUTELY WONDERFUL"}, "series": {"name": "HOW TO SEX"},
- "images": {"jacket_image": JACKET},
+ "images": {"jacket_image": {"large": " ", "large2": JACKET}},
"actresses": [{"name": "Remu Suzumori"}], "categories": [{"name": "Slender"}, {"name": "Variety"}]}
COMBINED = {"content_id": "118abw358", "title_ja": "涼森れむ流", "series_name_ja": "保健室の先生",
"label_name_ja": "ABSOLUTELY WONDERFUL", "maker_name_ja": "プレステージ",