From 97cee8a0bf947d58d9693d8510bba4b7cef4a88e Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Sun, 10 Sep 2017 21:04:46 -0500 Subject: [PATCH 1/5] Actualizados peliscity: fix de enlaces --- plugin.video.alfa/channels/peliscity.py | 29 ++++++++++--------------- 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/plugin.video.alfa/channels/peliscity.py b/plugin.video.alfa/channels/peliscity.py index dcc1a1c3..daa198c0 100755 --- a/plugin.video.alfa/channels/peliscity.py +++ b/plugin.video.alfa/channels/peliscity.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- import re import urlparse @@ -136,33 +136,26 @@ def findvideos(item): # Descarga la pagina data = scrapertools.cache_page(item.url) - patron = 'class="optxt">(.*?)<.*?width.*?class="q">(.*?) Date: Mon, 11 Sep 2017 14:03:45 -0500 Subject: [PATCH 2/5] Soporte para autoplay algunos canales que cree. --- plugin.video.alfa/channels/anitoonstv.py | 21 +++++++++++++--- plugin.video.alfa/channels/serieslan.py | 19 ++++++++++++-- plugin.video.alfa/channels/seriesmeme.py | 32 ++++++++++++++++++++++-- 3 files changed, 65 insertions(+), 7 deletions(-) diff --git a/plugin.video.alfa/channels/anitoonstv.py b/plugin.video.alfa/channels/anitoonstv.py index f1a8c28f..3557a7f8 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 @@ -10,6 +10,17 @@ from core import servertools from core import tmdb from core.item import Item from platformcode import config, logger +from channels import autoplay + +IDIOMAS = {'latino': 'Latino'} +list_language = IDIOMAS.values() +list_servers = ['openload', + 'okru', + 'netutv', + 'rapidvideo' + ] +list_quality = ['default'] + host = "http://www.anitoonstv.com" @@ -17,6 +28,7 @@ host = "http://www.anitoonstv.com" def mainlist(item): logger.info() thumb_series = get_thumb("channels_tvshow.png") + autoplay.init(item.channel, list_servers, list_quality) itemlist = list() @@ -29,6 +41,7 @@ def mainlist(item): itemlist.append(Item(channel=item.channel, action="lista", title="Pokemon", url=host, thumbnail=thumb_series)) itemlist = renumbertools.show_option(item.channel, itemlist) + autoplay.show_option(item.channel, itemlist) return itemlist @@ -73,10 +86,10 @@ def lista(item): if "&" in show: cad = title.split("xy") show = cad[0] - + context1=[renumbertools.context(item), autoplay.context] itemlist.append( item.clone(title=title, url=url, plot=show, action="episodios", show=show, - context=renumbertools.context(item))) + context=context1)) tmdb.set_infoLabels(itemlist) return itemlist @@ -144,6 +157,8 @@ def findvideos(item): 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 diff --git a/plugin.video.alfa/channels/serieslan.py b/plugin.video.alfa/channels/serieslan.py index fac754c4..1081f3ee 100644 --- a/plugin.video.alfa/channels/serieslan.py +++ b/plugin.video.alfa/channels/serieslan.py @@ -10,6 +10,17 @@ from core import servertools from core import tmdb from core.item import Item from platformcode import config, logger +from channels import autoplay + +IDIOMAS = {'latino': 'Latino'} +list_language = IDIOMAS.values() +list_servers = ['openload', + 'okru', + 'netutv', + 'rapidvideo' + ] +list_quality = ['default'] + host = "https://serieslan.com" @@ -17,12 +28,14 @@ host = "https://serieslan.com" 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="lista", title="Series", url=host, thumbnail=thumb_series, page=0)) itemlist = renumbertools.show_option(item.channel, itemlist) + autoplay.show_option(item.channel, itemlist) return itemlist @@ -48,8 +61,9 @@ def lista(item): title = name url = host + link scrapedthumbnail = host + img + context1=[renumbertools.context(item), autoplay.context] itemlist.append(item.clone(title=title, url=url, action="episodios", thumbnail=scrapedthumbnail, show=title, - context=renumbertools.context(item))) + context=context1)) itemlist.append( Item(channel=item.channel, title="Página Siguiente >>", url=item.url, action="lista", page=item.page + 1)) @@ -76,7 +90,7 @@ def episodios(item): for cap, link, name in matches: title = "" - pat = "as/sd" + pat = "/" # varios episodios en un enlace if len(name.split(pat)) > 1: i = 0 @@ -164,6 +178,7 @@ def findvideos(item): itemlist.append(Item(channel=item.channel, action="play", title=title, show=show, url=video_url, plot=item.plot, thumbnail=thumbnail, server=server, folder=False)) + autoplay.start(itemlist, item) return itemlist else: return [] diff --git a/plugin.video.alfa/channels/seriesmeme.py b/plugin.video.alfa/channels/seriesmeme.py index f0e2055a..54c11ac0 100755 --- a/plugin.video.alfa/channels/seriesmeme.py +++ b/plugin.video.alfa/channels/seriesmeme.py @@ -7,9 +7,20 @@ from channels import renumbertools 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 + +IDIOMAS = {'latino': 'Latino', 'español':'Español'} +list_language = IDIOMAS.values() +list_servers = ['openload', + 'sendvid', + 'netutv', + 'rapidvideo' + ] +list_quality = ['default'] host = "https://seriesmeme.com/" @@ -19,7 +30,7 @@ def mainlist(item): thumb_series = get_thumb("channels_tvshow.png") thumb_series_az = get_thumb("channels_tvshow_az.png") - + autoplay.init(item.channel, list_servers, list_quality) itemlist = list() itemlist.append(Item(channel=item.channel, action="lista_gen", title="Novedades", url=host, @@ -33,6 +44,7 @@ def mainlist(item): itemlist.append(Item(channel=item.channel, action="top", title="Top Series", url=host, thumbnail=thumb_series)) itemlist = renumbertools.show_option(item.channel, itemlist) + autoplay.show_option(item.channel, itemlist) return itemlist @@ -129,9 +141,10 @@ def lista_gen(item): if 'HD' in scrapedlang: scrapedlang = scrapedlang.replace('HD', '') title = scrapedtitle + " [ " + scrapedlang + "]" + context1=[renumbertools.context(item), autoplay.context] itemlist.append( Item(channel=item.channel, title=title, url=scrapedurl, thumbnail=scrapedthumbnail, action="episodios", - show=scrapedtitle, context=renumbertools.context(item))) + show=scrapedtitle, context=context1)) tmdb.set_infoLabels(itemlist) # Paginacion @@ -194,3 +207,18 @@ def episodios(item): action="add_serie_to_library", extra="episodios", show=show)) return itemlist + + +def findvideos(item): + logger.info() + + itemlist = [] + + data = httptools.downloadpage(item.url).data + itemlist.extend(servertools.find_video_items(data=data)) + for videoitem in itemlist: + videoitem.channel=item.channel + + autoplay.start(itemlist, item) + + return itemlist From 9b96631be8cc9b428ca3bbc15ba85ff4988031c0 Mon Sep 17 00:00:00 2001 From: Danielr460 Date: Mon, 11 Sep 2017 14:41:48 -0500 Subject: [PATCH 3/5] Cartoon Latino Autoplay --- plugin.video.alfa/channels/cartoonlatino.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/cartoonlatino.py b/plugin.video.alfa/channels/cartoonlatino.py index 702d860d..1cc9d289 100644 --- a/plugin.video.alfa/channels/cartoonlatino.py +++ b/plugin.video.alfa/channels/cartoonlatino.py @@ -12,18 +12,29 @@ from core.item import Item from platformcode import config, logger host = "http://www.cartoon-latino.com/" +from channels import autoplay +IDIOMAS = {'latino': 'Latino'} +list_language = IDIOMAS.values() +list_servers = ['openload', + 'vimple', + 'gvideo', + '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="lista", title="Series", url=host, thumbnail=thumb_series)) itemlist = renumbertools.show_option(item.channel, itemlist) + autoplay.show_option(item.channel, itemlist) return itemlist @@ -87,9 +98,10 @@ def lista(item): for link, name in matches: title = name + " [Latino]" url = link + context1=[renumbertools.context(item), autoplay.context] itemlist.append( item.clone(title=title, url=url, plot=title, action="episodios", show=title, - context=renumbertools.context(item))) + context=context1)) tmdb.set_infoLabels(itemlist) return itemlist @@ -171,11 +183,13 @@ def findvideos(item): if server in link: url = link.replace('" + ID' + server + ' + "', str(id)) if "drive" in server: - server1 = 'googlevideo' + server1 = 'Gvideo' else: 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 From f71ce1c44a822ac6eed6364bb1b49f8d32da3b7d Mon Sep 17 00:00:00 2001 From: Danielr460 Date: Tue, 12 Sep 2017 19:15:58 -0500 Subject: [PATCH 4/5] =?UTF-8?q?Primera=20versi=C3=B3n=20adaptada=20a=20Aut?= =?UTF-8?q?oplay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin.video.alfa/channels/seriesblanco.py | 36 ++++++++++++++++++++-- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/plugin.video.alfa/channels/seriesblanco.py b/plugin.video.alfa/channels/seriesblanco.py index 5e6fe2e0..9df0b74a 100644 --- a/plugin.video.alfa/channels/seriesblanco.py +++ b/plugin.video.alfa/channels/seriesblanco.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- import re import urlparse @@ -10,11 +10,28 @@ from core import scrapertoolsV2 from core import servertools from core.item import Item from platformcode import config, logger +from channels import autoplay + + HOST = "https://seriesblanco.com/" IDIOMAS = {'es': 'Español', 'en': 'Inglés', 'la': 'Latino', 'vo': 'VO', 'vos': 'VOS', 'vosi': 'VOSI', 'otro': 'OVOS'} list_idiomas = IDIOMAS.values() +list_language = ['default'] CALIDADES = ['SD', 'HDiTunes', 'Micro-HD-720p', 'Micro-HD-1080p', '1080p', '720p'] +list_quality = CALIDADES + +list_servers = ['streamix', + 'powvideo', + 'streamcloud', + 'openload', + 'flashx', + 'streamplay', + 'nowvideo', + 'gamovideo', + 'kingvid', + 'vidabc' + ] def mainlist(item): @@ -25,6 +42,8 @@ def mainlist(item): thumb_buscar = get_thumb("search.png") itemlist = list() + + autoplay.init(item.channel, list_servers, list_quality) itemlist.append(Item(channel=item.channel, title="Listado alfabético", action="series_listado_alfabetico", thumbnail=thumb_series_az)) itemlist.append(Item(channel=item.channel, title="Todas las series", action="series", @@ -45,6 +64,7 @@ def mainlist(item): itemlist = filtertools.show_option(itemlist, item.channel, list_idiomas, CALIDADES) + autoplay.show_option(item.channel, itemlist) return itemlist @@ -83,10 +103,11 @@ def extract_series_from_data(item, data): else: action = "findvideos" + context1=[filtertools.context(item, list_idiomas, CALIDADES), autoplay.context] itemlist.append(item.clone(title=name, url=urlparse.urljoin(HOST, url), action=action, show=name, thumbnail=img, - context=filtertools.context(item, list_idiomas, CALIDADES))) + context=context1)) more_pages = re.search('pagina=([0-9]+)">>>', data) if more_pages: @@ -268,7 +289,6 @@ def findvideos(item): # logger.info(data) online = extract_videos_section(data) - try: filtro_enlaces = config.get_setting("filterlinks", item.channel) except: @@ -284,6 +304,16 @@ def findvideos(item): list_links = filtertools.get_links(list_links, item, list_idiomas, CALIDADES) + for i in range(len(list_links)): + a=list_links[i].title + b=a.lstrip('Ver en') + c=b.split('[') + d=c[0].rstrip( ) + d=d.lstrip( ) + list_links[i].server=d + + autoplay.start(list_links, item) + return list_links From 2778e088b159364dc5ac6ce01c0e65c788c206fa Mon Sep 17 00:00:00 2001 From: Alfa-Addon Date: Wed, 13 Sep 2017 02:50:34 -0500 Subject: [PATCH 5/5] v2.0.2 --- plugin.video.alfa/addon.xml | 21 ++-- plugin.video.alfa/channels/pelisplanet.py | 125 +++++++++++----------- 2 files changed, 75 insertions(+), 71 deletions(-) diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml index 1b3c28c5..f044ecc0 100755 --- a/plugin.video.alfa/addon.xml +++ b/plugin.video.alfa/addon.xml @@ -1,5 +1,5 @@  - + @@ -19,16 +19,15 @@ [B]Estos son los cambios para esta versión:[/B] [COLOR green][B]Canales agregados y arreglos[/B][/COLOR] - [I]- peliculasrey - - pelis24 - - peliscity - - peliscon - - pelisgratis - - pelispad - - pelismagnet - - rapidvideo - - streammango - - fix internos[/I] + » anitoonstv » qserie + » cartoonlatino » repelis + » seriesblanco » seodiv + » serieslan » pelisplanet + » seriesmeme » pepecine + » peliscity » pelisporno + » okru » vimpleru + ¤ fix internos + [COLOR green]Gracias a [COLOR yellow]danielr460[/COLOR] por su colaboración en esta versión[/COLOR] Navega con Kodi por páginas web para ver sus videos de manera fácil. Browse web pages using Kodi diff --git a/plugin.video.alfa/channels/pelisplanet.py b/plugin.video.alfa/channels/pelisplanet.py index 890f78bb..83306a3a 100644 --- a/plugin.video.alfa/channels/pelisplanet.py +++ b/plugin.video.alfa/channels/pelisplanet.py @@ -97,8 +97,8 @@ def sub_search(item): data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t| |
", "", data) # logger.info(data) - patron = '') title = "%s [COLOR yellow][%s][/COLOR]" % (scrapedtitle.strip(), calidad.upper()) - itemlist.append(Item(channel=item.channel, action="findvideos", title=title, plot='', + new_item = Item(channel=item.channel, action="findvideos", title=title, plot='', contentType='movie', url=scrapedurl, contentQuality=calidad, thumbnail=scrapedthumbnail, contentTitle=contentTitle, infoLabels={"year": year, 'rating': rating, 'director': director}, - text_color=color3)) + text_color=color3) - tmdb.set_infoLabels(itemlist, __modo_grafico__) - tmdb.set_infoLabels(itemlist, __modo_grafico__) + # tmdb.set_infoLabels(itemlist, __modo_grafico__) + # tmdb.set_infoLabels(itemlist, __modo_grafico__) + if year: + tmdb.set_infoLabels_item(new_item, __modo_grafico__) + itemlist.append(new_item) paginacion = scrapertools.find_single_match(data, '') title = "[COLOR green]%s[/COLOR] [COLOR yellow][%s][/COLOR] [COLOR yellow][%s][/COLOR]" % ( @@ -309,14 +319,9 @@ def findvideos(item): thumbnail = item.thumbnail server = servertools.get_server_from_url(url) - itemlist.append(item.clone(action='play', title=title, url=url, quality=quality, + itemlist.append(item.clone(action='play', title=title, url=url, quality=quality, language=lang.replace('Español ', ''), server=server, text_color=color3, thumbnail=thumbnail)) - for videoitem in itemlist: - videoitem.infoLabels = item.infoLabels - videoitem.channel = item.channel - videoitem.action = 'play' - videoitem.fulltitle = item.title if config.get_videolibrary_support() and len(itemlist) > 0: itemlist.append(Item(channel=item.channel,