Danimados: Añadida seccion de peliculas
This commit is contained in:
@@ -32,8 +32,8 @@ def mainlist(item):
|
|||||||
thumbnail=thumb_series))
|
thumbnail=thumb_series))
|
||||||
itemlist.append(Item(channel=item.channel, action="mainpage", title="Más Populares", url=host,
|
itemlist.append(Item(channel=item.channel, action="mainpage", title="Más Populares", url=host,
|
||||||
thumbnail=thumb_series))
|
thumbnail=thumb_series))
|
||||||
#itemlist.append(Item(channel=item.channel, action="movies", title="Peliculas Animadas", url=host,
|
itemlist.append(Item(channel=item.channel, action="lista", title="Peliculas Animadas", url=host+"peliculas/",
|
||||||
# thumbnail=thumb_series))
|
thumbnail=thumb_series))
|
||||||
autoplay.show_option(item.channel, itemlist)
|
autoplay.show_option(item.channel, itemlist)
|
||||||
return itemlist
|
return itemlist
|
||||||
|
|
||||||
@@ -82,7 +82,6 @@ def mainpage(item):
|
|||||||
return itemlist
|
return itemlist
|
||||||
return itemlist
|
return itemlist
|
||||||
|
|
||||||
|
|
||||||
def lista(item):
|
def lista(item):
|
||||||
logger.info()
|
logger.info()
|
||||||
|
|
||||||
@@ -90,15 +89,26 @@ def lista(item):
|
|||||||
|
|
||||||
data = httptools.downloadpage(item.url).data
|
data = httptools.downloadpage(item.url).data
|
||||||
data = re.sub(r"\n|\r|\t|\s{2}| ", "", data)
|
data = re.sub(r"\n|\r|\t|\s{2}| ", "", data)
|
||||||
data_lista = scrapertools.find_single_match(data, '<div class="items">(.+?)<\/div><\/div><div class=.+?>')
|
if item.title=="Peliculas Animadas":
|
||||||
|
data_lista = scrapertools.find_single_match(data,
|
||||||
|
'<div id="archive-content" class="animation-2 items">(.*)<a href=\'')
|
||||||
|
else:
|
||||||
|
data_lista = scrapertools.find_single_match(data,
|
||||||
|
'<div class="items">(.+?)<\/div><\/div><div class=.+?>')
|
||||||
patron = '<img src="([^"]+)" alt="([^"]+)">.+?<a href="([^"]+)">.+?<div class="texto">(.+?)<\/div>'
|
patron = '<img src="([^"]+)" alt="([^"]+)">.+?<a href="([^"]+)">.+?<div class="texto">(.+?)<\/div>'
|
||||||
#scrapedthumbnail,#scrapedtitle, #scrapedurl, #scrapedplot
|
#scrapedthumbnail,#scrapedtitle, #scrapedurl, #scrapedplot
|
||||||
matches = scrapertools.find_multiple_matches(data_lista, patron)
|
matches = scrapertools.find_multiple_matches(data_lista, patron)
|
||||||
for scrapedthumbnail,scrapedtitle, scrapedurl, scrapedplot in matches:
|
for scrapedthumbnail,scrapedtitle, scrapedurl, scrapedplot in matches:
|
||||||
itemlist.append(
|
if item.title=="Peliculas Animadas":
|
||||||
item.clone(title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail,
|
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))
|
context=autoplay.context,plot=scrapedplot, action="episodios", show=scrapedtitle))
|
||||||
tmdb.set_infoLabels(itemlist)
|
if item.title!="Peliculas Animadas":
|
||||||
|
tmdb.set_infoLabels(itemlist)
|
||||||
return itemlist
|
return itemlist
|
||||||
|
|
||||||
|
|
||||||
@@ -124,7 +134,7 @@ def episodios(item):
|
|||||||
action="findvideos", title=title, url=scrapedurl, show=show))
|
action="findvideos", title=title, url=scrapedurl, show=show))
|
||||||
|
|
||||||
if config.get_videolibrary_support() and len(itemlist) > 0:
|
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))
|
action="add_serie_to_library", extra="episodios", show=show))
|
||||||
|
|
||||||
|
|
||||||
@@ -141,6 +151,7 @@ def findvideos(item):
|
|||||||
data = scrapertools.find_single_match(data,
|
data = scrapertools.find_single_match(data,
|
||||||
'<div id="playex" .+?>(.+?)<\/nav><\/div><\/div>')
|
'<div id="playex" .+?>(.+?)<\/nav><\/div><\/div>')
|
||||||
patron='src="(.+?)"'
|
patron='src="(.+?)"'
|
||||||
|
logger.info("assfxxv "+data)
|
||||||
itemla = scrapertools.find_multiple_matches(data,patron)
|
itemla = scrapertools.find_multiple_matches(data,patron)
|
||||||
for i in range(len(itemla)):
|
for i in range(len(itemla)):
|
||||||
#for url in itemla:
|
#for url in itemla:
|
||||||
@@ -152,6 +163,8 @@ def findvideos(item):
|
|||||||
server='okru'
|
server='okru'
|
||||||
else:
|
else:
|
||||||
server=''
|
server=''
|
||||||
|
if "youtube" in url:
|
||||||
|
server='youtube'
|
||||||
if "openload" in url:
|
if "openload" in url:
|
||||||
server='openload'
|
server='openload'
|
||||||
if "google" in url:
|
if "google" in url:
|
||||||
@@ -166,6 +179,10 @@ def findvideos(item):
|
|||||||
title="NO DISPONIBLE"
|
title="NO DISPONIBLE"
|
||||||
if title!="NO DISPONIBLE":
|
if title!="NO DISPONIBLE":
|
||||||
itemlist.append(item.clone(title=title,url=url, action="play", server=server))
|
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)
|
autoplay.start(itemlist, item)
|
||||||
return itemlist
|
return itemlist
|
||||||
|
|||||||
Reference in New Issue
Block a user