Merge pull request #547 from danielr460/master

Ajustes Canales Anime
This commit is contained in:
Alfa
2019-02-07 08:43:56 -05:00
committed by GitHub
5 changed files with 64 additions and 21 deletions

View File

@@ -4,7 +4,7 @@
"active": true,
"adult": false,
"language": ["lat"],
"thumbnail": "http://i.imgur.com/s6CBxlw.png",
"thumbnail": "http://i.imgur.com/EpNUqsD.png",
"banner": "http://i.imgur.com/c1YTgNT.png",
"categories": [
"tvshow"

View File

@@ -15,7 +15,7 @@ from core.item import Item
from platformcode import logger, config
from channels import autoplay
from channels import filtertools
from channels import renumbertools
host = "https://animeboom.net/"
@@ -84,6 +84,7 @@ def mainlist(item):
))
autoplay.show_option(item.channel, itemlist)
itemlist = renumbertools.show_option(item.channel, itemlist)
return itemlist
@@ -113,12 +114,16 @@ def list_all(item):
else:
lang = 'VOSE'
title = re.sub('Audio Latino', '', scrapedtitle)
context = renumbertools.context(item)
context2 = autoplay.context
context.extend(context2)
itemlist.append(Item(channel=item.channel, action='episodios',
title=title,
url=url,
thumbnail=thumbnail,
contentSerieName=title,
language = lang,
context = context,
infoLabels={'year':year}
))
@@ -153,11 +158,17 @@ def search_results(item):
url = scrapedurl
title = re.sub('online|Audio|Latino', '', scrapedtitle)
title = title.lstrip()
title = title.rstrip()
context = renumbertools.context(item)
context2 = autoplay.context
context.extend(context2)
itemlist.append(Item(channel=item.channel,
action="episodios",
title=title,
contentSerieName=title,
url=url,
context = context,
thumbnail=scrapedthumbnail))
tmdb.set_infoLabels(itemlist, seekTmdb=True)
@@ -217,9 +228,10 @@ def episodios(item):
lang='Latino'
else:
lang = 'VOSE'
title = "1x" + episode + " - Episodio %s" % episode
season, episode = renumbertools.numbered_for_tratk(item.channel, item.contentSerieName, 1, int(episode))
title = "%sx%s - %s" % (season, str(episode).zfill(2),item.contentSerieName)
url = scrapedurl
infoLabels['season'] = '1'
infoLabels['season'] = season
infoLabels['episode'] = episode
itemlist.append(Item(channel=item.channel, title=title, contentSerieName=item.contentSerieName, url=url,

View File

@@ -65,6 +65,10 @@ def search(item, texto):
_id = e["id"]
url = "%sanime/%s/%s" % (HOST, _id, e["slug"])
title = e["title"]
#if "'" in title:
# title = title.replace("'","")
#if "°" in title:
# title = title.replace("°","")
thumbnail = "%suploads/animes/covers/%s.jpg" % (HOST, e["id"])
new_item = item.clone(action="episodios", title=title, url=url, thumbnail=thumbnail)
if e["type"] != "movie":
@@ -188,18 +192,20 @@ def episodios(item):
itemlist = []
data = httptools.downloadpage(item.url).data
data = re.sub(r"\n|\r|\t|\s{2}|-\s", "", data)
info = eval(scrapertools.find_single_match(data, 'anime_info = (.*?);'))
episodes = eval(scrapertools.find_single_match(data, 'var episodes = (.*?);'))
info = scrapertools.find_single_match(data, "anime_info = \[(.*?)\];")
info = eval(info)
episodes = eval(scrapertools.find_single_match(data, "var episodes = (.*?);"))
for episode in episodes:
url = '%s/ver/%s/%s-%s' % (HOST, episode[1], info[2], episode[0])
season, episodeRenumber = renumbertools.numbered_for_tratk(item.channel, item.contentSerieName, 1, episode[0])
season = 1
season, episodeRenumber = renumbertools.numbered_for_tratk(item.channel, item.contentSerieName, season, int(episode[0]))
#title = '1x%s Episodio %s' % (episode[0], episode[0])
title = '%sx%s Episodio %s' % (season, episodeRenumber, episodeRenumber)
itemlist.append(item.clone(title=title, url=url, action='findvideos', show=info[1]))
title = '%sx%s Episodio %s' % (season, str(episodeRenumber).zfill(2), episodeRenumber)
itemlist.append(item.clone(title=title, url=url, action='findvideos', contentSerieName=item.contentSerieName))
itemlist = itemlist[::-1]
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,
action="add_serie_to_library", extra="episodios"))
action="add_serie_to_library", extra="episodios", show=item.contentSerieName))
return itemlist

View File

