From b603b592cfc17c036f2e7fbbee8f7c7ed4be98ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Tue, 4 Apr 2017 09:30:35 +0200 Subject: [PATCH] [exhentai] accept "e-hentai.org" URLs (#11) --- gallery_dl/extractor/exhentai.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gallery_dl/extractor/exhentai.py b/gallery_dl/extractor/exhentai.py index 0269e8a835..44fc82a7ee 100644 --- a/gallery_dl/extractor/exhentai.py +++ b/gallery_dl/extractor/exhentai.py @@ -22,7 +22,7 @@ class ExhentaiGalleryExtractor(Extractor): subcategory = "gallery" directory_fmt = ["{category}", "{gallery-id}"] filename_fmt = "{gallery-id}_{num:>04}_{image-token}_{name}.{extension}" - pattern = [r"(?:https?://)?(?:g\.e-|ex)hentai\.org/g/(\d+)/([\da-f]{10})"] + pattern = [r"(?:https?://)?(g\.e-|e-|ex)hentai\.org/g/(\d+)/([\da-f]{10})"] test = [ ("https://exhentai.org/g/960460/4f0e369d82/", { "keyword": "623f8c86c9fe38e964682dd4309b96922655b900", @@ -41,7 +41,7 @@ def __init__(self, match): Extractor.__init__(self) self.key = {} self.count = 0 - self.gid, self.token = match.groups() + self.version, self.gid, self.token = match.groups() self.original = config.interpolate( ("extractor", "exhentai", "original"), True) self.wait_min = config.interpolate(