[webtoons] update & simplify code

gallery_dl/extractor/webtoons.py

@@ -34,7 +34,7 @@ class WebtoonsBase():
         response = Extractor.request(self, url, **kwargs)
         if response.history and "/ageGate" in response.url:
             raise exception.StopExtraction(
-                "HTTP redirect to age gate check ('%s')", response.request.url)
+                "HTTP redirect to age gate check ('%s')", response.url)
         return response
 
 
@@ -44,47 +44,19 @@ class WebtoonsEpisodeExtractor(WebtoonsBase, GalleryExtractor):
     directory_fmt = ("{category}", "{comic}")
     filename_fmt = "{episode_no}-{num:>02}.{extension}"
     archive_fmt = "{title_no}_{episode_no}_{num}"
-    pattern = (BASE_PATTERN + r"/([^/?#]+)/([^/?#]+)/(?:[^/?#]+))"
-               r"/viewer(?:\?([^#'\"]+))")
+    pattern = (BASE_PATTERN + r"/([^/?#]+)/([^/?#]+)/[^/?#]+)"
+               r"/viewer\?([^#'\"]+)")
     example = ("https://www.webtoons.com/en/GENRE/TITLE/NAME/viewer"
                "?title_no=123&episode_no=12345")
-    test = (
-        (("https://www.webtoons.com/en/comedy/safely-endangered"
-          "/ep-572-earth/viewer?title_no=352&episode_no=572"), {
-            "url": "55bec5d7c42aba19e3d0d56db25fdf0b0b13be38",
-            "content": ("1748c7e82b6db910fa179f6dc7c4281b0f680fa7",
-                        "42055e44659f6ffc410b3fb6557346dfbb993df3",
-                        "49e1f2def04c6f7a6a3dacf245a1cd9abe77a6a9"),
-            "count": 5,
-        }),
-        (("https://www.webtoons.com/en/challenge/punderworld"
-          "/happy-earth-day-/viewer?title_no=312584&episode_no=40"), {
-            "exception": exception.NotFoundError,
-            "keyword": {
-                "comic": "punderworld",
-                "description": str,
-                "episode": "36",
-                "episode_no": "40",
-                "genre": "challenge",
-                "title": r"re:^Punderworld - .+",
-                "title_no": "312584",
-            },
-        }),
-    )
-
-    def __init__(self, match):
-        self.path, self.lang, self.genre, self.comic, self.query = \
-            match.groups()
-
-        url = "{}/{}/viewer?{}".format(self.root, self.path, self.query)
-        GalleryExtractor.__init__(self, match, url)
 
     def _init(self):
         self.setup_agegate_cookies()
 
-        params = text.parse_query(self.query)
+        path, self.lang, self.genre, self.comic, query = self.groups
+        params = text.parse_query(query)
         self.title_no = params.get("title_no")
         self.episode_no = params.get("episode_no")
+        self.gallery_url = "{}/{}/viewer?{}".format(self.root, path, query)
 
     def metadata(self, page):
         extr = text.extract_from(page)
@@ -124,8 +96,7 @@ class WebtoonsEpisodeExtractor(WebtoonsBase, GalleryExtractor):
             "language"    : util.code_to_language(self.lang),
         }
 
-    @staticmethod
-    def images(page):
+    def images(self, page):
         return [
             (url.replace("://webtoon-phinf.", "://swebtoon-phinf."), None)
             for url in text.extract_iter(
@@ -137,19 +108,14 @@ class WebtoonsComicExtractor(WebtoonsBase, Extractor):
     """Extractor for an entire comic on webtoons.com"""
     subcategory = "comic"
     categorytransfer = True
-    pattern = (BASE_PATTERN + r"/([^/?#]+)/([^/?#]+))"
-               r"/list(?:\?([^#]+))")
+    pattern = BASE_PATTERN + r"/([^/?#]+)/([^/?#]+))/list\?([^#]+)"
     example = "https://www.webtoons.com/en/GENRE/TITLE/list?title_no=123"
 
-    def __init__(self, match):
-        Extractor.__init__(self, match)
-        self.path, self.lang, self.genre, self.comic, self.query = \
-            match.groups()
-
     def _init(self):
         self.setup_agegate_cookies()
 
-        params = text.parse_query(self.query)
+        self.path, self.lang, self.genre, self.comic, query = self.groups
+        params = text.parse_query(query)
         self.title_no = params.get("title_no")
         self.page_no = text.parse_int(params.get("page"), 1)
 
@@ -164,7 +130,7 @@ class WebtoonsComicExtractor(WebtoonsBase, Extractor):
             path = "/{}/list?title_no={}&page={}".format(
                 self.path, self.title_no, self.page_no)
 
-            if page and path not in page:
+            if page is not None and path not in page:
                 return
 
             response = self.request(self.root + path)
@@ -182,8 +148,7 @@ class WebtoonsComicExtractor(WebtoonsBase, Extractor):
 
             self.page_no += 1
 
-    @staticmethod
-    def get_episode_urls(page):
+    def get_episode_urls(self, page):
         """Extract and return all episode urls in 'page'"""
         page = text.extr(page, 'id="_listUl"', '</ul>')
         return [