diff --git a/plugin.video.alfa/channels/cuevana2.py b/plugin.video.alfa/channels/cuevana2.py index 7f39807d..95b63fcb 100644 --- a/plugin.video.alfa/channels/cuevana2.py +++ b/plugin.video.alfa/channels/cuevana2.py @@ -21,18 +21,9 @@ def mainlist(item): logger.info() autoplay.init(item.channel, list_servers, list_quality) itemlist = [] - itemlist.append(Item(channel = item.channel, title = "Peliculas", action = "movies_menu", - url = host + "pelicula", thumbnail = get_thumb("movies", auto = True))) - itemlist.append(Item(channel = item.channel, title = "Series", action = "shows_menu", - url = host + "pelicula", thumbnail = get_thumb("tvshows", auto = True) )) - itemlist.append(Item(channel = item.channel, title = "Buscar...", action = "search", - url = host + "search/", thumbnail = get_thumb("search", auto = True))) - autoplay.show_option(item.channel, itemlist) - - return itemlist - -def movies_menu(item): - itemlist = [] + # PELICULAS + itemlist.append(Item(channel = item.channel, title = "Peliculas", folder=False, + thumbnail = get_thumb("movies", auto = True), text_bold=True)) itemlist.append(Item(channel = item.channel, title = "Novedades", action = "movies", url = host + "pelicula", thumbnail = get_thumb("newest", auto = True))) @@ -42,18 +33,20 @@ def movies_menu(item): url = host + "pelicula", thumbnail = get_thumb("year", auto = True))) itemlist.append(Item(channel = item.channel, title = "Favoritas", action = "movies", url = host + "peliculas-destacadas", thumbnail = get_thumb("favorites", auto = True) )) - itemlist.append(Item(channel = item.channel, title = "")) itemlist.append(Item(channel = item.channel, title = "Buscar...", action = "search", url = host + "search/", thumbnail = get_thumb("search", auto = True))) - return itemlist + # SERIES + itemlist.append(Item(channel = item.channel, title = "Series", folder=False, + thumbnail = get_thumb("tvshows", auto = True), text_bold=True)) -def shows_menu(item): - itemlist = [] itemlist.append(Item(channel = item.channel, title = "Todas las Series", action = "shows", url = host + "listar-series", thumbnail = get_thumb("tvshows", auto = True))) itemlist.append(Item(channel = item.channel, title = "Buscar...", action = "search", extra='1', url = host + "listar-series", thumbnail = get_thumb("search", auto = True))) + + autoplay.show_option(item.channel, itemlist) + return itemlist ### FIN MENUS ### @@ -98,7 +91,8 @@ def episodes(item): matches = scrapertools.find_multiple_matches(data, seasonsPattern) for season, title in matches: - itemlist.append(Item(channel = item.channel, title="[COLOR blue]%s[/COLOR]" % title)) + itemlist.append(Item(channel = item.channel, title="[COLOR blue]%s[/COLOR]" % title, + folder=False, text_bold=True)) episodeMatches = scrapertools.find_single_match(data, episodesPattern % season) put_episodes(itemlist, item, episodeMatches) diff --git a/plugin.video.alfa/channels/cuevana2espanol.py b/plugin.video.alfa/channels/cuevana2espanol.py index 318c01cc..0282210b 100644 --- a/plugin.video.alfa/channels/cuevana2espanol.py +++ b/plugin.video.alfa/channels/cuevana2espanol.py @@ -33,7 +33,9 @@ def mainlist(item): url = host + "tendencias", thumbnail = get_thumb("hot", auto = True))) itemlist.append(Item(channel = item.channel, title = "Ranking IMDB", action = "moviesIMDB", url = host + "raking-imdb", thumbnail = get_thumb("hot", auto = True) )) - itemlist.append(Item(channel = item.channel, title = "")) + itemlist.append(Item(channel = item.channel, title = "Busqueda", folder=False, text_bold=True)) + itemlist.append(Item(channel = item.channel, title = "Por Letra", action = "letters", + url = host, thumbnail = get_thumb("letter", auto = True))) itemlist.append(Item(channel = item.channel, title = "Buscar...", action = "search", url = host + "?s=", thumbnail = get_thumb("search", auto = True))) @@ -82,6 +84,38 @@ def moviesIMDB(item): return itemlist +def byLetter(item): + itemlist = [] + letter = item.extra + + pageForNonce = load_data(item.url) + nonce = scrapertools.find_single_match(pageForNonce, '"nonce":"([^"]+)"') + raw = httptools.downloadpage('http://cuevana2espanol.com/wp-json/dooplay/glossary/?term=%s&nonce=%s&type=all' % (letter, nonce)).data + json = jsontools.load(raw).items() + logger.info(nonce) + + for movie in json: + data = movie[1] + itemTitle = data['title'] + if 'year' in data: + itemTitle += " [COLOR blue](%s)[/COLOR]" % data['year'] + if data['imdb']: + itemTitle += " [COLOR yellow](%s)[/COLOR]" % data['imdb'] + + itemlist.append(Item(channel = item.channel, title=itemTitle, fulltitle=data['title'], url=data['url'], + thumbnail=data['img'].replace('-90x135', ''), action="findvideos")) + + return itemlist + +def letters(item): + itemlist = [] + letter = '#ABCDEFGHIJKLMNOPQRSTUVWXYZ' + + for let in letter: + itemlist.append(item.clone(title=let, extra=let.lower(), action="byLetter")) + + return itemlist + def searchMovies(item): itemlist = [] @@ -94,8 +128,8 @@ def searchMovies(item): matches = scrapertools.find_multiple_matches(data, pattern) for link, img, title, year, plot in matches: itemTitle = "%s [COLOR blue](%s)[/COLOR]" % (title, year) - - itemlist.append(Item(channel = item.channel, title=itemTitle, fulltitle=title, thumbnail=img, + fullimg = img.replace('-150x150', '') + itemlist.append(Item(channel = item.channel, title=itemTitle, fulltitle=title, thumbnail=fullimg, url=link, plot=plot, action="findvideos")) next_page = scrapertools.find_single_match(data, 'href="([^"]+)" >')