From 8a527f68321394329148bd759446391d58f41884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Tue, 5 Mar 2024 23:18:20 +0100 Subject: [PATCH] [naver] simplify code + add test --- gallery_dl/extractor/naver.py | 18 +++++++----------- test/results/naver.py | 27 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/gallery_dl/extractor/naver.py b/gallery_dl/extractor/naver.py index 25801c7e96..5062cb26c3 100644 --- a/gallery_dl/extractor/naver.py +++ b/gallery_dl/extractor/naver.py @@ -10,7 +10,6 @@ from .common import GalleryExtractor, Extractor, Message from .. import text -from urllib.parse import unquote class NaverBase(): @@ -63,16 +62,13 @@ def metadata(self, page): return data def images(self, page): - return [ - (unquote(url, encoding="EUC-KR") - .replace("://post", "://blog", 1) - .partition("?")[0], None) - if "\ufffd" in unquote(url) - else - (url.replace("://post", "://blog", 1) - .partition("?")[0], None) - for url in text.extract_iter(page, 'data-lazy-src="', '"') - ] + results = [] + for url in text.extract_iter(page, 'data-lazy-src="', '"'): + url = url.replace("://post", "://blog", 1).partition("?")[0] + if "\ufffd" in text.unquote(url): + url = text.unquote(url, encoding="EUC-KR") + results.append((url, None)) + return results class NaverBlogExtractor(NaverBase, Extractor): diff --git a/test/results/naver.py b/test/results/naver.py index 81d18efd41..9a8f92ec2b 100644 --- a/test/results/naver.py +++ b/test/results/naver.py @@ -24,6 +24,33 @@ "#sha1_metadata": "a6e23d19afbee86b37d6e7ad934650c379d2cb1e", }, +{ + "#url" : "https://blog.naver.com/PostView.nhn?blogId=rlfqjxm0&logNo=70161391809", + "#comment" : "filenames in EUC-KR encoding (#5126)", + "#category": ("", "naver", "post"), + "#class" : naver.NaverPostExtractor, + "#urls": ( + "https://blogfiles.pstatic.net/20130305_23/ping9303_1362411028002Dpz9z_PNG/1_사본.png", + "https://blogfiles.pstatic.net/20130305_46/rlfqjxm0_1362473322580x33zi_PNG/오마갓합작.png", + ), + + "blog": { + "id" : "rlfqjxm0", + "num" : 43030507, + "user": "에나", + }, + "post": { + "date" : "dt:2013-03-05 17:48:00", + "description": " ◈     PROMOTER :핑수 ˚ 아담 EDITOR:핑수   넵:이크:핑수...", + "num" : 70161391809, + "title" : "[공유] { 합작}  OH, MY GOD! ~ 아 또 무슨 종말을 한다 그래~" + }, + "count" : 2, + "num" : range(1, 2), + "filename" : r"re:1_사본|오마갓합작", + "extension": "png", +}, + { "#url" : "https://blog.naver.com/gukjung", "#category": ("", "naver", "blog"),