diff --git a/channels/animeworld.py b/channels/animeworld.py index d2a0e35d..bd7ca222 100644 --- a/channels/animeworld.py +++ b/channels/animeworld.py @@ -51,7 +51,7 @@ def genres(item): action = 'peliculas' data = get_data(item) patronBlock = r'dropdown[^>]*>\s*Generi\s*]+>(?P.*?)' - patronMenu = r'[^"]+)" value="(?P[^"]+)"\s*>[^>]+>(?P[^<]+)</label>' + patronGenreMenu = r'<input.*?name="(?P<name>[^"]+)" value="(?P<value>[^"]+)"\s*>[^>]+>(?P<title>[^<]+)</label>' def itemHook(item): item.url = host + '/filter?' + item.name + '=' + item.value + '&sort=' @@ -63,10 +63,13 @@ def genres(item): def menu(item): action = 'submenu' data = get_data(item) - patronMenu=r'<button[^>]+>\s*(?P<title>[A-Za-z0-9]+)\s*<span.[^>]+>(?P<other>.*?)</ul>' + patronMenu = r'<button[^>]+>\s*(?P<title>[A-Za-z0-9]+)\s*<span.[^>]+>(?P<other>.*?)</ul>' + genre = False def itemlistHook(itemlist): - itemlist.insert(0, item.clone(title=support.typo('Tutti','bold'), action='peliculas')) - itemlist.append(item.clone(title=support.typo('Cerca...','bold'), action='search', search=True, thumbnail=support.thumb('search.png'))) + for item in itemlist: + item.title += ' {anime}' + itemlist.insert(0, item.clone(title=support.typo('Tutti {anime}','bold'), action='peliculas')) + itemlist.append(item.clone(title=support.typo('Cerca... {anime}','bold'), action='search', search=True, thumbnail=support.thumb('search.png'))) return itemlist return locals() diff --git a/channelselector.py b/channelselector.py index cb72988c..0bef4036 100644 --- a/channelselector.py +++ b/channelselector.py @@ -30,7 +30,7 @@ def getmainlist(view="thumb_"): if addon.getSetting('enable_onair_menu') == "true": itemlist.append(Item(channel="filmontv", action="mainlist", title=config.get_localized_string(50001), - thumbnail=get_thumb("on_the_air.png"), viewmode="thumbnails")) + thumbnail=get_thumb("on_air.png"), viewmode="thumbnails")) if addon.getSetting('enable_link_menu') == "true": itemlist.append(Item(title=config.get_localized_string(70527), channel="kodfavorites", action="mainlist", thumbnail=get_thumb("mylink.png", view), @@ -46,7 +46,7 @@ def getmainlist(view="thumb_"): context=[{"title": config.get_localized_string(70287), "channel": "shortcuts", "action": "SettingOnPosition", "category":2, "setting":1}, {"title": config.get_localized_string(60568), "channel": "videolibrary", "action": "update_videolibrary"}])) if downloadenabled != "false": - itemlist.append(Item(title=config.get_localized_string(30101), channel="downloads", action="mainlist", thumbnail=get_thumb("downloads.png", view), viewmode="list", + itemlist.append(Item(title=config.get_localized_string(30101), channel="downloads", action="mainlist", thumbnail=get_thumb("download.png", view), viewmode="list", context=[{"title": config.get_localized_string(70288), "channel": "shortcuts", "action": "SettingOnPosition", "category":6}])) thumb_setting = "setting_%s.png" % 0 # config.get_setting("plugin_updates_available") @@ -187,7 +187,7 @@ def filterchannels(category, view="thumb_"): # Special Category if category in ['movie', 'tvshow']: titles = [config.get_localized_string(70028), config.get_localized_string(30985), config.get_localized_string(70559), config.get_localized_string(60264), config.get_localized_string(70560)] - ids = ['popular', 'top_rated', 'now_playing', 'on_the_air'] + ids = ['popular', 'top_rated', 'now_playing', 'on_air'] for x in range(0,3): if x == 2 and category != 'movie': title=titles[x+1] @@ -200,7 +200,7 @@ def filterchannels(category, view="thumb_"): list_type='%s/%s' % (category.replace('show',''), id), mode=category, thumbnail=get_thumb(id+".png"))) channelslist.insert(3, Item(channel='search', action='genres_menu', title=config.get_localized_string(30987), - type=category.replace('show',''), mode=category ,thumbnail=get_thumb("genres.png"))) + type=category.replace('show',''), mode=category ,thumbnail=get_thumb("genre.png"))) return channelslist @@ -213,8 +213,8 @@ def get_thumb(thumb_name, view="thumb_"): media_path = config.get_setting('custom_theme') else: icon_pack_name = config.get_setting('icon_set', default="default") - media_path = filetools.join("https://raw.githubusercontent.com/kodiondemand/media/master/themes", icon_pack_name) - return filetools.join(media_path, view + thumb_name) + media_path = filetools.join("https://raw.githubusercontent.com/kodiondemand/media/master/themes/new", icon_pack_name) + return filetools.join(media_path, thumb_name) def set_channel_info(parameters): diff --git a/core/support.py b/core/support.py index ba758c34..001819d9 100755 --- a/core/support.py +++ b/core/support.py @@ -433,7 +433,7 @@ def scrape(func): search = args.get('search', '') blacklist = args.get('blacklist', []) data = args.get('data', '') - patron = args.get('patron', args.get('patronMenu', '')) + patron = args.get('patron', args.get('patronMenu', args.get('patronGenreMenu', ''))) if 'headers' in args: headers = args['headers'] elif 'headers' in func.__globals__: @@ -537,7 +537,7 @@ def scrape(func): if function == 'episodios': autorenumber.start(itemlist, item) else: autorenumber.start(itemlist) - if action != 'play' and 'patronMenu' not in args and not disabletmdb and inspect.stack()[1][3] not in ['add_tvshow'] and function != 'episodios' or (function in ['episodios'] and config.get_setting('episode_info')): # and function != 'episodios' and item.contentType in ['movie', 'tvshow', 'episode', 'undefined'] + if action != 'play' and 'patronMenu' not in args and 'patronGenreMenu' not in args and not disabletmdb and inspect.stack()[1][3] not in ['add_tvshow'] and function != 'episodios' or (function in ['episodios'] and config.get_setting('episode_info')): # and function != 'episodios' and item.contentType in ['movie', 'tvshow', 'episode', 'undefined'] tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) if not group and not args.get('groupExplode') and ((pagination and len(matches) <= pag * pagination) or not pagination): # next page with pagination @@ -569,8 +569,10 @@ def scrape(func): if downloadEnabled and function == 'episodios' or function == 'findvideos': download(itemlist, item, function=function) - if 'patronMenu' in args and itemlist: + if 'patronGenreMenu' in args and itemlist: itemlist = thumb(itemlist, genre=True) + if 'patronMenu' in args and itemlist: + itemlist = thumb(itemlist) if 'fullItemlistHook' in args: try: @@ -1391,53 +1393,36 @@ def get_jwplayer_mediaurl(data, srvName, onlyHttp=False, dataIsBlock=False): return video_urls -def thumb(item_itemlist_string=None, genre=False, live=False): +def thumb(data=None, genre=False, live=False): + ''' + data = str, item or itemlist + genre = bool, search icon in genres + live = bool, add icon by channel name + ''' from channelselector import get_thumb if live: - if type(item_itemlist_string) == list: - for item in item_itemlist_string: + if type(data) == list: + for item in data: item.thumbnail = "https://raw.githubusercontent.com/kodiondemand/media/master/live/" + item.fulltitle.lower().replace(' ','_') + '.png' else: - item_itemlist_string.thumbnail = "https://raw.githubusercontent.com/kodiondemand/media/master/live/" + item_itemlist_string.fulltitle.lower().replace(' ','_') + '.png' - return item_itemlist_string + data.thumbnail = "https://raw.githubusercontent.com/kodiondemand/media/master/live/" + data.fulltitle.lower().replace(' ','_') + '.png' + return data - icon_dict = {'movie':['film', 'movie'], + main_dict = {'movie':['film', 'movie', 'movies'], 'tvshow':['serie','tv','episodi','episodio','fiction', 'show'], - 'documentary':['documentari','documentario', 'documentary', 'documentaristico'], - 'teenager':['ragazzi','teenager', 'teen'], - 'learning':['learning', 'school', 'scuola'], - 'all':['tutti', 'all'], - 'news':['novità', "novita'", 'aggiornamenti', 'nuovi', 'nuove', 'new', 'newest', 'news', 'ultimi', 'notizie'], - 'now_playing':['cinema', 'in sala'], 'anime':['anime'], - 'genres':['genere', 'generi', 'categorie', 'categoria', 'category'], - 'animation': ['animazione', 'cartoni', 'cartoon', 'animation'], - 'action':['azione', 'marziali', 'action', 'martial'], - 'adventure': ['avventura', 'adventure'], - 'biographical':['biografico', 'biographical', 'biografia'], - 'comedy':['comico', 'commedia', 'demenziale', 'comedy', 'brillante', 'demential', 'parody'], - 'adult':['erotico', 'hentai', 'harem', 'ecchi', 'adult'], - 'drama':['drammatico', 'drama', 'dramma'], - 'syfy':['fantascienza', 'science fiction', 'syfy', 'sci-fi'], - 'fantasy':['fantasy', 'magia', 'magic', 'fantastico'], - 'crime':['gangster','poliziesco', 'crime', 'crimine', 'police'], - 'grotesque':['grottesco', 'grotesque'], - 'war':['guerra', 'war', 'military'], - 'children':['bambini', 'kids'], - 'horror':['horror', 'orrore'], + 'documentary':['documentari','documentario', 'documentary', 'documentaristico'], 'music':['musical', 'musica', 'music', 'musicale'], - 'mistery':['mistero', 'giallo', 'mystery'], - 'noir':['noir'], - 'popular':['popolari','popolare', 'più visti', 'raccomandati', 'raccomandazioni' 'recommendations'], - 'thriller':['thriller'], - 'top_rated' : ['fortunato', 'votati', 'lucky', 'top'], - 'on_the_air' : ['corso', 'onda', 'diretta', 'dirette'], - 'western':['western'], - 'vos':['sub','sub-ita'], - 'romance':['romantico','sentimentale', 'romance', 'soap'], - 'family':['famiglia','famiglie', 'family'], - 'historical':['storico', 'history', 'storia', 'historical'], + } + + icon_dict = {'torrent':['torrent'], + 'all':['tutti', 'all'], 'az':['lettera','lista','alfabetico','a-z', 'alphabetical'], + 'news':['novità', "novita'", 'aggiornamenti', 'nuovi', 'nuove', 'new', 'newest', 'news', 'ultimi', 'ultime', 'notizie'], + 'now_playing':['cinema', 'in sala'], + 'genre':['genere', 'generi', 'categorie', 'categoria', 'category'], + 'popular':['popolari', 'popolare', 'popular', 'più', 'raccomandati', 'raccomandazioni' 'recommendations'], + 'on_air' : ['corso', 'onda', 'diretta', 'dirette', 'progress'], 'year':['anno', 'anni', 'year'], 'update':['replay', 'update'], 'videolibrary':['teche'], @@ -1447,62 +1432,103 @@ def thumb(item_itemlist_string=None, genre=False, live=False): 'spring':['primavera', 'spring'], 'summer':['estate', 'summer'], 'autumn':['autunno', 'autumn'], + 'vos':['sub','sub-ita'], + 'top_rated' : ['fortunato', 'votati', 'lucky', 'top'], 'autoplay':[config.get_localized_string(60071)] } + genre_dict = {'documentary':['documentari','documentario', 'documentary', 'documentaristico'], + 'teenager':['ragazzi','teenager', 'teen'], + 'learning':['learning', 'school', 'scuola'], + 'animation': ['animazione', 'cartoni', 'cartoon', 'animation'], + 'action':['azione', 'marziali', 'action', 'martial', 'samurai'], + 'adventure': ['avventura', 'adventure'], + 'biographical':['biografico', 'biographical', 'biografia'], + 'comedy':['comico', 'commedia', 'demenziale', 'comedy', 'brillante', 'demential', 'parody', 'parodia'], + 'adult':['erotico', 'hentai', 'harem', 'ecchi', 'adult'], + 'drama':['drammatico', 'drama', 'dramma'], + 'syfy':['fantascienza', 'science fiction', 'syfy', 'sci-fi'], + 'fantasy':['fantasy', 'magia', 'magic', 'fantastico'], + 'crime':['gangster','poliziesco', 'crime', 'crimine', 'police', 'polizia'], + 'grotesque':['grottesco', 'grotesque'], + 'war':['guerra', 'war', 'military', 'militari'], + 'children':['bambini', 'kids'], + 'horror':['horror', 'orrore', 'demoni', 'vampiri'], + 'music':['musical', 'musica', 'music', 'musicale'], + 'mistery':['mistero', 'giallo', 'mystery'], + 'noir':['noir'], + 'thriller':['thriller'], + 'western':['western'], + 'romance':['romantico','sentimentale', 'romance', 'soap'], + 'family':['famiglia','famiglie', 'family'], + 'historical':['storico', 'history', 'storia', 'historical'], + 'tvmovie':['tv', 'show', 'film tv', 'tv movie']} + suffix_dict = {'_hd':['hd','altadefinizione','alta definizione'], '_4k':['4K'], '_az':['lettera','lista','alfabetico','a-z', 'alphabetical'], + '_genre':['genere', 'generi', 'categorie', 'categoria', 'genre', 'genres'], + '_popular':['popolari', 'popolare', 'popular', 'più', 'raccomandati', 'raccomandazioni' 'recommendations'], + '_top':['fortunato', 'votati', 'lucky', 'top'], '_year':['anno', 'anni', 'year'], - '_genre':['genere', 'generi', 'categorie', 'categoria']} + '_news':['novità', "novita'", 'aggiornamenti', 'nuovi', 'nuove', 'new', 'newest', 'news', 'ultimi', 'ultime', 'notizie'], + '_on_air' : ['corso', 'onda', 'diretta', 'dirette', 'progress'], + '_cinema':['cinema', 'sala', 'theatre', 'theatres']} search = ['cerca', 'search'] - search_suffix ={'_movie':['film', 'movie'], - '_tvshow':['serie','tv', 'fiction']} + search_suffix ={'_movie':['film', 'movie', 'movies'], + '_tvshow':['serie','tv','episodi','episodio','fiction', 'show'], + '_anime':['anime'], + '_year':['anno', 'anni', 'year'], + '_rating':['rating', 'voto'], + '_documentary':['documentari','documentario', 'documentary', 'documentaristico'], + '_music':['musical', 'musica', 'music', 'musicale'], + '_star':['star', 'personaggi', 'interpreti', 'stars', 'characters', 'performers', 'staff', 'actors', 'attori', 'regista', 'registi'], + '_genre':['genere', 'generi', 'categorie', 'categoria', 'genre', 'genres']} def autoselect_thumb(item, genre): - # logger.debug('SPLIT',re.split(r'\.|\{|\}|\[|\]|\(|\)|/| ',item.title.lower())) - if genre == False: - for thumb, titles in icon_dict.items(): - if any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)|/| ',item.title.lower()) for word in search): - thumb = 'search' - for suffix, titles in search_suffix.items(): - if any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)|/| ',item.title.lower()) for word in titles ): - thumb = thumb + suffix - item.thumbnail = get_thumb(thumb + '.png') - elif any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)| ',item.title.lower()) for word in titles ): - if thumb == 'movie' or thumb == 'tvshow': - for suffix, titles in suffix_dict.items(): - if any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)|/| ',item.title.lower()) for word in titles ): - thumb = thumb + suffix - item.thumbnail = get_thumb(thumb + '.png') - else: item.thumbnail = get_thumb(thumb + '.png') - else: - thumb = item.thumbnail - + searched_title = re.split(r'\.|\{|\}|\[|\]|\(|\)|/| ', scrapertools.unescape(re.sub('\[[^\]]+\]|\u2026|\u2022', '', item.title.lower().replace('/',' ')))) + thumb = '' + if genre: + for t, titles in genre_dict.items(): + if any(word in searched_title for word in titles ): + thumb = t else: - for thumb, titles in icon_dict.items(): - if any(word in re.split(r'\.|\{|\}|\[|\]|\(|\)|/| ',item.title.lower()) for word in titles ): - item.thumbnail = get_thumb(thumb + '.png') - else: - thumb = item.thumbnail + if any(word in searched_title for word in search): + thumb = 'search' + for suffix, titles in search_suffix.items(): + if any(word in searched_title for word in titles): + thumb = thumb + suffix + if not thumb: + for t, titles in main_dict.items(): + if any(word in searched_title for word in titles): + thumb = t + if thumb in main_dict.keys(): + for suffix, titles in suffix_dict.items(): + if any(word in searched_title for word in titles): + thumb = t + suffix + if not thumb: + for t, titles in icon_dict.items(): + if any(word in searched_title for word in titles): + thumb = t + if thumb: item.thumbnail = get_thumb(thumb + '.png') item.title = re.sub(r'\s*\{[^\}]+\}','',item.title) return item - if item_itemlist_string: - if type(item_itemlist_string) == list: - for item in item_itemlist_string: + if data: + if type(data) == list: + for item in data: autoselect_thumb(item, genre) - return item_itemlist_string + return data - elif type(item_itemlist_string) == str: - filename, file_extension = os.path.splitext(item_itemlist_string) - if not file_extension: item_itemlist_string += '.png' - return get_thumb(item_itemlist_string) + elif type(data) == str: + filename, file_extension = os.path.splitext(data) + if not file_extension: data += '.png' + return get_thumb(data) else: - return autoselect_thumb(item_itemlist_string, genre) + return autoselect_thumb(data, genre) else: return get_thumb('next.png') \ No newline at end of file diff --git a/specials/filmontv.py b/specials/filmontv.py index 9b059edc..3a32acbe 100644 --- a/specials/filmontv.py +++ b/specials/filmontv.py @@ -23,11 +23,11 @@ def mainlist(item): #search_type='list', list_type='movie/now_playing', # thumbnail=get_thumb("now_playing.png")), #Item(channel="search", action='discover_list', title=config.get_localized_string(70312), - # search_type='list', list_type='tv/on_the_air', thumbnail=get_thumb("on_the_air.png")), + # search_type='list', list_type='tv/on_air', thumbnail=get_thumb("on_air.png")), Item(title=support.typo('Canali live', 'bold'), channel=item.channel, action='live', - thumbnail=support.thumb('tvshow_on_the_air')), + thumbnail=support.thumb('tvshow_on_air')), Item(channel=item.channel, title=config.get_setting("film1", channel="filmontv"), action="now_on_tv", diff --git a/specials/search.py b/specials/search.py index e420d47d..425e122d 100644 --- a/specials/search.py +++ b/specials/search.py @@ -5,6 +5,7 @@ from __future__ import division from builtins import range +from core import support from past.utils import old_div #from builtins import str import sys @@ -36,41 +37,43 @@ def mainlist(item): 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), - Item(channel='globalsearch', title=config.get_localized_string(70741) % config.get_localized_string(70314), action='Search', page=1, mode='person', thumbnail=get_thumb("search_star.png"), folder=False)] + itemlist = [Item(channel='globalsearch', title=config.get_localized_string(70276), action='Search', mode='all', folder=False), + Item(channel='globalsearch', title=config.get_localized_string(70741) % config.get_localized_string(30122), action='Search', mode='movie', folder=False), + Item(channel='globalsearch', title=config.get_localized_string(70741) % config.get_localized_string(30123), action='Search', mode='tvshow', folder=False), + Item(channel='globalsearch', title=config.get_localized_string(70741) % config.get_localized_string(70314), action='Search', page=1, mode='person', folder=False)] else: itemlist = [Item(channel=item.channel, title=config.get_localized_string(70276), action='new_search', mode='all', thumbnail=get_thumb("search.png")), - Item(channel=item.channel, title=config.get_localized_string(70741) % config.get_localized_string(30122), action='new_search', mode='movie', thumbnail=get_thumb("search_movie.png")), - Item(channel=item.channel, title=config.get_localized_string(70741) % config.get_localized_string(30123), action='new_search', mode='tvshow', thumbnail=get_thumb("search_tvshow.png")), - Item(channel=item.channel, title=config.get_localized_string(70741) % config.get_localized_string(70314), action='new_search', page=1, mode='person', thumbnail=get_thumb("search_star.png"))] + Item(channel=item.channel, title=config.get_localized_string(70741) % config.get_localized_string(30122), action='new_search', mode='movie'), + Item(channel=item.channel, title=config.get_localized_string(70741) % config.get_localized_string(30123), action='new_search', mode='tvshow'), + Item(channel=item.channel, title=config.get_localized_string(70741) % config.get_localized_string(70314), action='new_search', page=1, mode='person')] itemlist += [Item(channel=item.channel, title=config.get_localized_string(59995), action='saved_search', thumbnail=get_thumb('search.png')), Item(channel=item.channel, title=config.get_localized_string(60420), action='sub_menu', thumbnail=get_thumb('search.png')), Item(channel="tvmoviedb", title=config.get_localized_string(70274), action="mainlist", thumbnail=get_thumb("search.png")), - Item(channel=item.channel, title=typo(config.get_localized_string(59994), 'color kod bold'), action='setting_channel_new', thumbnail=get_thumb('setting_0.png'),folder=False), - Item(channel='shortcuts', title=typo(config.get_localized_string(70286), 'color kod bold'), action='SettingOnPosition', category=5, setting=1, thumbnail=get_thumb('setting_0.png'),folder=False)] + Item(channel=item.channel, title=typo(config.get_localized_string(59994), 'color kod bold'), action='setting_channel_new', thumbnail=get_thumb('setting_0.png'), folder=False), + Item(channel='shortcuts', title=typo(config.get_localized_string(70286), 'color kod bold'), action='SettingOnPosition', category=5, setting=1, thumbnail=get_thumb('setting_0.png'), folder=False)] itemlist = set_context(itemlist) + support.thumb(itemlist) return itemlist def sub_menu(item): logger.debug() - itemlist = [Item(channel=item.channel, action='genres_menu', title=config.get_localized_string(70306), mode='movie', thumbnail=get_thumb("movie_genre.png")), - Item(channel=item.channel, action='years_menu', title=config.get_localized_string(70742), mode='movie', thumbnail=get_thumb("movie_year.png")), - Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70307), search_type='list', list_type='movie/popular', mode='movie', thumbnail=get_thumb("movie_popular.png")), - Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70308), search_type='list', list_type='movie/top_rated', mode='movie', thumbnail=get_thumb("movie_top.png")), - Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70309), search_type='list', list_type='movie/now_playing', mode='movie', thumbnail=get_thumb("movie_now_playing.png")), - Item(channel=item.channel, action='genres_menu', title=config.get_localized_string(70310), mode='tvshow', thumbnail=get_thumb("tvshow_genre.png")), - Item(channel=item.channel, action='years_menu', title=config.get_localized_string(70743), mode='tvshow', thumbnail=get_thumb("tvshow_year.png")), - Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70311), search_type='list', list_type='tv/popular', mode='tvshow', thumbnail=get_thumb("popular.png")), - Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70312), search_type='list', list_type='tv/on_the_air', mode='tvshow', thumbnail=get_thumb("tvshow_on_the_air.png")), - Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70313), search_type='list', list_type='tv/top_rated', mode='tvshow', thumbnail=get_thumb("tvshow_top.png")),] + itemlist = [Item(channel=item.channel, action='genres_menu', title=config.get_localized_string(70306), mode='movie'), + Item(channel=item.channel, action='years_menu', title=config.get_localized_string(70742), mode='movie'), + Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70307), search_type='list', list_type='movie/popular', mode='movie'), + Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70308), search_type='list', list_type='movie/top_rated', mode='movie'), + Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70309), search_type='list', list_type='movie/now_playing', mode='movie'), + Item(channel=item.channel, action='genres_menu', title=config.get_localized_string(70310), mode='tvshow'), + Item(channel=item.channel, action='years_menu', title=config.get_localized_string(70743), mode='tvshow'), + Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70311), search_type='list', list_type='tv/popular', mode='tvshow'), + Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70312), search_type='list', list_type='tv/on_air', mode='tvshow'), + Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70313), search_type='list', list_type='tv/top_rated', mode='tvshow')] itemlist = set_context(itemlist) + support.thumb(itemlist) return itemlist diff --git a/specials/tvmoviedb.py b/specials/tvmoviedb.py index 8861e2fe..acb89013 100644 --- a/specials/tvmoviedb.py +++ b/specials/tvmoviedb.py @@ -114,7 +114,7 @@ def tmdb(item): itemlist.append(item.clone(title=config.get_localized_string(70029), action="list_tmdb", search={'url': item.args + "/top_rated", 'language': langt, 'page': 1})) if item.args == "movie": itemlist.append(item.clone(title=config.get_localized_string(70030), action="list_tmdb", search={'url': item.args + "/now_playing", 'language': langt, 'page': 1})) - else: itemlist.append(item.clone(title=config.get_localized_string(70031), action="list_tmdb", search={'url': item.args + "/on_the_air", 'language': langt, 'page': 1})) + else: itemlist.append(item.clone(title=config.get_localized_string(70031), action="list_tmdb", search={'url': item.args + "/on_air", 'language': langt, 'page': 1})) itemlist.append(item.clone(title=config.get_localized_string(70032), action="indices_tmdb")) itemlist.append(item.clone(title=config.get_localized_string(70042), action="indices_tmdb")) diff --git a/specials/videolibrary.py b/specials/videolibrary.py index 426f7fa2..a4afc0c5 100644 --- a/specials/videolibrary.py +++ b/specials/videolibrary.py @@ -35,14 +35,15 @@ def mainlist(item): def search_list(item): - itemlist = [item.clone(title=config.get_localized_string(70032), action='list_genres', thumbnail=thumb('{}_genre'.format(item.contentType))), - item.clone(title=config.get_localized_string(70042), action='list_years', thumbnail=thumb('{}_year'.format(item.contentType))), - item.clone(title=config.get_localized_string(70314), action='list_az', next_action='list_actors', thumbnail=thumb('star')), - item.clone(title=config.get_localized_string(70473), action='list_ratings', thumbnail=thumb('{}_top'.format(item.contentType))), - item.clone(title='Registi', action='list_az', next_action='list_directors', thumbnail=thumb('directors')), - item.clone(title=config.get_localized_string(30980), action='search', thumbnail=thumb('search_{}'.format(item.contentType)))] + itemlist = [item.clone(title=config.get_localized_string(70032) + '{search}', action='list_genres'), + item.clone(title=config.get_localized_string(70042) + '{search}', action='list_years'), + item.clone(title=config.get_localized_string(70314) + '{search}', action='list_az', next_action='list_actors'), + item.clone(title=config.get_localized_string(70473) + '{search}', action='list_ratings'), + item.clone(title='Registi' + '{search}', action='list_az', next_action='list_directors'), + item.clone(title=config.get_localized_string(30980) + '{search}', action='search')] if item.contentType == 'movie': - itemlist.insert(0, item.clone(title='Collezioni', action='list_sets', thumbnail=thumb('{}_genre'.format(item.contentType)))) + itemlist.insert(0, item.clone(title='Collezioni', action='list_sets')) + support.thumb(itemlist) return itemlist