fixed a bug
parent
924d84499c
commit
c067bcad78
|
@ -195,11 +195,12 @@ def cloudflare_wait(driver):
|
||||||
if delta >= abort_after:
|
if delta >= abort_after:
|
||||||
logger.error(f'Timeout:\tCouldnt bypass cloudflare. \
|
logger.error(f'Timeout:\tCouldnt bypass cloudflare. \
|
||||||
See the screenshot for more info:\t{get_data_dir()}/screenshot.png')
|
See the screenshot for more info:\t{get_data_dir()}/screenshot.png')
|
||||||
break
|
return 1
|
||||||
title = driver.title
|
title = driver.title
|
||||||
if not title == "Just a moment...":
|
if not title == "Just a moment...":
|
||||||
break
|
break
|
||||||
time.sleep(1) # This is necessary to make sure everything has loaded fine.
|
time.sleep(2) # This is necessary to make sure everything has loaded fine.
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
def request(request_type, url, **kwargs): # Headers not yet supported , headers={}
|
def request(request_type, url, **kwargs): # Headers not yet supported , headers={}
|
||||||
|
@ -221,11 +222,15 @@ def request(request_type, url, **kwargs): # Headers not yet supported , headers
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
||||||
cloudflare_wait(driver)
|
exit_code = cloudflare_wait(driver)
|
||||||
user_agent = driver.execute_script("return navigator.userAgent;")
|
user_agent = driver.execute_script("return navigator.userAgent;")
|
||||||
cookies = driver.get_cookies()
|
cookies = driver.get_cookies()
|
||||||
text = driver.page_source
|
text = driver.page_source
|
||||||
driver.close()
|
driver.close()
|
||||||
|
if exit_code == 0:
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
return SeleResponse(url, request_type, None, cookies, user_agent)
|
||||||
|
|
||||||
seleResponse = SeleResponse(url, request_type, text, cookies, user_agent)
|
seleResponse = SeleResponse(url, request_type, text, cookies, user_agent)
|
||||||
cache_request(seleResponse)
|
cache_request(seleResponse)
|
||||||
|
|
Loading…
Reference in New Issue