Merge branch 'master' into alpha

specials/search.py

@@ -23,13 +23,9 @@ from channelselector import get_thumb
 from platformcode import logger, config, platformtools, unify
 from core.support import typo, thumb
 import xbmcgui
-
-import gc
-
 import xbmc
 from threading import Thread
 from core.support import dbg
-gc.disable()
 
 info_language = ["de", "en", "es", "fr", "it", "pt"] # from videolibrary.json
 def_lang = info_language[config.get_setting("info_language", "videolibrary")]
@@ -38,7 +34,8 @@ def_lang = info_language[config.get_setting("info_language", "videolibrary")]
 def mainlist(item):
     logger.debug()
 
-    if config.get_setting('new_search'):
+    if platformtools.get_window() not in ('WINDOW_SETTINGS_MENU', 'WINDOW_SETTINGS_INTERFACE', 'WINDOW_SKIN_SETTINGS')\
+            and xbmc.getInfoLabel('System.CurrentWindow') in ('Home', '') and config.get_setting('new_search'):
         itemlist = [Item(channel='globalsearch', title=config.get_localized_string(70276), action='Search', mode='all', thumbnail=get_thumb("search.png"), folder=False),
                     Item(channel='globalsearch', title=config.get_localized_string(70741) % config.get_localized_string(30122), action='Search', mode='movie', thumbnail=get_thumb("search_movie.png"),folder=False),
                     Item(channel='globalsearch', title=config.get_localized_string(70741) % config.get_localized_string(30123), action='Search', mode='tvshow', thumbnail=get_thumb("search_tvshow.png"), folder=False),

specials/trailertools.py

@@ -6,6 +6,7 @@
 from __future__ import division
 
 # from builtins import str
+import random
 import sys
 
 from channelselector import get_thumb
@@ -199,6 +200,8 @@ def youtube_search(item):
     else:
         title = urllib.quote(title)
         title = title.replace("%20", "+")
+        httptools.set_cookies({'domain': 'youtube.com', 'name': 'CONSENT',
+                               'value': 'YES+cb.20210328-17-p0.en+FX+' + str(random.randint(100, 999))})
         data = httptools.downloadpage("https://www.youtube.com/results?sp=EgIQAQ%253D%253D&search_query=" + title).data
     patron = r'thumbnails":\[\{"url":"(https://i.ytimg.com/vi[^"]+).*?'
     patron += r'text":"([^"]+).*?'