From 0f7d03277337f10ac72f154a1252ba55076e0bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Thu, 10 Oct 2024 19:01:30 +0200
Subject: [PATCH] [shimmie2] use 'self.groups' to access matched URL values

---
 gallery_dl/extractor/shimmie2.py | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/gallery_dl/extractor/shimmie2.py b/gallery_dl/extractor/shimmie2.py
index 2d1b0954..97bad096 100644
--- a/gallery_dl/extractor/shimmie2.py
+++ b/gallery_dl/extractor/shimmie2.py
@@ -99,20 +99,15 @@ class Shimmie2TagExtractor(Shimmie2Extractor):
     subcategory = "tag"
     directory_fmt = ("{category}", "{search_tags}")
     file_url_fmt = "{}/_images/{}/{}%20-%20{}.{}"
-    pattern = BASE_PATTERN + r"post/list/([^/?#]+)(?:/(\d+))?()"
+    pattern = BASE_PATTERN + r"post/list/([^/?#]+)(?:/(\d+))?"
     example = "https://vidya.pics/post/list/TAG/1"
 
-    def __init__(self, match):
-        Shimmie2Extractor.__init__(self, match)
-        lastindex = match.lastindex
-        self.tags = text.unquote(match.group(lastindex-2))
-        self.page = match.group(lastindex-1)
-
     def metadata(self):
+        self.tags = text.unquote(self.groups[-2])
         return {"search_tags": self.tags}
 
     def posts(self):
-        pnum = text.parse_int(self.page, 1)
+        pnum = text.parse_int(self.groups[-1], 1)
         file_url_fmt = self.file_url_fmt.format
 
         init = True
@@ -166,7 +161,7 @@ class Shimmie2TagExtractor(Shimmie2Extractor):
                     return
 
     def _posts_giantessbooru(self):
-        pnum = text.parse_int(self.page, 1)
+        pnum = text.parse_int(self.groups[-1], 1)
         file_url_fmt = (self.root + "/index.php?q=/image/{}.jpg").format
 
         while True:
@@ -203,18 +198,15 @@ class Shimmie2PostExtractor(Shimmie2Extractor):
     pattern = BASE_PATTERN + r"post/view/(\d+)"
     example = "https://vidya.pics/post/view/12345"
 
-    def __init__(self, match):
-        Shimmie2Extractor.__init__(self, match)
-        self.post_id = match.group(match.lastindex)
-
     def posts(self):
-        url = "{}/post/view/{}".format(self.root, self.post_id)
+        post_id = self.groups[-1]
+        url = "{}/post/view/{}".format(self.root, post_id)
         page = self.request(url).text
         extr = text.extract_from(page)
         quote = self._quote_type(page)
 
         post = {
-            "id"      : self.post_id,
+            "id"      : post_id,
             "tags"    : extr(": ", "<").partition(" - ")[0].rstrip(")"),
             "md5"     : extr("/_thumbs/", "/"),
             "file_url": self.root + (
@@ -232,12 +224,12 @@ class Shimmie2PostExtractor(Shimmie2Extractor):
         return (post,)
 
     def _posts_giantessbooru(self):
-        url = "{}/index.php?q=/post/view/{}".format(
-            self.root, self.post_id)
+        post_id = self.groups[-1]
+        url = "{}/index.php?q=/post/view/{}".format(self.root, post_id)
         extr = text.extract_from(self.request(url).text)
 
         return ({
-            "id"      : self.post_id,
+            "id"      : post_id,
             "tags"    : extr(": ", "<").partition(" - ")[0].rstrip(")"),
             "md5"     : "",
             "file_url": self.root + extr("id='main_image' src='.", "'"),