From b933646c12e48cab951bf582fc0e5d389f345b8e Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Wed, 28 Apr 2021 11:15:17 +0200 Subject: [PATCH] Fix Ricerca Globale --- core/support.py | 2 +- platformcode/autorenumber.py | 3 ++- specials/globalsearch.py | 15 ++++++++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/core/support.py b/core/support.py index 34895c79..250d683b 100755 --- a/core/support.py +++ b/core/support.py @@ -558,7 +558,7 @@ def scrape(func): if anime and inspect.stack()[1][3] not in ['find_episodes']: from platformcode import autorenumber - if (function == 'episodios' or item.action == 'episodios'): autorenumber.start(itemlist, item) + if function == 'episodios': autorenumber.start(itemlist, item) else: autorenumber.start(itemlist) # if anime and autorenumber.check(item) == False and len(itemlist)>0 and not scrapertools.find_single_match(itemlist[0].title, r'(\d+.\d+)'): # pass diff --git a/platformcode/autorenumber.py b/platformcode/autorenumber.py index 3282d870..2a730d82 100644 --- a/platformcode/autorenumber.py +++ b/platformcode/autorenumber.py @@ -100,11 +100,11 @@ class autorenumber(): def __init__(self, itemlist, item=None): self.item = item self.itemlist = itemlist - self.renumberdict = load(self.itemlist[0]) if self.itemlist else load(item) if item else {} self.selectspecials = False self.manual = False self.auto = False if self.item: + self.renumberdict = load(item) self.auto = config.get_setting('autorenumber', item.channel) self.title = self.item.fulltitle.strip() if match(self.itemlist[0].title, patron=r'[Ss]?(\d+)(?:x|_|\s+)[Ee]?[Pp]?(\d+)').match: @@ -130,6 +130,7 @@ class autorenumber(): self.episodes = {} self.config() else: + self.renumberdict = {} for item in self.itemlist: item.context = [{"title": typo(config.get_localized_string(70585), 'bold'), "action": "start", diff --git a/specials/globalsearch.py b/specials/globalsearch.py index 1afe7f0a..67db96e2 100644 --- a/specials/globalsearch.py +++ b/specials/globalsearch.py @@ -325,12 +325,12 @@ class SearchWindow(xbmcgui.WindowXML): for searchAction in self.searchActions: if self.exit: return self.search_threads.append(executor.submit(self.get_channel_results, searchAction)) - for ch in futures.as_completed(self.search_threads): - self.count += 1 - if self.exit: return - if ch.result(): - channel, valid, other = ch.result() - self.update(channel, valid, other) + # for ch in futures.as_completed(self.search_threads): + # self.count += 1 + # if self.exit: return + # if ch.result(): + # channel, valid, other = ch.result() + # self.update(channel, valid, other) except: import traceback logger.error(traceback.format_exc()) @@ -379,7 +379,8 @@ class SearchWindow(xbmcgui.WindowXML): import traceback logger.error(traceback.format_exc()) - return channel, valid, other if other else results + self.count += 1 + return self.update(channel, valid, other if other else results) def makeItem(self, url): item = Item().fromurl(url)