From 699062b91fac3b2729f483f65625e462dbc1fe31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Thu, 25 Jun 2020 19:35:03 +0200 Subject: [PATCH] Revert "[kissmanga] workaround for CAPTCHAs (#818)" This reverts commit 4cf3d54718812ae2bcf6cd5ee39347409946921e. --- gallery_dl/extractor/kissmanga.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gallery_dl/extractor/kissmanga.py b/gallery_dl/extractor/kissmanga.py index ade245bc..348453d7 100644 --- a/gallery_dl/extractor/kissmanga.py +++ b/gallery_dl/extractor/kissmanga.py @@ -9,10 +9,9 @@ """Extract manga-chapters and entire manga from https://kissmanga.com/""" from .common import ChapterExtractor, MangaExtractor, Extractor -from .. import text, aes +from .. import text, aes, exception from ..cache import cache import hashlib -import time import ast import re @@ -25,7 +24,18 @@ class RedirectMixin(): response = Extractor.request(self, url, **kwargs) if not response.history or "/AreYouHuman" not in response.url: return response - time.sleep(2) + if self.config("captcha", "stop") == "wait": + self.log.warning( + "Redirect to \n%s\nVisit this URL in your browser, solve " + "the CAPTCHA, and press ENTER to continue", response.url) + try: + input() + except (EOFError, OSError): + pass + else: + raise exception.StopExtraction( + "Redirect to \n%s\nVisit this URL in your browser and " + "solve the CAPTCHA to continue", response.url) class KissmangaBase(RedirectMixin):