diff --git a/docs/configuration.rst b/docs/configuration.rst
index 985696e9..1f3d3428 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -446,7 +446,6 @@ Default
* ``"3.0-6.0"``
``bilibili``,
``exhentai``,
- ``idolcomplex``,
``[reactor]``,
``readcomiconline``
* ``"6.0-6.1"``
diff --git a/docs/gallery-dl.conf b/docs/gallery-dl.conf
index 715ec7ea..687155e4 100644
--- a/docs/gallery-dl.conf
+++ b/docs/gallery-dl.conf
@@ -381,8 +381,9 @@
{
"username": "",
"password": "",
- "referer" : false,
- "sleep-request": "3.0-6.0"
+
+ "refresh" : false,
+ "tags" : false
},
"imagechest":
{
@@ -643,8 +644,8 @@
"username": "",
"password": "",
- "refresh" : false,
- "tags" : false
+ "refresh" : false,
+ "tags" : false
},
"sankakucomplex":
{
diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index e4cde17d..3c4aa68e 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -417,7 +417,7 @@ Consider all listed sites to potentially be NSFW.
| Idol Complex |
- https://idol.sankakucomplex.com/ |
+ https://www.idolcomplex.com/ |
Pools, Posts, Tag Searches |
Supported |
diff --git a/gallery_dl/extractor/idolcomplex.py b/gallery_dl/extractor/idolcomplex.py
index 075e1f66..26fd5958 100644
--- a/gallery_dl/extractor/idolcomplex.py
+++ b/gallery_dl/extractor/idolcomplex.py
@@ -6,266 +6,39 @@
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
-"""Extractors for https://idol.sankakucomplex.com/"""
+"""Extractors for https://www.idolcomplex.com/"""
-from .sankaku import SankakuExtractor
-from .common import Message
-from ..cache import cache
-from .. import text, util, exception
-import collections
-import re
+from . import sankaku
-BASE_PATTERN = r"(?:https?://)?idol\.sankakucomplex\.com(?:/[a-z]{2})?"
+BASE_PATTERN = (r"(?:https?://)?(?:www\.)?"
+ r"idol(?:\.sankaku)?complex\.com(?:/[a-z]{2})?")
-class IdolcomplexExtractor(SankakuExtractor):
+class IdolcomplexBase():
"""Base class for idolcomplex extractors"""
category = "idolcomplex"
- root = "https://idol.sankakucomplex.com"
- cookies_domain = "idol.sankakucomplex.com"
- cookies_names = ("_idolcomplex_session",)
- referer = False
- request_interval = (3.0, 6.0)
-
- def __init__(self, match):
- SankakuExtractor.__init__(self, match)
- self.logged_in = True
- self.start_page = 1
- self.start_post = 0
+ root = "https://www.idolcomplex.com"
+ cookies_domain = ".idolcomplex.com"
def _init(self):
- self.find_pids = re.compile(
- r" href=[\"#]/\w\w/posts/(\w+)"
- ).findall
- self.find_tags = re.compile(
- r'tag-type-([^"]+)">\s*