miglioria httptools

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

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