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

migliorie ricerca globale

Browse Source
This commit is contained in:
marco
2020-05-30 11:47:31 +02:00
parent f31ea2eb74
commit a077b2c10f
3 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/language/English/strings.po
View File

@@ -116,7 +116,7 @@ msgid "Contextual menu"
msgstr ""
msgctxt "#30025"
msgid ""
msgid "Other possible results"
msgstr ""
msgctxt "#30026"
@@ -529,7 +529,7 @@ msgid "Synchronization with Trakt started"
msgstr ""
msgctxt "#59972"
msgid "Search for: '%s' | Found: %d vídeos | Time: %2.f seconds"
msgid "Search for: '%s' | Time: %2.f seconds"
msgstr ""
msgctxt "#59973"

8
resources/language/Italian/strings.po
View File

@@ -116,8 +116,8 @@ msgid "Contextual menu"
msgstr "Menu contestuale"
msgctxt "#30025"
msgid ""
msgstr ""
msgid "Other possible results"
msgstr "Altri possibili risultati:"
msgctxt "#30026"
msgid "Direct"
@@ -528,8 +528,8 @@ msgid "Synchronization with Trakt started"
msgstr "Sincronizzazione con Trakt iniziata"
msgctxt "#59972"
msgid "Search for: '%s' | Found: %d vídeos | Time: %2.f seconds"
msgstr "Ricerca di: '%s' | Trovati: %d video | Tempo: %2.f secondi"
msgid "Search for: '%s' | Time: %2.f seconds"
msgstr "Ricerca di: '%s' | Tempo: %2.f secondi"
msgctxt "#59973"
msgid "Search Cancelled"

71
specials/search.py
View File

@@ -198,21 +198,27 @@ def channel_search(item):
cnt = 0
progress = platformtools.dialog_progress(config.get_localized_string(30993) % item.title, config.get_localized_string(70744) % len(channel_list),
str(searching_titles))
', '.join(searching_titles))
config.set_setting('tmdb_active', False)
search_action_list = []
module_dict = {}
logger.info('start import')
for ch in channel_list:
# ch_params = channeltools.get_channel_parameters(ch)
module = __import__('channels.%s' % ch, fromlist=["channels.%s" % ch])
mainlist = getattr(module, 'mainlist')(Item(channel=ch, global_search=True))
try:
module = __import__('channels.%s' % ch, fromlist=["channels.%s" % ch])
mainlist = getattr(module, 'mainlist')(Item(channel=ch, global_search=True))
module_dict[ch] = module
search_action_list.extend([elem for elem in mainlist if
elem.action == "search" and (item.mode == 'all' or elem.contentType == item.mode)])
logger.info('end import')
module_dict[ch] = module
search_action_list.extend([elem for elem in mainlist if
elem.action == "search" and (mode == 'all' or elem.contentType == mode)])
if progress.iscanceled():
return []
except:
import traceback
logger.error('error importing/getting search items of ' + ch)
logger.error(traceback.format_exc())
total_search_actions = len(search_action_list)
with futures.ThreadPoolExecutor(max_workers=set_workers()) as executor:
c_results = []
for search_action in search_action_list:
@@ -221,18 +227,27 @@ def channel_search(item):
break
for res in futures.as_completed(c_results):
cnt += 1
finished = res.result()[0]
search_action = res.result()[0]
channel = search_action.channel
if res.result()[1]:
ch_list[res.result()[0]] = res.result()[1]
if channel not in ch_list:
ch_list[channel] = []
ch_list[channel].extend(res.result()[1])
if progress.iscanceled():
break
if finished in searching:
searching_titles.remove(searching_titles[searching.index(finished)])
searching.remove(finished)
progress.update(old_div((cnt * 100), len(channel_list)), config.get_localized_string(70744) % str(len(channel_list) - cnt),
str(searching_titles))
search_action_list.remove(search_action)
# if no action of this channel remains
for it in search_action_list:
if it.channel == channel:
break
else:
cnt += 1
searching_titles.remove(searching_titles[searching.index(channel)])
searching.remove(channel)
progress.update(old_div(((total_search_actions - len(search_action_list)) * 100), total_search_actions), config.get_localized_string(70744) % str(len(channel_list) - cnt),
', '.join(searching_titles))
progress.close()
@@ -241,7 +256,7 @@ def channel_search(item):
config.get_localized_string(60293))
config.set_setting('tmdb_active', True)
res_count = 0
# res_count = 0
for key, value in ch_list.items():
ch_name = channel_titles[channel_list.index(key)]
grouped = list()
@@ -288,7 +303,7 @@ def channel_search(item):
title = typo(ch_name,'bold') + typo(str(len(grouped)), '_ [] color kod bold')
else:
title = typo('%s %s' % (len(grouped), config.get_localized_string(70695)), 'bold')
res_count += len(grouped)
# res_count += len(grouped)
plot=''
for it in grouped:
@@ -301,12 +316,16 @@ def channel_search(item):
# send_to_temp(to_temp)
config.set_setting('tmdb_active', True)
results = sorted(results, key=lambda it: it.title)
results_statistic = config.get_localized_string(59972) % (item.title, time.time() - start)
if item.mode == 'all':
if config.get_setting('result_mode', 'search') != 0:
res_count = len(results)
results = sorted(results, key=lambda it: it.title)
results_statistic = config.get_localized_string(59972) % (item.title, res_count, time.time() - start)
results.insert(0, Item(title = typo(results_statistic,'color kod bold')))
results.insert(0, Item(title=typo(results_statistic, 'color kod bold'), thumbnail=get_thumb('search.png')))
else:
valid.insert(0, Item(title=typo(results_statistic, 'color kod bold'), thumbnail=get_thumb('search.png')))
if results:
results.insert(0, Item(title=typo(config.get_localized_string(30025), 'color kod bold'), thumbnail=get_thumb('search.png')))
# logger.debug(results_statistic)
return valid + results
@@ -328,9 +347,9 @@ def get_channel_results(item, module_dict, search_action):
results = get_info(results)
return [ch, results]
return [search_action, results]
except:
return [ch, results]
return [search_action, results]
def get_info(itemlist):