From a90b731b9dfbf74a618351655b1c0c557b19e74c Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 5 Jan 2020 23:26:33 +0100 Subject: [PATCH] miglioria httptools --- core/httptools.py | 22 +++++++++++++--------- specials/search.py | 4 ++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/core/httptools.py b/core/httptools.py index c51d0c73..d6cdcbc2 100755 --- a/core/httptools.py +++ b/core/httptools.py @@ -251,18 +251,22 @@ def downloadpage(url, **opt): """ load_cookies() - if opt.get('session', False): - session = opt['session'] # same session to speed up search - logger.info('same session') - elif opt.get('use_requests', False): - from lib import requests - session = requests.session() - elif urlparse.urlparse(url).netloc in ['www.guardaserie.media']: + if urlparse.urlparse(url).netloc in ['www.guardaserie.media']: from lib import cloudscraper session = cloudscraper.create_scraper() - elif config.get_setting('resolver_dns'): + verify = True + elif opt.get('session', False): + session = opt['session'] # same session to speed up search + logger.info('same session') + verify = False + elif config.get_setting('resolver_dns') and not opt.get('use_requests', False): from specials import resolverdns session = resolverdns.session() + verify = False + else: + from lib import requests + session = requests.session() + verify = False req_headers = default_headers.copy() @@ -286,7 +290,7 @@ def downloadpage(url, **opt): files = {} file_name = '' - session.verify = opt.get('verify', True) + session.verify = opt.get('verify', verify) if opt.get('cookies', True): session.cookies = cj diff --git a/specials/search.py b/specials/search.py index 93f6e591..cafec48d 100755 --- a/specials/search.py +++ b/specials/search.py @@ -185,8 +185,8 @@ def channel_search(item): from specials import resolverdns session = resolverdns.session() else: - from lib import cloudscraper - session = cloudscraper.create_scraper() + import requests + session = requests.Session() searching += channel_list searching_titles += channel_titles