CF Come unico metodo per httptools

This commit is contained in:
Alhaziel
2019-12-17 21:19:30 +01:00
parent f647347235
commit 2923bbed79
2 changed files with 17 additions and 8 deletions

View File

@@ -409,15 +409,21 @@ def downloadpage(url, **opt):
"""
load_cookies()
if scrapertoolsV2.get_domain_from_url(url) in ['www.seriehd.moda', 'wstream.video', 'www.guardaserie.media', 'akvideo.stream','www.piratestreaming.top']: # cloudflare urls
if opt.get('session', False):
# if scrapertoolsV2.get_domain_from_url(url) in ['www.seriehd.moda', 'wstream.video', 'www.guardaserie.media', 'akvideo.stream','www.piratestreaming.top']: # cloudflare urls
# if opt.get('session', False):
# session = opt['session'] # same session to speed up search
# else:
# from lib import cloudscraper
# session = cloudscraper.create_scraper()
# else:
# from lib import requests
# session = requests.session()
if opt.get('session', False):
session = opt['session'] # same session to speed up search
else:
from lib import cloudscraper
session = cloudscraper.create_scraper()
else:
from lib import requests
session = requests.session()
from lib import cloudscraper
session = cloudscraper.create_scraper()
# Headers by default, if nothing is specified
req_headers = default_headers.copy()

View File

@@ -163,6 +163,9 @@ class CloudScraper(Session):
def request(self, method, url, *args, **kwargs):
# pylint: disable=E0203
from time import time
from platformcode import logger
start= time()
if kwargs.get('proxies') and kwargs.get('proxies') != self.proxies:
self.proxies = kwargs.get('proxies')
@@ -197,7 +200,7 @@ class CloudScraper(Session):
else:
if not resp.is_redirect and resp.status_code not in [429, 503]:
self._solveDepthCnt = 0
logger.debug('CF TIME= '+str(time()-start))
return resp
# ------------------------------------------------------------------------------- #