diff --git a/gallery_dl/extractor/naverwebtoon.py b/gallery_dl/extractor/naverwebtoon.py index fa91f76f..d6292af5 100644 --- a/gallery_dl/extractor/naverwebtoon.py +++ b/gallery_dl/extractor/naverwebtoon.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Copyright 2021 Seonghyeon Cho -# Copyright 2022 Mike Fährmann +# Copyright 2022-2033 Mike Fährmann # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -11,7 +11,6 @@ from .common import GalleryExtractor, Extractor, Message from .. import text -import re BASE_PATTERN = (r"(?:https?://)?comic\.naver\.com" r"/(webtoon|challenge|bestChallenge)") @@ -34,18 +33,44 @@ class NaverwebtoonEpisodeExtractor(NaverwebtoonBase, GalleryExtractor): "?titleId=26458&no=1&weekday=tue"), { "url": "47a956ba8c7a837213d5985f50c569fcff986f75", "content": "3806b6e8befbb1920048de9888dfce6220f69a60", - "count": 14 + "count": 14, + "keyword": { + "author": ["김규삼"], + "artist": ["김규삼"], + "comic": "N의등대-눈의등대", + "count": 14, + "episode": "1", + "extension": "jpg", + "num": int, + "tags": ["스릴러", "완결무료", "완결스릴러"], + "title": "n의 등대 - 눈의 등대 1화", + "title_id": "26458", + }, }), (("https://comic.naver.com/challenge/detail" "?titleId=765124&no=1"), { - "pattern": r"https://image-comic\.pstatic\.net/nas" + "pattern": r"https://image-comic\.pstatic\.net" r"/user_contents_data/challenge_comic/2021/01/19" r"/342586/upload_7149856273586337846\.jpeg", "count": 1, + "keyword": { + "author": ["kemi****"], + "artist": [], + "comic": "우니 모두의 이야기", + "count": 1, + "episode": "1", + "extension": "jpeg", + "filename": "upload_7149856273586337846", + "num": 1, + "tags": ["일상툰", "우니모두의이야기", "퇴사", "입사", "신입사원", + "사회초년생", "회사원", "20대"], + "title": "퇴사하다", + "title_id": "765124", + }, }), (("https://comic.naver.com/bestChallenge/detail.nhn" "?titleId=771467&no=3"), { - "pattern": r"https://image-comic\.pstatic\.net/nas" + "pattern": r"https://image-comic\.pstatic\.net" r"/user_contents_data/challenge_comic/2021/04/28" r"/345534/upload_3617293622396203109\.jpeg", "count": 1, @@ -66,12 +91,14 @@ class NaverwebtoonEpisodeExtractor(NaverwebtoonBase, GalleryExtractor): return { "title_id": self.title_id, "episode" : self.episode, - "title" : extr('property="og:title" content="', '"'), - "comic" : extr('
', '
'), - "genre" : extr('', ''), - "date" : extr('