Piccola miglioria a search e selezione dei thread

This commit is contained in:
Alhaziel
2019-12-20 11:13:48 +01:00
parent 2756f73ebc
commit 82705ef806
5 changed files with 33 additions and 8 deletions
+1 -3
View File
@@ -36,9 +36,7 @@ def getmainlist(view="thumb_"):
if addon.getSetting('enable_search_menu') == "true": if addon.getSetting('enable_search_menu') == "true":
itemlist.append(Item(title=config.get_localized_string(30103), channel="search", path='special', action="mainlist", itemlist.append(Item(title=config.get_localized_string(30103), channel="search", path='special', action="mainlist",
thumbnail=get_thumb("search.png", view), thumbnail=get_thumb("search.png", view),
category=config.get_localized_string(30119), viewmode="list", category=config.get_localized_string(30119), viewmode="list"))
context=[{"title": config.get_localized_string(70286), "channel": "search", "action": "opciones",
"goto": True}]))
if addon.getSetting('enable_onair_menu') == "true": if addon.getSetting('enable_onair_menu') == "true":
itemlist.append(Item(channel="filmontv", action="mainlist", title=config.get_localized_string(50001), itemlist.append(Item(channel="filmontv", action="mainlist", title=config.get_localized_string(50001),
+1 -1
View File
@@ -2715,7 +2715,7 @@ msgid "Global Search"
msgstr "" msgstr ""
msgctxt "#60673" msgctxt "#60673"
msgid "MultiThread Search" msgid "Number of Search Threads"
msgstr "" msgstr ""
msgctxt "#60674" msgctxt "#60674"
+2 -2
View File
@@ -2714,8 +2714,8 @@ msgid "Global Search"
msgstr "Ricerca globale" msgstr "Ricerca globale"
msgctxt "#60673" msgctxt "#60673"
msgid "MultiThread Search" msgid "Number of Search Threads"
msgstr "Ricerca MultiThread" msgstr "Numero di Threads di Ricerca"
msgctxt "#60674" msgctxt "#60674"
msgid "Show Results:" msgid "Show Results:"
+12 -1
View File
@@ -5,5 +5,16 @@
"adult": false, "adult": false,
"thumbnail": "", "thumbnail": "",
"banner": "", "banner": "",
"categories": [] "categories": [],
"settings": [
{
"id": "thread_number",
"type": "list",
"label": "@60673",
"default": 0,
"enabled": true,
"visible": true,
"lvalues": ["auto","1","2","4","6","8","16","24","32","64"]
}
]
} }
+17 -1
View File
@@ -11,6 +11,9 @@ from channelselector import get_thumb
from platformcode import logger, config, platformtools, unify from platformcode import logger, config, platformtools, unify
from core.support import typo from core.support import typo
import gc
gc.disable()
import xbmcaddon import xbmcaddon
addon = xbmcaddon.Addon('metadata.themoviedb.org') addon = xbmcaddon.Addon('metadata.themoviedb.org')
def_lang = addon.getSetting('language') def_lang = addon.getSetting('language')
@@ -38,6 +41,9 @@ def mainlist(item):
itemlist.append(Item(channel=item.channel, title=config.get_localized_string(59994), action='opciones', itemlist.append(Item(channel=item.channel, title=config.get_localized_string(59994), action='opciones',
thumbnail=get_thumb('setting_0.png'))) thumbnail=get_thumb('setting_0.png')))
itemlist.append(Item(channel=item.channel, title=config.get_localized_string(60415), action='settings',
thumbnail=get_thumb('setting_0.png')))
itemlist = set_context(itemlist) itemlist = set_context(itemlist)
return itemlist return itemlist
@@ -179,7 +185,7 @@ def channel_search(item):
str(searching_titles)) str(searching_titles))
config.set_setting('tmdb_active', False) config.set_setting('tmdb_active', False)
with futures.ThreadPoolExecutor() as executor: with futures.ThreadPoolExecutor(max_workers=set_workers()) 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, item, session) for ch in channel_list]
for res in futures.as_completed(c_results): for res in futures.as_completed(c_results):
@@ -339,6 +345,13 @@ def get_channels(item):
def opciones(item): def opciones(item):
return setting_channel_new(item) return setting_channel_new(item)
def settings(item):
return platformtools.show_channel_settings(caption=config.get_localized_string(59993))
def set_workers():
list_mode=[None,1,2,4,6,8,16,24,32,64]
index = config.get_setting('thread_number', 'search')
return list_mode[index]
def setting_channel_new(item): def setting_channel_new(item):
import xbmcgui import xbmcgui
@@ -652,6 +665,9 @@ def set_context(itemlist):
for elem in itemlist: for elem in itemlist:
elem.context = [{"title": config.get_localized_string(60412), elem.context = [{"title": config.get_localized_string(60412),
"action": "setting_channel_new", "action": "setting_channel_new",
"channel": "search"},
{"title": config.get_localized_string(60415),
"action": "settings",
"channel": "search"}] "channel": "search"}]
return itemlist return itemlist