diff --git a/channels/mediasetplay.py b/channels/mediasetplay.py index 11e38eb1..3220d082 100644 --- a/channels/mediasetplay.py +++ b/channels/mediasetplay.py @@ -201,6 +201,7 @@ def play(item): support.info() if not item.urls: urls = item.url else: urls = item.urls + data = '' for url in urls: new_url = support.httptools.downloadpage(url, allow_redirects=True).url if '.mpd' in new_url: diff --git a/platformcode/globalsearch.py b/platformcode/globalsearch.py index f18826c1..c9228b8c 100644 --- a/platformcode/globalsearch.py +++ b/platformcode/globalsearch.py @@ -238,11 +238,14 @@ class SearchWindow(xbmcgui.WindowXML): percent = (float(count) / len(self.channelsList)) * 100 self.PROGRESS.setPercent(percent) self.COUNT.setText('%s/%s' % (count, len(self.channelsList))) + self.channelsList = [] with futures.ThreadPoolExecutor(max_workers=set_workers()) as executor: for searchAction in self.searchActions: if self.exit: break executor.submit(self.get_channel_results, self.item, self.moduleDict, searchAction) + self.moduleDict = {} + self.searchActions = [] def get_channel_results(self, item, module_dict, search_action): logger.debug() @@ -579,9 +582,10 @@ class SearchWindow(xbmcgui.WindowXML): pos = self.RESULTS.getSelectedPosition() name = self.CHANNELS.getSelectedItem().getLabel() item = self.results[name][0][pos] - context = [config.get_localized_string(70739), config.get_localized_string(70557), config.get_localized_string(60359)] + context = [config.get_localized_string(70739), config.get_localized_string(70557), config.get_localized_string(30155), config.get_localized_string(60359)] context_commands = ["RunPlugin(%s?%s)" % (sys.argv[0], 'action=open_browser&url=' + item.url), "RunPlugin(%s?%s&%s)" % (sys.argv[0], item.tourl(), 'channel=kodfavorites&action=addFavourite&from_channel=' + item.channel + '&from_action=' + item.action), + "RunPlugin(%s?%s&%s)" % (sys.argv[0], item.tourl(), 'channel=favorites&action=addFavourite&from_channel=' + item.channel + '&from_action=' + item.action), "RunPlugin(%s?%s)" % (sys.argv[0], 'channel=trailertools&action=buscartrailer&contextual=True&search_title=' + item.contentTitle if item.contentTitle else item.fulltitle)] if item.contentType == 'movie': context += [config.get_localized_string(60353), config.get_localized_string(60354)] diff --git a/resources/skins/Default/720p/GlobalSearch.xml b/resources/skins/Default/720p/GlobalSearch.xml index 0339037d..82af6ac5 100644 --- a/resources/skins/Default/720p/GlobalSearch.xml +++ b/resources/skins/Default/720p/GlobalSearch.xml @@ -69,11 +69,11 @@ 400 90 840 - 30 + 60 FFFFFFFF 00000000 - + left center @@ -81,7 +81,7 @@ Item Title 40 - 90 + 91 200 30 @@ -95,7 +95,7 @@ Item Plot 400 - 150 + 170 840 170 @@ -117,6 +117,17 @@ horizontal 300 + + Item Poster + 300 + 0 + 180 + 270 + $INFO[ListItem.Property(thumb)] + !Control.HasFocus(102) + 10 + scale + Item Poster 300 @@ -124,6 +135,7 @@ 180 270 $INFO[ListItem.Property(thumb)] + Control.HasFocus(102) 10 scale @@ -138,6 +150,17 @@ + + Item Poster + 0 + 0 + 380 + 570 + $INFO[ListItem.Property(thumb)] + !Control.HasFocus(102) + 10 + scale + Item Poster 0 @@ -145,6 +168,7 @@ 380 570 $INFO[ListItem.Property(thumb)] + Control.HasFocus(102) 10 scale @@ -160,7 +184,9 @@ + + Result Overflow 0 400 880 @@ -168,6 +194,7 @@ + Chennels Group -100