[naver] change categories (#7746)

- 'naver'        -> 'naver-blog'
- 'chzzk'        -> 'naver-chzzk'
- 'naverwebtoon' -> 'naver-webtoon'

gallery_dl/__init__.py

@@ -323,6 +323,9 @@ def main():
                         "coomer"       : "coomerparty",
                         "kemono"       : "kemonoparty",
                         "schalenetwork": "koharu",
+                        "naver-blog"   : "naver",
+                        "naver-chzzk"  : "chzzk",
+                        "naver-webtoon": "naverwebtoon",
                     }
                 from .extractor import common
                 common.CATEGORY_MAP = catmap

gallery_dl/config.py

@@ -169,9 +169,12 @@ def remap_categories():
     cmap = opts.get("config-map")
     if cmap is None:
         cmap = (
-            ("coomerparty", "coomer"),
-            ("kemonoparty", "kemono"),
-            ("koharu"     , "schalenetwork"),
+            ("coomerparty" , "coomer"),
+            ("kemonoparty" , "kemono"),
+            ("koharu"      , "schalenetwork"),
+            ("naver"       , "naver-blog"),
+            ("chzzk"       , "naver-chzzk"),
+            ("naverwebtoon", "naver-webtoon"),
         )
     elif not cmap:
         return

gallery_dl/extractor/__init__.py

@@ -38,7 +38,6 @@ modules = [
     "bunkr",
     "catbox",
     "chevereto",
-    "chzzk",
     "cien",
     "civitai",
     "comick",
@@ -117,7 +116,8 @@ modules = [
     "motherless",
     "myhentaigallery",
     "myportfolio",
-    "naver",
+    "naverblog",
+    "naverchzzk",
     "naverwebtoon",
     "nekohouse",
     "newgrounds",

gallery_dl/extractor/naverblog.py

@@ -14,13 +14,13 @@ import datetime
 import time
 
 
-class NaverBase():
-    """Base class for naver extractors"""
-    category = "naver"
+class NaverBlogBase():
+    """Base class for blog.naver.com extractors"""
+    category = "naver-blog"
     root = "https://blog.naver.com"
 
 
-class NaverPostExtractor(NaverBase, GalleryExtractor):
+class NaverBlogPostExtractor(NaverBlogBase, GalleryExtractor):
     """Extractor for blog posts on blog.naver.com"""
     subcategory = "post"
     filename_fmt = "{num:>03}.{extension}"
@@ -123,7 +123,7 @@ class NaverPostExtractor(NaverBase, GalleryExtractor):
         files.append((video["source"], video))
 
 
-class NaverBlogExtractor(NaverBase, Extractor):
+class NaverBlogBlogExtractor(NaverBlogBase, Extractor):
     """Extractor for a user's blog on blog.naver.com"""
     subcategory = "blog"
     categorytransfer = True
@@ -165,7 +165,7 @@ class NaverBlogExtractor(NaverBase, Extractor):
             for post in data["postList"]:
                 post["url"] = (f"{self.root}/PostView.nhn?blogId="
                                f"{self.blog_id}&logNo={post['logNo']}")
-                post["_extractor"] = NaverPostExtractor
+                post["_extractor"] = NaverBlogPostExtractor
                 yield Message.Queue, post["url"], post
 
             if not data["hasNextPage"]:

gallery_dl/extractor/naverchzzk.py

@@ -4,15 +4,15 @@
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 
-"""Extractors for https://chzzk.naver.com"""
+"""Extractors for https://chzzk.naver.com/"""
 
 from .common import Extractor, Message
 from .. import text, util
 
 
-class ChzzkExtractor(Extractor):
-    """Base class for chzzk extractors"""
-    category = "chzzk"
+class NaverChzzkExtractor(Extractor):
+    """Base class for chzzk.naver.com extractors"""
+    category = "naver-chzzk"
     filename_fmt = "{uid}_{id}_{num}.{extension}"
     directory_fmt = ("{category}", "{user[userNickname]}")
     archive_fmt = "{uid}_{id}_{num}"
@@ -47,7 +47,7 @@ class ChzzkExtractor(Extractor):
                 yield Message.Url, url, text.nameext_from_url(url, data)
 
 
-class ChzzkCommentExtractor(ChzzkExtractor):
+class NaverChzzkCommentExtractor(NaverChzzkExtractor):
     """Extractor for individual comment from chzzk.naver.com"""
     subcategory = "comment"
     pattern = r"(?:https?://)?chzzk\.naver\.com/(\w+)/community/detail/(\d+)"
@@ -59,7 +59,7 @@ class ChzzkCommentExtractor(ChzzkExtractor):
         return ({"comment": res["comment"], "user": res["user"]},)
 
 
-class ChzzkCommunityExtractor(ChzzkExtractor):
+class NaverChzzkCommunityExtractor(NaverChzzkExtractor):
     """Extractor for comments from chzzk.naver.com"""
     subcategory = "community"
     pattern = r"(?:https?://)?chzzk\.naver\.com/(\w+)/community"

gallery_dl/extractor/naverwebtoon.py

@@ -16,13 +16,13 @@ BASE_PATTERN = (r"(?:https?://)?comic\.naver\.com"
                 r"/(webtoon|challenge|bestChallenge)")
 
 
-class NaverwebtoonBase():
-    """Base class for naver webtoon extractors"""
-    category = "naverwebtoon"
+class NaverWebtoonBase():
+    """Base class for comic.naver.com extractors"""
+    category = "naver-webtoon"
     root = "https://comic.naver.com"
 
 
-class NaverwebtoonEpisodeExtractor(NaverwebtoonBase, GalleryExtractor):
+class NaverWebtoonEpisodeExtractor(NaverWebtoonBase, GalleryExtractor):
     subcategory = "episode"
     directory_fmt = ("{category}", "{comic}")
     filename_fmt = "{episode:>03}-{num:>02}.{extension}"
@@ -63,7 +63,7 @@ class NaverwebtoonEpisodeExtractor(NaverwebtoonBase, GalleryExtractor):
         ]
 
 
-class NaverwebtoonComicExtractor(NaverwebtoonBase, Extractor):
+class NaverWebtoonComicExtractor(NaverWebtoonBase, Extractor):
     subcategory = "comic"
     categorytransfer = True
     pattern = BASE_PATTERN + r"/list(?:\.nhn)?\?([^#]+)"
@@ -95,7 +95,7 @@ class NaverwebtoonComicExtractor(NaverwebtoonBase, Extractor):
             base = f"{self.root}/{path}/detail?titleId={data['titleId']}&no="
 
             for article in data["articleList"]:
-                article["_extractor"] = NaverwebtoonEpisodeExtractor
+                article["_extractor"] = NaverWebtoonEpisodeExtractor
                 yield Message.Queue, base + str(article["no"]), article
 
             params["page"] = data["pageInfo"]["nextPage"]