diff --git a/plugin.video.alfa/channels/anitoonstv.py b/plugin.video.alfa/channels/anitoonstv.py index 819a9275..417ef1f1 100644 --- a/plugin.video.alfa/channels/anitoonstv.py +++ b/plugin.video.alfa/channels/anitoonstv.py @@ -127,7 +127,7 @@ def episodios(item): plot=scrapedplot, url=url, show=show)) if config.get_videolibrary_support() and len(itemlist) > 0: - itemlist.append(Item(channel=item.channel, title="Añadir esta serie a la videoteca", url=item.url, + itemlist.append(Item(channel=item.channel, title="[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]", url=item.url, action="add_serie_to_library", extra="episodios", show=show)) return itemlist diff --git a/plugin.video.alfa/channels/asialiveaction.py b/plugin.video.alfa/channels/asialiveaction.py index 1277d2fb..fc008f75 100644 --- a/plugin.video.alfa/channels/asialiveaction.py +++ b/plugin.video.alfa/channels/asialiveaction.py @@ -180,7 +180,7 @@ def findvideos(item): show = item.show for videoitem in itemlist: videoitem.channel = item.channel - if config.get_videolibrary_support() and len(itemlist) > 0 and item.contentType=="movie": + if config.get_videolibrary_support() and len(itemlist) > 0 and item.contentType=="movie" and item.contentChannel!='videolibrary': itemlist.append( Item(channel=item.channel, title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', url=item.url, action="add_pelicula_to_library", extra="findvideos", contentTitle=show)) diff --git a/plugin.video.alfa/channels/cartoonlatino.py b/plugin.video.alfa/channels/cartoonlatino.py index d356f4f8..48b47c0a 100644 --- a/plugin.video.alfa/channels/cartoonlatino.py +++ b/plugin.video.alfa/channels/cartoonlatino.py @@ -150,7 +150,7 @@ def episodios(item): itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, show=show)) if config.get_videolibrary_support() and len(itemlist) > 0: - itemlist.append(Item(channel=item.channel, title="Añadir " + show + " a la videoteca", 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)) return itemlist diff --git a/plugin.video.alfa/channels/cinehindi.py b/plugin.video.alfa/channels/cinehindi.py index 4dfc127e..cf13e172 100755 --- a/plugin.video.alfa/channels/cinehindi.py +++ b/plugin.video.alfa/channels/cinehindi.py @@ -123,7 +123,7 @@ def lista(item): if next_page_url != "": item.url = next_page_url - itemlist.append(Item(channel=item.channel, action="lista", title=">> Página siguiente", url=next_page_url, + itemlist.append(Item(channel=item.channel, action="lista", title="[COLOR cyan]Página Siguiente >>[/COLOR]", url=next_page_url, thumbnail='https://s32.postimg.org/4zppxf5j9/siguiente.png')) return itemlist @@ -132,14 +132,18 @@ def findvideos(item): logger.info() itemlist = [] + itemlist1 = [] data = httptools.downloadpage(item.url).data - itemlist.extend(servertools.find_video_items(data=data)) + itemlist1.extend(servertools.find_video_items(data=data)) patron_show = '

([^<]+)<\/h1>' show = scrapertools.find_single_match(data, patron_show) - for videoitem in itemlist: + for videoitem in itemlist1: videoitem.channel = item.channel - if config.get_videolibrary_support() and len(itemlist) > 0: + for i in range(len(itemlist1)): + if not 'youtube' in itemlist1[i].title: + itemlist.append(itemlist1[i]) + if config.get_videolibrary_support() and len(itemlist) > 0 and item.contentChannel!='videolibrary': itemlist.append( Item(channel=item.channel, title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', url=item.url, action="add_pelicula_to_library", extra="findvideos", contentTitle=show)) 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 diff --git a/plugin.video.alfa/channels/mundiseries.py b/plugin.video.alfa/channels/mundiseries.py index 581501a3..232be528 100644 --- a/plugin.video.alfa/channels/mundiseries.py +++ b/plugin.video.alfa/channels/mundiseries.py @@ -76,7 +76,7 @@ def episodios(item): title=title, url=url, show=show)) if config.get_videolibrary_support() and len(itemlist) > 0: - itemlist.append(Item(channel=item.channel, title="Añadir Temporada/Serie a la biblioteca de Kodi", url=item.url, + itemlist.append(Item(channel=item.channel, title="[COLOR yellow]Añadir Temporada/Serie a la biblioteca de Kodi[/COLOR]", url=item.url, action="add_serie_to_library", extra="episodios", show=show)) return itemlist diff --git a/plugin.video.alfa/channels/peliculashindu.py b/plugin.video.alfa/channels/peliculashindu.py index c8204155..1989827c 100755 --- a/plugin.video.alfa/channels/peliculashindu.py +++ b/plugin.video.alfa/channels/peliculashindu.py @@ -33,15 +33,14 @@ def mainlist(item): def explorar(item): logger.info() itemlist = list() - url1 = str(item.url) + url1 = item.title data = httptools.downloadpage(host).data data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) - # logger.info("loca :"+url1+" aaa"+data) - if 'genero' in url1: - patron = '

Pel.+?neros<\/h3>(.+?)<\/h3>' - if 'alfabetico' in url1: - patron = '<\/li><\/ul>

Pel.+?tico<\/h3>(.+?)<\/h3>' - if 'año' in url1: + if 'Género' in url1: + patron = '
.+?

Pel.+?neros<\/h3>(.+?)<\/h3>' + if 'Listado Alfabético' in url1: + patron = '<\/li><\/ul>.+?

Pel.+?tico<\/h3>(.+?)<\/h3>' + if 'Año' in url1: patron = '