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:
Alhaziel01
2021-12-22 12:00:30 +01:00
parent 92e8a3fcc4
commit 91871c7846
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
specials/globalsearch.py
+13 -12
View File
@@ -343,11 +343,11 @@ class SearchWindow(xbmcgui.WindowXML):
for searchAction in self.getActions(): for searchAction in self.getActions():
if self.exit: break if self.exit: break
self.search_threads.append(executor.submit(self.get_channel_results, searchAction)) self.search_threads.append(executor.submit(self.get_channel_results, searchAction))
# for res in futures.as_completed(self.search_threads): for res in futures.as_completed(self.search_threads):
# if self.exit: break if self.exit: break
# if res.result(): if res.result():
# channel, valid, results = res.result() channel, valid, results = res.result()
# self.update(channel, valid, results) self.update(channel, valid, results)
# if results: # if results:
# name = results[0].channel # name = results[0].channel
@@ -363,7 +363,7 @@ class SearchWindow(xbmcgui.WindowXML):
self.count = len(self.searchActions) self.count = len(self.searchActions)
def get_channel_results(self, searchAction): def get_channel_results(self, searchAction):
def search(text): def channel_search(text):
valid = [] valid = []
other = [] other = []
results = self.moduleDict[channel].search(searchAction, text) results = self.moduleDict[channel].search(searchAction, text)
@@ -388,7 +388,7 @@ class SearchWindow(xbmcgui.WindowXML):
other = [] other = []
try: try:
results, valid, other = search(self.item.text) results, valid, other = channel_search(self.item.text)
if self.exit: return if self.exit: return
# if we are on movie search but no valid results is found, and there's a lot of results (more pages), try # if we are on movie search but no valid results is found, and there's a lot of results (more pages), try
@@ -396,7 +396,7 @@ class SearchWindow(xbmcgui.WindowXML):
if self.item.contentType == 'movie' and not valid and other and other[-1].nextPage \ if self.item.contentType == 'movie' and not valid and other and other[-1].nextPage \
and self.item.infoLabels['year']: and self.item.infoLabels['year']:
logger.debug('retring adding year on channel ' + channel) logger.debug('retring adding year on channel ' + channel)
dummy, valid, dummy = search(self.item.text + " " + str(self.item.infoLabels['year'])) dummy, valid, dummy = channel_search(self.item.text + " " + str(self.item.infoLabels['year']))
if self.exit: return if self.exit: return
# some channels may use original title # some channels may use original title
@@ -404,17 +404,18 @@ class SearchWindow(xbmcgui.WindowXML):
original = scrapertools.title_unify(self.item.infoLabels.get('originaltitle')) original = scrapertools.title_unify(self.item.infoLabels.get('originaltitle'))
if self.item.text != original: if self.item.text != original:
logger.debug('retring with original title on channel ' + channel) logger.debug('retring with original title on channel ' + channel)
dummy, valid, dummy = search(original) dummy, valid, dummy = channel_search(original)
except: except:
import traceback import traceback
logger.error(traceback.format_exc()) logger.error(traceback.format_exc())
if self.exit: return if self.exit: return
update_lock.acquire() # update_lock.acquire()
self.count += 1 self.count += 1
# return channel, valid, other if other else results
return channel, valid, other if other else results
self.update(channel, valid, other if other else results) self.update(channel, valid, other if other else results)
update_lock.release() # update_lock.release()
def makeItem(self, url): def makeItem(self, url):
item = Item().fromurl(url) item = Item().fromurl(url)