From f687052daff70ec6c02ae2ef2d1b0b3c930bb289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 3 Aug 2019 11:42:28 +0200 Subject: [PATCH] have e-hentai and exhentai on supportedsites.rst (#365) --- CHANGELOG.md | 2 +- docs/supportedsites.rst | 1 + scripts/supportedsites.py | 13 ++++++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38e0739c..fe7b37e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ## 1.10.1 - 2019-08-02 ## Fixes -- Restore functionality of both domains for `exhentai` extractors +- Use the correct domain for exhentai.org input URLs ## 1.10.0 - 2019-08-01 ### Warning diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index d2fb4ea9..a37c5aae 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -28,6 +28,7 @@ Dynasty Reader https://dynasty-scans.com/ Chapters, individual Im E-Hentai https://e-hentai.org/ Favorites, Galleries, Search Results Optional e621 https://e621.net/ Pools, Popular Images, Posts, Tag-Searches EroLord.com http://erolord.com/ Galleries +ExHentai https://exhentai.org/ Favorites, Galleries, Search Results Optional Fallen Angels Scans https://www.fascans.com/ Chapters, Manga Fashion Nova https://www.fashionnova.com/ Collections, Products Fireden https://boards.fireden.net/ Threads diff --git a/scripts/supportedsites.py b/scripts/supportedsites.py index 498e3fce..78963aa2 100755 --- a/scripts/supportedsites.py +++ b/scripts/supportedsites.py @@ -24,7 +24,8 @@ CATEGORY_MAP = { "dynastyscans" : "Dynasty Reader", "e621" : "e621", "erolord" : "EroLord.com", - "exhentai" : "E-Hentai", + "e-hentai" : "E-Hentai", + "exhentai" : "ExHentai", "fallenangels" : "Fallen Angels Scans", "fashionnova" : "Fashion Nova", "hbrowse" : "HBrowse", @@ -109,6 +110,7 @@ SUBCATEGORY_MAP = { AUTH_MAP = { "danbooru" : "Optional", "deviantart" : "Optional (OAuth)", + "e-hentai" : "Optional", "exhentai" : "Optional", "flickr" : "Optional (OAuth)", "idolcomplex": "Optional", @@ -203,6 +205,15 @@ def build_extractor_list(): for extrlist in extractors.values(): extrlist.sort(key=subcategory_key) + # ugly hack to add e-hentai.org + eh = [] + for extr in extractors["exhentai"]: + class eh_extr(extr): + category = "e-hentai" + root = "https://e-hentai.org" + eh.append(eh_extr) + extractors["e-hentai"] = eh + # sort lists by category return sorted( extractors.values(),