From ef635635c16d947c9bb56fd1d88d5a6b5e19c8f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Wed, 13 Aug 2025 15:31:04 +0200
Subject: [PATCH] [imagehosts] combine imgdrive/taxi/wallet extractors

less class definitions for the same code
---
 gallery_dl/extractor/imagehosts.py | 33 ++++++++++--------------------
 scripts/supportedsites.py          |  6 ++++++
 test/results/imgtaxi.py            |  2 +-
 test/results/imgwallet.py          |  2 +-
 4 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/gallery_dl/extractor/imagehosts.py b/gallery_dl/extractor/imagehosts.py
index cfd2e823..fccc466a 100644
--- a/gallery_dl/extractor/imagehosts.py
+++ b/gallery_dl/extractor/imagehosts.py
@@ -408,33 +408,22 @@ class PicstateImageExtractor(ImagehostImageExtractor):
 class ImgdriveImageExtractor(ImagehostImageExtractor):
     """Extractor for single images from imgdrive.net"""
     category = "imgdrive"
-    pattern = r"(?:https?://)?((?:www\.)?imgdrive\.net/img-(\w+)\.html)"
+    pattern = (r"(?:https?://)?(?:www\.)?(img(drive|taxi|wallet)\.(?:com|net)"
+               r"/img-(\w+)\.html)")
     example = "https://imgdrive.net/img-0123456789abc.html"
 
+    def __init__(self, match):
+        path, category, self.token = match.groups()
+        self.page_url = f"https://{path}"
+        self.category = f"img{category}"
+        Extractor.__init__(self, match)
+
     def get_info(self, page):
         title, pos = text.extract(
             page, 'property="og:title" content="', '"')
-        url  , pos = text.extract(
+        image, pos = text.extract(
             page, 'property="og:image" content="', '"', pos)
-        return url.replace("/small/", "/big/"), title.rsplit(" | ", 2)[0]
-
-
-class ImgtaxiImageExtractor(ImagehostImageExtractor):
-    """Extractor for single images from imgtaxi.com"""
-    category = "imgtaxi"
-    pattern = r"(?:https?://)?((?:www\.)?imgtaxi\.com/img-(\w+)\.html)"
-    example = "https://imgtaxi.com/img-0123456789abc.html"
-
-    get_info = ImgdriveImageExtractor.get_info
-
-
-class ImgwalletImageExtractor(ImagehostImageExtractor):
-    """Extractor for single images from imgwallet.com"""
-    category = "imgwallet"
-    pattern = r"(?:https?://)?((?:www\.)?imgwallet\.com/img-(\w+)\.html)"
-    example = "https://imgwallet.com/img-0123456789abc.html"
-
-    get_info = ImgdriveImageExtractor.get_info
+        return image.replace("/small/", "/big/"), title.rsplit(" | ", 2)[0]
 
 
 class SilverpicImageExtractor(ImagehostImageExtractor):
@@ -447,7 +436,7 @@ class SilverpicImageExtractor(ImagehostImageExtractor):
     def get_info(self, page):
         url, pos = text.extract(page, '<img src="/img/', '"')
         alt, pos = text.extract(page, 'alt="', '"', pos)
-        return "https://silverpic.com/img/" + url, alt
+        return f"https://silverpic.com/img/{url}", alt
 
     def metadata(self, page):
         pos = page.find('<img src="/img/')
diff --git a/scripts/supportedsites.py b/scripts/supportedsites.py
index e6b30c11..74fcff6e 100755
--- a/scripts/supportedsites.py
+++ b/scripts/supportedsites.py
@@ -653,6 +653,12 @@ def build_extractor_list():
     default["wikifeetx"] = default["wikifeet"]
     domains["wikifeetx"] = "https://www.wikifeetx.com/"
 
+    # imgdrive / imgtaxi / imgwallet
+    default["imgtaxi"] = default["imgdrive"]
+    default["imgwallet"] = default["imgdrive"]
+    domains["imgtaxi"] = "https://imgtaxi.com/"
+    domains["imgwallet"] = "https://imgwallet.com/"
+
     # add extra e621 extractors
     categories["E621"]["e621"].extend(default.pop("e621", ()))
 
diff --git a/test/results/imgtaxi.py b/test/results/imgtaxi.py
index 8f979b5c..c41fe81e 100644
--- a/test/results/imgtaxi.py
+++ b/test/results/imgtaxi.py
@@ -11,7 +11,7 @@ __tests__ = (
 {
     "#url"     : "https://imgtaxi.com/img-61c71cea940d6.html",
     "#category": ("imagehost", "imgtaxi", "image"),
-    "#class"   : imagehosts.ImgtaxiImageExtractor,
+    "#class"   : imagehosts.ImgdriveImageExtractor,
     "#results" : "https://imgtaxi.com/images/big/2021/12/25/61c71cea940d5.jpg",
 
     "filename" : "SLn_0001",
diff --git a/test/results/imgwallet.py b/test/results/imgwallet.py
index 664fcaf5..c2f874aa 100644
--- a/test/results/imgwallet.py
+++ b/test/results/imgwallet.py
@@ -11,7 +11,7 @@ __tests__ = (
 {
     "#url"     : "https://imgwallet.com/img-62fd3045ceec6.html",
     "#category": ("imagehost", "imgwallet", "image"),
-    "#class"   : imagehosts.ImgwalletImageExtractor,
+    "#class"   : imagehosts.ImgdriveImageExtractor,
     "#results" : "https://imgwallet.com/images/big/2022/08/17/62fd3045ceec5.JPG",
 
     "filename" : "S0ph (1)",