From f9dcedfd8310185a86573310c00b91fc5f8606cd Mon Sep 17 00:00:00 2001
From: mac12m99 <10120390+mac12m99@users.noreply.github.com>
Date: Sun, 7 Mar 2021 15:01:05 +0100
Subject: [PATCH] ricerca globale: fix mancanza "nessun risultato", ritenta
 ricerca film con anno se nessun risultato valido

---
 specials/globalsearch.py | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/specials/globalsearch.py b/specials/globalsearch.py
index 426c4cc4..4b7619cc 100644
--- a/specials/globalsearch.py
+++ b/specials/globalsearch.py
@@ -310,14 +310,8 @@ class SearchWindow(xbmcgui.WindowXML):
                 logger.debug('end search for:', searchAction.channel)
 
     def get_channel_results(self, searchAction):
-        logger.debug()
-        channel = searchAction.channel
-        results = []
-        valid = []
-        other = []
-
-        try:
-            results = self.moduleDict[channel].search(searchAction, self.item.text)
+        def search(text):
+            results = self.moduleDict[channel].search(searchAction, text)
             if len(results) == 1:
                 if not results[0].action or config.get_localized_string(70006).lower() in results[0].title.lower():
                     results = []
@@ -330,6 +324,18 @@ class SearchWindow(xbmcgui.WindowXML):
                         valid.append(elem)
                     else:
                         other.append(elem)
+
+        logger.debug()
+        channel = searchAction.channel
+        results = []
+        valid = []
+        other = []
+
+        try:
+            search(self.item.text)
+
+            if self.item.contentType == 'movie' and not valid and self.item.infoLabels['year']:
+                search(self.item.text + " " + str(self.item.infoLabels['year']))
         except:
             pass
 
@@ -430,9 +436,15 @@ class SearchWindow(xbmcgui.WindowXML):
             self.channels = []
             self.moduleDict = {}
             self.searchActions = []
-        if percent == 100 and not self.results:
-            self.PROGRESS.setVisible(False)
-            self.NORESULTS.setVisible(True)
+
+            # if no results
+            total = 0
+            for num in self.results.values():
+                total += num
+            if not total:
+                self.PROGRESS.setVisible(False)
+                self.NORESULTS.setVisible(True)
+                self.setFocusId(CLOSE)
 
     def onInit(self):
         self.time = time.time()
@@ -462,8 +474,6 @@ class SearchWindow(xbmcgui.WindowXML):
                 if self.item.type:
                     self.item.mode = self.item.type
                     self.item.text = title_unify(self.item.text)
-                    if self.item.contentType == 'movie' and self.item.infoLabels['year']:
-                        self.item.text += " " + str(self.item.infoLabels['year'])
                 self.thread = Thread(target=self.search)
                 self.thread.start()
             elif self.item.mode in ['movie', 'tvshow', 'person_']:
@@ -574,7 +584,7 @@ class SearchWindow(xbmcgui.WindowXML):
                 item = self.item.clone(mode='person_', discovery=self.persons[pos])
                 Search(item, self.moduleDict, self.searchActions)
                 if close_action:
-                    self.close
+                    self.close()
             else:
                 item = Item().fromurl(self.RESULTS.getSelectedItem().getProperty('item'))
                 if self.item.mode == 'movie': item.contentTitle = self.RESULTS.getSelectedItem().getLabel()