stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

modifica nomi canali in ricerca globale

Browse Source
This commit is contained in:
marco
2019-12-19 19:23:00 +01:00
parent 2f0457a7c7
commit 3ef0596bab
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
specials/search.py
+13 -7
View File
@@ -170,15 +170,16 @@ def channel_search(item):
from lib import cloudscraper from lib import cloudscraper
session = cloudscraper.create_scraper() session = cloudscraper.create_scraper()
searching += channel_list searching += [ch[0] for ch in channel_list]
searching_titles = [ch[1] for ch in channel_list]
cnt = 0 cnt = 0
progress = platformtools.dialog_progress(config.get_localized_string(30993) % item.title, config.get_localized_string(70744) % len(channel_list), progress = platformtools.dialog_progress(config.get_localized_string(30993) % item.title, config.get_localized_string(70744) % len(channel_list),
str(searching)) str(searching_titles))
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, session) for ch in channel_list] c_results = [executor.submit(get_channel_results, ch[0], 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
@@ -189,9 +190,10 @@ def channel_search(item):
if progress.iscanceled(): if progress.iscanceled():
break break
if finished in searching: if finished in searching:
searching_titles.remove(searching_titles[searching.index(finished)])
searching.remove(finished) searching.remove(finished)
progress.update((cnt * 100) / len(channel_list), config.get_localized_string(70744) % str(len(channel_list) - cnt), progress.update((cnt * 100) / len(channel_list), config.get_localized_string(70744) % str(len(channel_list) - cnt),
str(searching)) str(searching_titles))
progress.close() progress.close()
@@ -202,8 +204,12 @@ def channel_search(item):
config.set_setting('tmdb_active', True) config.set_setting('tmdb_active', True)
res_count = 0 res_count = 0
for key, value in ch_list.items(): for key, value in ch_list.items():
ch_path = filetools.join(config.get_runtime_path(),'channels',key+'.json') for ch in channel_list:
ch_name = jsontools.load(filetools.read(ch_path))['name'] if ch[0] == key:
ch_name = ch[1]
break
else:
ch_name = key
grouped = list() grouped = list()
cnt += 1 cnt += 1
progress.update((cnt * 100) / len(ch_list), config.get_localized_string(60295), config.get_localized_string(60293)) progress.update((cnt * 100) / len(ch_list), config.get_localized_string(60295), config.get_localized_string(60293))
@@ -327,7 +333,7 @@ def get_channels(item):
if item.mode == 'all' or (item.mode in list_cat): if item.mode == 'all' or (item.mode in list_cat):
if config.get_setting("include_in_global_search", channel): if config.get_setting("include_in_global_search", channel):
channels_list.append(channel) channels_list.append((channel, ch_param.get('title', channel)))
return channels_list return channels_list