@@ -9,11 +9,18 @@ from core import scrapertools
from core import servertools
from core.item import Item
from platformcode import config, logger
from channels import renumbertools,autoplay
CHANNEL_HOST = "https://www.animeid.tv/"
IDIOMAS = {'Latino':'LAT', 'VOSE': 'VOSE'}
list_language = IDIOMAS.values()
list_quality = []
list_servers = ['animeid']
def mainlist(item):
logger.info()
autoplay.init(item.channel, list_servers, list_quality)
itemlist = list()
itemlist.append(
Item(channel=item.channel, action="novedades_series", title="Últimas series", url=CHANNEL_HOST))
@@ -25,6 +32,9 @@ def mainlist(item):
Item(channel=item.channel, action="letras", title="Listado alfabetico", url=CHANNEL_HOST))
itemlist.append(Item(channel=item.channel, action="search", title="Buscar..."))
itemlist = renumbertools.show_option(item.channel, itemlist)
autoplay.show_option(item.channel, itemlist)
return itemlist
@@ -69,9 +79,12 @@ def search(item, texto):
url = urlparse.urljoin(item.url, scrapedurl)
thumbnail = scrapedthumbnail
plot = ""
context = renumbertools.context(item)
context2 = autoplay.context
context.extend(context2)
itemlist.append(
Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumbnail, plot=plot,
show=title, viewmode="movie_with_plot"))
context=context,show=title, viewmode="movie_with_plot"))
return itemlist
@@ -93,8 +106,11 @@ def novedades_series(item):
for url, tipo, title in matches:
scrapedtitle = title + " (" + tipo + ")"
scrapedurl = urlparse.urljoin(item.url, url)
context = renumbertools.context(item)
context2 = autoplay.context
context.extend(context2)
itemlist.append(Item(channel=item.channel, action="episodios", title=scrapedtitle, url=scrapedurl,
show=title, viewmode="movie_with_plot"))
context=context,show=title, viewmode="movie_with_plot"))
return itemlist
@@ -165,13 +181,16 @@ def series(item):
scrapedurl = urlparse.urljoin(item.url, url)
scrapedthumbnail = thumbnail
scrapedplot = plot
context = renumbertools.context(item)
context2 = autoplay.context
context.extend(context2)
itemlist.append(Item(channel=item.channel, action="episodios", title=scrapedtitle, url=scrapedurl,
thumbnail=scrapedthumbnail, plot=scrapedplot, show=scrapedtitle,
thumbnail=scrapedthumbnail, plot=scrapedplot, show=scrapedtitle, context=context,
viewmode="movie_with_plot"))
itemlist = sorted(itemlist, key=lambda it: it.title)
try:
page_url = scrapertools.find_single_match(data, '<li><a href="([^"]+)">&gt;</a></li>')
itemlist.append(Item(channel=item.channel, action="series", title=">> Página siguiente",
itemlist.append(Item(channel=item.channel, action="series", title="[COLOR cyan]>> Página siguiente[/COLOR]",
url=urlparse.urljoin(item.url, page_url), viewmode="movie_with_plot", thumbnail="",
plot=""))
except:
@@ -197,20 +216,22 @@ def episodios(item, final=True):
if '"list":[]' in data:
break
dict_data = jsontools.load(data)
list = dict_data['list']
list = dict_data['list'][::-1]
for dict in list:
itemlist.append(Item(action = "findvideos",
season, episode = renumbertools.numbered_for_tratk(item.channel, item.contentSerieName, 1, int(dict["numero"]))
title = "%sx%s - %s" % (season, str(episode).zfill(2),dict["date"])
itemlist.append(Item(action = "findvideos",
channel = item.channel,
title = "1x" + dict["numero"] + " - " + dict["date"],
title = title,
url = CHANNEL_HOST + dict['href'],
thumbnail = item.thumbnail,
show = item.show,
viewmode = "movie_with_plot"
))
if config.get_videolibrary_support():
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=item.show))
itemlist.append(Item(channel=item.channel, title="Descargar todos los episodios de la serie", url=item.url,
itemlist.append(Item(channel=item.channel, title="[COLOR white]Descargar todos los episodios de la serie[/COLOR]", url=item.url,
action="download_all_episodes", extra="episodios", show=item.show))
return itemlist
@@ -249,4 +270,8 @@ def findvideos(item):
itemlist.append(Item(channel=item.channel, action="findvideos", title="Siguiente: " + title_siguiente,
url=CHANNEL_HOST + url_siguiente, thumbnail=item.thumbnail, plot=item.plot, show=item.show,
fanart=item.thumbnail, folder=True))
# Requerido para AutoPlay
autoplay.start(itemlist, item)
return itemlist

View File

@@ -4,7 +4,7 @@
"active": true,
"adult": false,
"language": ["cast"],
"thumbnail": "http://i.imgur.com/s6CBxlw.png",
"thumbnail": "http://i.imgur.com/iZzF8gE.png",
"banner": "http://i.imgur.com/c1YTgNT.png",
"categories": [
"tvshow"