diff --git a/plugin.video.alfa/channels/danimados.py b/plugin.video.alfa/channels/danimados.py index a2e77c44..e8b1c74b 100644 --- a/plugin.video.alfa/channels/danimados.py +++ b/plugin.video.alfa/channels/danimados.py @@ -32,8 +32,8 @@ def mainlist(item): thumbnail=thumb_series)) itemlist.append(Item(channel=item.channel, action="mainpage", title="Más Populares", url=host, thumbnail=thumb_series)) - #itemlist.append(Item(channel=item.channel, action="movies", title="Peliculas Animadas", url=host, - # thumbnail=thumb_series)) + itemlist.append(Item(channel=item.channel, action="lista", title="Peliculas Animadas", url=host+"peliculas/", + thumbnail=thumb_series)) autoplay.show_option(item.channel, itemlist) return itemlist @@ -82,7 +82,6 @@ def mainpage(item): return itemlist return itemlist - def lista(item): logger.info() @@ -90,15 +89,26 @@ def lista(item): data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) - data_lista = scrapertools.find_single_match(data, '
(.+?)<\/div><\/div>
') + if item.title=="Peliculas Animadas": + data_lista = scrapertools.find_single_match(data, + '
(.*)(.+?)<\/div><\/div>
') patron = '([^.+?.+?
(.+?)<\/div>' #scrapedthumbnail,#scrapedtitle, #scrapedurl, #scrapedplot matches = scrapertools.find_multiple_matches(data_lista, patron) for scrapedthumbnail,scrapedtitle, scrapedurl, scrapedplot in matches: - itemlist.append( - item.clone(title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, + if item.title=="Peliculas Animadas": + itemlist.append( + item.clone(title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, contentType="movie", + plot=scrapedplot, action="findvideos", show=scrapedtitle)) + else: + itemlist.append( + item.clone(title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, context=autoplay.context,plot=scrapedplot, action="episodios", show=scrapedtitle)) - tmdb.set_infoLabels(itemlist) + if item.title!="Peliculas Animadas": + tmdb.set_infoLabels(itemlist) return itemlist @@ -124,7 +134,7 @@ def episodios(item): action="findvideos", title=title, url=scrapedurl, show=show)) if config.get_videolibrary_support() and len(itemlist) > 0: - itemlist.append(Item(channel=item.channel, title="[COLOR blue]Añadir " + show + " a la videoteca[/COLOR]", url=item.url, + itemlist.append(Item(channel=item.channel, title="[COLOR yellow]Añadir " + show + " a la videoteca[/COLOR]", url=item.url, action="add_serie_to_library", extra="episodios", show=show)) @@ -141,6 +151,7 @@ def findvideos(item): data = scrapertools.find_single_match(data, '
(.+?)<\/nav><\/div><\/div>') patron='src="(.+?)"' + logger.info("assfxxv "+data) itemla = scrapertools.find_multiple_matches(data,patron) for i in range(len(itemla)): #for url in itemla: @@ -152,6 +163,8 @@ def findvideos(item): server='okru' else: server='' + if "youtube" in url: + server='youtube' if "openload" in url: server='openload' if "google" in url: @@ -166,6 +179,10 @@ def findvideos(item): title="NO DISPONIBLE" if title!="NO DISPONIBLE": itemlist.append(item.clone(title=title,url=url, action="play", server=server)) + if config.get_videolibrary_support() and len(itemlist) > 0 and item.contentType=="movie" and item.contentChannel!='videolibrary': + itemlist.append( + item.clone(channel=item.channel, title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', url=item.url, + action="add_pelicula_to_library", contentTitle=item.show)) autoplay.start(itemlist, item) return itemlist