Merge branch 'master' into alpha

2021-08-28 16:43:20 +02:00
parent 27562cad4d 6b12a2c893
commit 8975f950c5
65 changed files with 1423 additions and 1472 deletions
@@ -285,12 +285,16 @@ def downloadpage(url, **opt):
    parse = urlparse.urlparse(url)
    domain = parse.netloc

-    from lib import requests
-    session = requests.session()
+    if opt.get('cloudscraper'):
+        from lib import cloudscraper
+        session = cloudscraper.create_scraper()
+    else:
+        from lib import requests
+        session = requests.session()

-    if config.get_setting('resolver_dns') and not opt.get('use_requests', False):
-        from core import resolverdns
-        session.mount('https://', resolverdns.CipherSuiteAdapter(domain))
+        if config.get_setting('resolver_dns') and not opt.get('use_requests', False):
+            from core import resolverdns
+            session.mount('https://', resolverdns.CipherSuiteAdapter(domain))

    req_headers = default_headers.copy()