diff --git a/plugin.video.alfa/channels/anitoonstv.py b/plugin.video.alfa/channels/anitoonstv.py index 3557a7f8..b463b0ca 100644 --- a/plugin.video.alfa/channels/anitoonstv.py +++ b/plugin.video.alfa/channels/anitoonstv.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- import re @@ -149,34 +149,14 @@ def findvideos(item): for server, quality, url in itemla: if "Calidad Alta" in quality: quality = quality.replace("Calidad Alta", "HQ") - server = server.lower().strip() - if "ok" == server: - server = 'okru' - if "netu" == server: - continue + if " Calidad media - Carga mas rapido" in quality: + quality = quality.replace(" Calidad media - Carga mas rapido", "360p") + server = server.lower().strip() + if "ok" == server: + server = 'okru' itemlist.append(item.clone(url=url, action="play", server=server, contentQuality=quality, thumbnail=scrapedthumbnail, plot=scrapedplot, title="Enlace encontrado en %s: [%s]" % (server.capitalize(), quality))) - + autoplay.start(itemlist, item) return itemlist - - -def play(item): - logger.info() - - itemlist = [] - - # Buscamos video por servidor ... - devuelve = servertools.findvideosbyserver(item.url, item.server) - - if not devuelve: - # ...sino lo encontramos buscamos en todos los servidores disponibles - devuelve = servertools.findvideos(item.url, skip=True) - - if devuelve: - # logger.debug(devuelve) - itemlist.append(Item(channel=item.channel, title=item.contentTitle, action="play", server=devuelve[0][2], - url=devuelve[0][1], thumbnail=item.thumbnail)) - - return itemlist diff --git a/plugin.video.alfa/channels/autoplay.py b/plugin.video.alfa/channels/autoplay.py index f8699b40..b507978c 100644 --- a/plugin.video.alfa/channels/autoplay.py +++ b/plugin.video.alfa/channels/autoplay.py @@ -7,6 +7,7 @@ from core import jsontools from core.item import Item from platformcode import config, logger from platformcode import platformtools +from platformcode import launcher __channel__ = "autoplay" @@ -78,7 +79,20 @@ def start(itemlist, item): :return: intenta autoreproducir, en caso de fallar devuelve el itemlist que recibio en un principio ''' logger.info() - + for videoitem in itemlist: + #Nos dice de donde viene si del addon o videolibrary + if item.contentChannel=='videolibrary': + videoitem.contentEpisodeNumber=item.contentEpisodeNumber + videoitem.contentPlot=item.contentPlot + videoitem.contentSeason=item.contentSeason + videoitem.contentSerieName=item.contentSerieName + videoitem.contentTitle=item.contentTitle + videoitem.contentType=item.contentType + videoitem.episode_id=item.episode_id + videoitem.hasContentDetails=item.hasContentDetails + videoitem.infoLabels=item.infoLabels + videoitem.thumbnail=item.thumbnail + #videoitem.title=item.title if not config.is_xbmc(): #platformtools.dialog_notification('AutoPlay ERROR', 'Sólo disponible para XBMC/Kodi') return itemlist @@ -261,8 +275,12 @@ def start(itemlist, item): else: videoitem = resolved_item[0] - # si no directamente reproduce - platformtools.play_video(videoitem) + # si no directamente reproduce y marca como visto + from platformcode import xbmc_videolibrary + xbmc_videolibrary.mark_auto_as_watched(item) + #platformtools.play_video(videoitem) + videoitem.contentChannel='videolibrary' + launcher.run(videoitem) try: if platformtools.is_playing(): diff --git a/plugin.video.alfa/channels/cartoonlatino.py b/plugin.video.alfa/channels/cartoonlatino.py index a3f9fd82..d356f4f8 100644 --- a/plugin.video.alfa/channels/cartoonlatino.py +++ b/plugin.video.alfa/channels/cartoonlatino.py @@ -9,6 +9,7 @@ from core import servertools from core import tmdb from core.item import Item from platformcode import config, logger +from channels import autoplay host = "http://www.cartoon-latino.com/" from channels import autoplay @@ -150,7 +151,6 @@ def episodios(item): 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, - action="add_serie_to_library", extra="episodios", show=show)) return itemlist @@ -185,29 +185,5 @@ def findvideos(item): server1 = server itemlist.append(item.clone(url=url, action="play", server=server1, title="Enlace encontrado en %s " % (server1.capitalize()))) - autoplay.start(itemlist, item) return itemlist - - -def play(item): - logger.info() - - itemlist = [] - - # Buscamos video por servidor ... - - devuelve = servertools.findvideosbyserver(item.url, item.server) - - if not devuelve: - # ...sino lo encontramos buscamos en todos los servidores disponibles - - devuelve = servertools.findvideos(item.url, skip=True) - - if devuelve: - # logger.debug(devuelve) - itemlist.append(Item(channel=item.channel, title=item.contentTitle, action="play", server=devuelve[0][2], - - url=devuelve[0][1], thumbnail=item.thumbnail, folder=False)) - - return itemlist diff --git a/plugin.video.alfa/channels/danimados.json b/plugin.video.alfa/channels/danimados.json new file mode 100644 index 00000000..51d80b24 --- /dev/null +++ b/plugin.video.alfa/channels/danimados.json @@ -0,0 +1,19 @@ +{ + "id": "danimados", + "name": "Danimados", + "active": true, + "adult": false, + "language": ["lat"], + "thumbnail": "https://imgur.com/kU5Lx1S.png", + "banner": "https://imgur.com/xG5xqBq.png", + "version": 1, + "changes": [ + { + "date": "24/10/2017", + "description": "Primera version del canal" + } + ], + "categories": [ + "tvshow" + ] +} diff --git a/plugin.video.alfa/channels/danimados.py b/plugin.video.alfa/channels/danimados.py new file mode 100644 index 00000000..a2e77c44 --- /dev/null +++ b/plugin.video.alfa/channels/danimados.py @@ -0,0 +1,186 @@ +# -*- coding: utf-8 -*- + +import re + +from channelselector import get_thumb +from core import httptools +from core import scrapertools +from core import servertools +from core import tmdb +from core.item import Item +from platformcode import config, logger +from channels import autoplay + +host = "http://www.danimados.com/" + +list_servers = ['openload', + 'okru', + 'rapidvideo' + ] +list_quality = ['default'] + + +def mainlist(item): + logger.info() + + thumb_series = get_thumb("channels_tvshow.png") + autoplay.init(item.channel, list_servers, list_quality) + + itemlist = list() + + itemlist.append(Item(channel=item.channel, action="mainpage", title="Categorías", url=host, + 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)) + autoplay.show_option(item.channel, itemlist) + return itemlist + + +""" +def search(item, texto): + logger.info() + texto = texto.replace(" ","+") + item.url = item.url+texto + if texto!='': + return lista(item) +""" + + +def mainpage(item): + logger.info() + + itemlist = [] + + data1 = httptools.downloadpage(item.url).data + data1 = re.sub(r"\n|\r|\t|\s{2}| ", "", data1) + if item.title=="Más Populares": + patron_sec='(.+?)<\/ul>' + patron='([^"]+)<\/a>' #scrapedthumbnail, #scrapedurl, #scrapedtitle + if item.title=="Categorías": + patron_sec='