Revert "niente sessione per ricerca globale"
This reverts commit 303e3d793f.
This commit is contained in:
+6
-2
@@ -419,8 +419,12 @@ def downloadpage(url, **opt):
|
|||||||
# from lib import requests
|
# from lib import requests
|
||||||
# session = requests.session()
|
# session = requests.session()
|
||||||
|
|
||||||
from lib import cloudscraper
|
if opt.get('session', False):
|
||||||
session = cloudscraper.create_scraper()
|
session = opt['session'] # same session to speed up search
|
||||||
|
logger.info('same session')
|
||||||
|
else:
|
||||||
|
from lib import cloudscraper
|
||||||
|
session = cloudscraper.create_scraper()
|
||||||
|
|
||||||
# Headers by default, if nothing is specified
|
# Headers by default, if nothing is specified
|
||||||
req_headers = default_headers.copy()
|
req_headers = default_headers.copy()
|
||||||
|
|||||||
+6
-2
@@ -174,6 +174,9 @@ def channel_search(item):
|
|||||||
|
|
||||||
channel_list = get_channels(item)
|
channel_list = get_channels(item)
|
||||||
|
|
||||||
|
from lib import cloudscraper
|
||||||
|
session = cloudscraper.create_scraper()
|
||||||
|
|
||||||
searching += channel_list
|
searching += channel_list
|
||||||
cnt = 0
|
cnt = 0
|
||||||
|
|
||||||
@@ -182,7 +185,7 @@ def channel_search(item):
|
|||||||
config.set_setting('tmdb_active', False)
|
config.set_setting('tmdb_active', False)
|
||||||
|
|
||||||
with futures.ThreadPoolExecutor() as executor:
|
with futures.ThreadPoolExecutor() as executor:
|
||||||
c_results = [executor.submit(get_channel_results, ch, item) for ch in channel_list]
|
c_results = [executor.submit(get_channel_results, ch, item, session) for ch in channel_list]
|
||||||
|
|
||||||
for res in futures.as_completed(c_results):
|
for res in futures.as_completed(c_results):
|
||||||
cnt += 1
|
cnt += 1
|
||||||
@@ -264,7 +267,7 @@ def channel_search(item):
|
|||||||
return valid + results
|
return valid + results
|
||||||
|
|
||||||
|
|
||||||
def get_channel_results(ch, item):
|
def get_channel_results(ch, item, session):
|
||||||
max_results = 10
|
max_results = 10
|
||||||
results = list()
|
results = list()
|
||||||
|
|
||||||
@@ -277,6 +280,7 @@ def get_channel_results(ch, item):
|
|||||||
|
|
||||||
if search_action:
|
if search_action:
|
||||||
for search_ in search_action:
|
for search_ in search_action:
|
||||||
|
search_.session = session
|
||||||
try:
|
try:
|
||||||
results.extend(module.search(search_, item.text))
|
results.extend(module.search(search_, item.text))
|
||||||
except:
|
except:
|
||||||
|
|||||||
Reference in New Issue
Block a user