diff --git a/specials/search.py b/specials/search.py index 0b8a88da..c852babd 100644 --- a/specials/search.py +++ b/specials/search.py @@ -697,11 +697,18 @@ def discover_list(item): year = scrapertools.find_single_match(release, r'(\d{4})') if not item.cast_ or (item.cast_ and (int(year) <= int(datetime.datetime.today().year))): - new_item = Item(channel='search', title=typo(title, 'bold'), infoLabels=elem, - action='channel_search', text=title, - thumbnail=thumbnail, fanart=fanart, - context='', mode=mode, contentType=mode, - release_date=year) + if config.get_setting('new_search'): + new_item = Item(channel='globalsearch', title=typo(title, 'bold'), infoLabels=elem, + action='Search', text=title, + thumbnail=thumbnail, fanart=fanart, + context='', mode='search', type = mode, contentType=mode, + release_date=year, folder = False) + else: + new_item = Item(channel='search', title=typo(title, 'bold'), infoLabels=elem, + action='channel_search', text=title, + thumbnail=thumbnail, fanart=fanart, + context='', mode=mode, contentType=mode, + release_date=year) if tvshow: new_item.contentSerieName = title diff --git a/specials/tvmoviedb.py b/specials/tvmoviedb.py index 6041fe42..d415a187 100644 --- a/specials/tvmoviedb.py +++ b/specials/tvmoviedb.py @@ -408,9 +408,14 @@ def details(item): title = item.contentType.replace("movie", config.get_localized_string(70283)).replace("tvshow", "serie") # Search by titles chosen language and / or original version and Spanish - itemlist.append(item.clone(channel='search', action="new_search", title=config.get_localized_string(70069) % (title, item.contentTitle), search_text=item.contentTitle, mode=item.contentType)) - if item.infoLabels['originaltitle'] and item.contentTitle != item.infoLabels['originaltitle']: - itemlist.append(item.clone(channel='search', action="search", search_text=item.infoLabels['originaltitle'], title=config.get_localized_string(70070) % item.infoLabels['originaltitle'], mode=item.contentType)) + if config.get_setting('new_search'): + itemlist.append(item.clone(channel='globalsearch', action="Search", title=config.get_localized_string(70069) % (title, item.contentTitle), search_text=item.contentTitle, mode='search', type=item.contentType)) + if item.infoLabels['originaltitle'] and item.contentTitle != item.infoLabels['originaltitle']: + itemlist.append(item.clone(channel='globalsearch', action="Search", search_text=item.infoLabels['originaltitle'], title=config.get_localized_string(70070) % item.infoLabels['originaltitle'], mode='search', type=item.contentType)) + else: + itemlist.append(item.clone(channel='search', action="new_search", title=config.get_localized_string(70069) % (title, item.contentTitle), search_text=item.contentTitle, mode=item.contentType)) + if item.infoLabels['originaltitle'] and item.contentTitle != item.infoLabels['originaltitle']: + itemlist.append(item.clone(channel='search', action="search", search_text=item.infoLabels['originaltitle'], title=config.get_localized_string(70070) % item.infoLabels['originaltitle'], mode=item.contentType)) # if langt != "es" and langt != "en" and item.infoLabels["tmdb_id"]: # tmdb_lang = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], tipo=item.args, idioma_searching=def_lang) @@ -2035,7 +2040,7 @@ def top_mal(item): # data = re.sub(r"\n|\r|\t| ", "", data) # data = re.sub(r"\s{2}", " ", data) - patron = r']+>.*?href.*?>([^<]+)<.*?
(.*?)
.*?(\d{4}|-).*?\s*]+>\s*.*?href.*?>([^<]+)<.*?
(.*?)
.*?(\d{4}|-).*?.*?