From 2cfe788f936a532784e66e7906dfb54c7c678e1f Mon Sep 17 00:00:00 2001
From: blankie <blankie@nixnetmail.com>
Date: Tue, 9 Jan 2024 01:42:57 +1100
Subject: [PATCH] [hatenablog] fix extractor naming errors

---
 gallery_dl/extractor/hatenablog.py | 18 +++++++-------
 test/results/hatenablog.py         | 40 +++++++++++++++---------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/gallery_dl/extractor/hatenablog.py b/gallery_dl/extractor/hatenablog.py
index 322f2ca5..dd1e45a5 100644
--- a/gallery_dl/extractor/hatenablog.py
+++ b/gallery_dl/extractor/hatenablog.py
@@ -19,7 +19,7 @@ BASE_PATTERN = (
 QUERY_RE = r"(?:\?([^#]*))?(?:#.*)?$"
 
 
-class HatenaBlogExtractor(Extractor):
+class HatenablogExtractor(Extractor):
     """Base class for HatenaBlog extractors"""
     category = "hatenablog"
     directory_fmt = ("{category}", "{domain}")
@@ -65,12 +65,12 @@ class HatenaBlogExtractor(Extractor):
             yield Message.Url, url, text.nameext_from_url(url, data)
 
 
-class HatenaBlogEntriesExtractor(HatenaBlogExtractor):
+class HatenablogEntriesExtractor(HatenablogExtractor):
     """Base class for a list of entries"""
     allowed_parameters = ()
 
     def __init__(self, match):
-        HatenaBlogExtractor.__init__(self, match)
+        HatenablogExtractor.__init__(self, match)
         self.path = match.group(3)
         self.query = {key: value for key, value in text.parse_query(
             match.group(4)).items() if self._acceptable_query(key)}
@@ -103,7 +103,7 @@ class HatenaBlogEntriesExtractor(HatenaBlogExtractor):
 
             url = "hatenablog:" + text.unescape(text.extr(
                 section, '<a class="entry-title-link" href="', '"'))
-            data = {"_extractor": HatenaBlogEntryExtractor}
+            data = {"_extractor": HatenablogEntryExtractor}
             yield Message.Queue, url, data
 
     def _handle_full_articles(self, extr):
@@ -121,14 +121,14 @@ class HatenaBlogEntriesExtractor(HatenaBlogExtractor):
         return key == "page" or key in self.allowed_parameters
 
 
-class HatenaBlogEntryExtractor(HatenaBlogExtractor):
+class HatenablogEntryExtractor(HatenablogExtractor):
     """Extractor for a single entry URL"""
     subcategory = "entry"
     pattern = BASE_PATTERN + r"/entry/([^?#]+)" + QUERY_RE
     example = "https://BLOG.hatenablog.com/entry/PATH"
 
     def __init__(self, match):
-        HatenaBlogExtractor.__init__(self, match)
+        HatenablogExtractor.__init__(self, match)
         self.path = match.group(3)
 
     def items(self):
@@ -144,14 +144,14 @@ class HatenaBlogEntryExtractor(HatenaBlogExtractor):
             return self._handle_article(article)
 
 
-class HatenaBlogHomeExtractor(HatenaBlogEntriesExtractor):
+class HatenablogHomeExtractor(HatenablogEntriesExtractor):
     """Extractor for a blog's home page"""
     subcategory = "home"
     pattern = BASE_PATTERN + r"(/?)" + QUERY_RE
     example = "https://BLOG.hatenablog.com"
 
 
-class HatenaBlogArchiveExtractor(HatenaBlogEntriesExtractor):
+class HatenablogArchiveExtractor(HatenablogEntriesExtractor):
     """Extractor for a blog's archive page"""
     subcategory = "archive"
     pattern = BASE_PATTERN + r"(/archive(?:/\d+(?:/\d+(?:/\d+)?)?" + \
@@ -159,7 +159,7 @@ class HatenaBlogArchiveExtractor(HatenaBlogEntriesExtractor):
     example = "https://BLOG.hatenablog.com/archive/2024"
 
 
-class HatenaBlogSearchExtractor(HatenaBlogEntriesExtractor):
+class HatenablogSearchExtractor(HatenablogEntriesExtractor):
     """Extractor for a blog's search results"""
     subcategory = "search"
     pattern = BASE_PATTERN + r"(/search)" + QUERY_RE
diff --git a/test/results/hatenablog.py b/test/results/hatenablog.py
index 8ca7876f..4a306f9a 100644
--- a/test/results/hatenablog.py
+++ b/test/results/hatenablog.py
@@ -11,38 +11,38 @@ __tests__ = (
 {
     "#url"     : "https://cosmiclatte.hatenablog.com/entry/2020/05/28/003227",
     "#category": ("", "hatenablog", "entry"),
-    "#class"   : hatenablog.HatenaBlogEntryExtractor,
+    "#class"   : hatenablog.HatenablogEntryExtractor,
     "#count"   : 20,
 },
 
 {
     "#url"     : "https://moko0908.hatenablog.jp/entry/2023/12/31/083846",
     "#category": ("", "hatenablog", "entry"),
-    "#class"   : hatenablog.HatenaBlogEntryExtractor,
+    "#class"   : hatenablog.HatenablogEntryExtractor,
 },
 
 {
     "#url"     : "https://p-shirokuma.hatenadiary.com/entry/20231227/1703685600",
     "#category": ("", "hatenablog", "entry"),
-    "#class"   : hatenablog.HatenaBlogEntryExtractor,
+    "#class"   : hatenablog.HatenablogEntryExtractor,
 },
 
 {
     "#url"     : "https://urakatahero.hateblo.jp/entry/2ndlife",
     "#category": ("", "hatenablog", "entry"),
-    "#class"   : hatenablog.HatenaBlogEntryExtractor,
+    "#class"   : hatenablog.HatenablogEntryExtractor,
 },
 
 {
     "#url"     : "hatenablog:https://blog.hyouhon.com/entry/2023/12/22/133549",
     "#category": ("", "hatenablog", "entry"),
-    "#class"   : hatenablog.HatenaBlogEntryExtractor,
+    "#class"   : hatenablog.HatenablogEntryExtractor,
 },
 
 {
     "#url"     : "https://cetriolo.hatenablog.com",
     "#category": ("", "hatenablog", "home"),
-    "#class"   : hatenablog.HatenaBlogHomeExtractor,
+    "#class"   : hatenablog.HatenablogHomeExtractor,
     "#range"   : "1-7",
     "#count"   : 7,
 },
@@ -50,25 +50,25 @@ __tests__ = (
 {
     "#url"     : "https://moko0908.hatenablog.jp/",
     "#category": ("", "hatenablog", "home"),
-    "#class"   : hatenablog.HatenaBlogHomeExtractor,
+    "#class"   : hatenablog.HatenablogHomeExtractor,
 },
 
 {
     "#url"     : "https://p-shirokuma.hatenadiary.com/",
     "#category": ("", "hatenablog", "home"),
-    "#class"   : hatenablog.HatenaBlogHomeExtractor,
+    "#class"   : hatenablog.HatenablogHomeExtractor,
 },
 
 {
     "#url"     : "https://urakatahero.hateblo.jp/",
     "#category": ("", "hatenablog", "home"),
-    "#class"   : hatenablog.HatenaBlogHomeExtractor,
+    "#class"   : hatenablog.HatenablogHomeExtractor,
 },
 
 {
     "#url"     : "hatenablog:https://blog.hyouhon.com/",
     "#category": ("", "hatenablog", "home"),
-    "#class"   : hatenablog.HatenaBlogHomeExtractor,
+    "#class"   : hatenablog.HatenablogHomeExtractor,
 },
 
 {
@@ -76,7 +76,7 @@ __tests__ = (
                   "%83%AB%E3%83%95%E3%82%B8%E3%82%A7%E3%83%AB%E3%83%8D%E3%82"
                   "%A4%E3%83%AB"),
     "#category": ("", "hatenablog", "archive"),
-    "#class"   : hatenablog.HatenaBlogArchiveExtractor,
+    "#class"   : hatenablog.HatenablogArchiveExtractor,
     "#range"   : "1-30",
     "#count"   : 30,
 },
@@ -84,21 +84,21 @@ __tests__ = (
 {
     "#url"     : "https://moko0908.hatenablog.jp/archive/2023",
     "#category": ("", "hatenablog", "archive"),
-    "#class"   : hatenablog.HatenaBlogArchiveExtractor,
+    "#class"   : hatenablog.HatenablogArchiveExtractor,
     "#count"   : 13,
 },
 
 {
     "#url"     : "https://p-shirokuma.hatenadiary.com/archive/2023/01",
     "#category": ("", "hatenablog", "archive"),
-    "#class"   : hatenablog.HatenaBlogArchiveExtractor,
+    "#class"   : hatenablog.HatenablogArchiveExtractor,
     "#count"   : 5,
 },
 
 {
     "#url"     : "https://urakatahero.hateblo.jp/archive",
     "#category": ("", "hatenablog", "archive"),
-    "#class"   : hatenablog.HatenaBlogArchiveExtractor,
+    "#class"   : hatenablog.HatenablogArchiveExtractor,
     "#range"   : "1-30",
     "#count"   : 30,
 },
@@ -106,13 +106,13 @@ __tests__ = (
 {
     "#url"     : "hatenablog:https://blog.hyouhon.com/archive/2024/01/01",
     "#category": ("", "hatenablog", "archive"),
-    "#class"   : hatenablog.HatenaBlogArchiveExtractor,
+    "#class"   : hatenablog.HatenablogArchiveExtractor,
 },
 
 {
     "#url"     : "hatenablog:https://blog.hyouhon.com/search?q=a",
     "#category": ("", "hatenablog", "search"),
-    "#class"   : hatenablog.HatenaBlogSearchExtractor,
+    "#class"   : hatenablog.HatenablogSearchExtractor,
     "#range"   : "1-30",
     "#count"   : 30,
 },
@@ -120,25 +120,25 @@ __tests__ = (
 {
     "#url"     : "https://cosmiclatte.hatenablog.com/search?q=a",
     "#category": ("", "hatenablog", "search"),
-    "#class"   : hatenablog.HatenaBlogSearchExtractor,
+    "#class"   : hatenablog.HatenablogSearchExtractor,
 },
 
 {
     "#url"     : "https://moko0908.hatenablog.jp/search?q=a",
     "#category": ("", "hatenablog", "search"),
-    "#class"   : hatenablog.HatenaBlogSearchExtractor,
+    "#class"   : hatenablog.HatenablogSearchExtractor,
 },
 
 {
     "#url"     : "https://p-shirokuma.hatenadiary.com/search?q=a",
     "#category": ("", "hatenablog", "search"),
-    "#class"   : hatenablog.HatenaBlogSearchExtractor,
+    "#class"   : hatenablog.HatenablogSearchExtractor,
 },
 
 {
     "#url"     : "https://urakatahero.hateblo.jp/search?q=a",
     "#category": ("", "hatenablog", "search"),
-    "#class"   : hatenablog.HatenaBlogSearchExtractor,
+    "#class"   : hatenablog.HatenablogSearchExtractor,
 },
 
 )