diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml index 0ae3730c..30c0e1f9 100755 --- a/plugin.video.alfa/addon.xml +++ b/plugin.video.alfa/addon.xml @@ -1,5 +1,5 @@  - + @@ -19,11 +19,11 @@ [B]Estos son los cambios para esta versión:[/B] [COLOR green][B]Canales agregados y arreglos[/B][/COLOR] - » cinetux » peliculasgratis - » gamovideo » peliculasaudiolatino - » streamixcloud » uptobox - » canalpelis » verpelis - ¤ arreglos internos + » gnula » playpornx + » plusdede » yaske + » streamplay » bdupload + » bitertv » userscloud + » canalpelis ¤ arreglos internos 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/canalpelis.py b/plugin.video.alfa/channels/canalpelis.py index 79e1dc61..ff444461 100644 --- a/plugin.video.alfa/channels/canalpelis.py +++ b/plugin.video.alfa/channels/canalpelis.py @@ -243,7 +243,6 @@ def series(item): url_next_page = scrapertools.find_single_match(data, '') - tmdb.set_infoLabels(itemlist, __modo_grafico__) tmdb.set_infoLabels(itemlist, __modo_grafico__) if url_next_page: @@ -274,7 +273,7 @@ def temporadas(item): itemlist.append(new_item) tmdb.set_infoLabels(itemlist, __modo_grafico__) - tmdb.set_infoLabels(itemlist, __modo_grafico__) + for i in itemlist: i.title = "%s. %s" % (i.infoLabels['season'], i.infoLabels['tvshowtitle']) if i.infoLabels['title']: @@ -328,7 +327,6 @@ def episodios(item): if not item.extra: # Obtenemos los datos de todos los capitulos de la temporada mediante multihilos tmdb.set_infoLabels(itemlist, __modo_grafico__) - tmdb.set_infoLabels(itemlist, __modo_grafico__) for i in itemlist: if i.infoLabels['title']: # Si el capitulo tiene nombre propio añadirselo al titulo del item @@ -355,26 +353,27 @@ def findvideos(item): itemlist = [] data = httptools.downloadpage(item.url).data - data = re.sub(r"\n|\r|\t|\(.*?\)|\s{2}| ", "", data) - patron = '
' + + patron = '
' matches = re.compile(patron, re.DOTALL).findall(data) + # matches = re.compile(patron, re.DOTALL).findall(data) + for option, url in matches: - lang = scrapertools.find_single_match(data, - '
  • <\/b> (.*?)' % option) + datas = httptools.downloadpage(urlparse.urljoin(host, url), + headers={'Referer': item.url}).data + + patron = ']+src="([^"]+)"' + url = scrapertools.find_single_match(datas, patron) + lang = scrapertools.find_single_match( + data, '
  • <\/b> (.*?)' % option) lang = lang.replace('Español ', '').replace('B.S.O. ', '') - data_b = httptools.downloadpage(urlparse.urljoin(host, url), headers={'Referer': item.url}).data - patron = ']+src="([^"]+)"' - matches = re.compile(patron, re.DOTALL).findall(data_b) - url = matches[0] server = servertools.get_server_from_url(url) title = "%s [COLOR yellow](%s) (%s)[/COLOR]" % (item.contentTitle, server.title(), lang) - itemlist.append(item.clone(action='play', url=url, title=title, extra1=title, server=server, language=lang, - text_color=color3)) + itemlist.append(item.clone(action='play', url=url, title=title, extra1=title, + server=server, language = lang, text_color=color3)) itemlist.append(Item(channel=item.channel, title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', diff --git a/plugin.video.alfa/channels/gnula.py b/plugin.video.alfa/channels/gnula.py index b34600fb..9a3a36a4 100755 --- a/plugin.video.alfa/channels/gnula.py +++ b/plugin.video.alfa/channels/gnula.py @@ -51,8 +51,6 @@ def generos(item): def peliculas(item): logger.info() - - # Descarga la página data = httptools.downloadpage(item.url).data patron = '([^<]+)(.*?)
    ') item.plot = scrapertools.htmlclean(item.plot).strip() item.contentPlot = item.plot - patron = 'Ver película online.*?>.*?>([^<]+)' + patron = 'Ver película online.*?>.*?>([^<]+)' scrapedopcion = scrapertools.find_single_match(data, patron) titulo_opcional = scrapertools.find_single_match(scrapedopcion, ".*?, (.*)").upper() bloque = scrapertools.find_multiple_matches(data, 'contenedor_tab.*?/table') diff --git a/plugin.video.alfa/channels/playpornx.py b/plugin.video.alfa/channels/playpornx.py index 84931128..5d52178f 100644 --- a/plugin.video.alfa/channels/playpornx.py +++ b/plugin.video.alfa/channels/playpornx.py @@ -7,7 +7,7 @@ from core import scrapertools from core.item import Item from platformcode import logger -host = "http://www.playpornx.net/" +host = "https://watchfreexxx.net/" def mainlist(item): @@ -17,7 +17,7 @@ def mainlist(item): fanart='https://s18.postimg.org/fwvaeo6qh/todas.png', url =host)) - itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url='http://www.playpornx.net/?s=', + itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host+'?s=', thumbnail='https://s30.postimg.org/pei7txpa9/buscar.png', fanart='https://s30.postimg.org/pei7txpa9/buscar.png')) @@ -31,13 +31,21 @@ def lista(item): if item.url == '': item.url = host data = httptools.downloadpage(item.url).data data = re.sub(r'"|\n|\r|\t| |
    |\s{2,}', "", data) - patron = '
    .*?href=(.*?)>(.*?)<\/h2>' + if item.extra != 'Buscar': + patron = '
    .*?href=(.*?)> 0: @@ -131,7 +130,7 @@ def peliculas(item): tmdb.set_infoLabels(itemlist) # Si es necesario añadir paginacion - if url_next_page: + if matches_next_page: itemlist.append( Item(channel=item.channel, action="peliculas", title=">> Página siguiente", thumbnail=thumbnail_host, url=url_next_page, folder=True, text_color=color3, text_bold=True)) @@ -175,18 +174,25 @@ def findvideos(item): mtmdb = scrapertools.find_single_match(item.url, 'yaske.ro/([0-9]+)') patron = '(?s)id="online".*?server="([^"]+)"' mserver = scrapertools.find_single_match(data, patron) - url = "http://olimpo.link/?tmdb=%s&server=%s" %(mtmdb, mserver) - data = httptools.downloadpage(url).data + url_m = "http://olimpo.link/?tmdb=%s&server=%s" %(mtmdb, mserver) patron = '/\?tmdb=[^"]+.*?domain=(?:www\.|)([^\.]+).*?text-overflow.*?href="([^"]+).*?' patron += '\[([^\]]+)\].*?\[([^\]]+)\]' + data = httptools.downloadpage(url_m).data matches = scrapertools.find_multiple_matches(data, patron) - for server, url, idioma, calidad in matches: - if "drive" in server: - server = "gvideo" - sublist.append(item.clone(channel=item.channel, action="play", url=url, folder=False, text_color=color1, quality=calidad.strip(), - language=idioma.strip(), - title="Ver en %s %s" %(server, calidad) - )) + page = 2 + while len(matches)>0: + for server, url, idioma, calidad in matches: + if "drive" in server: + server = "gvideo" + sublist.append(item.clone(action="play", url=url, folder=False, text_color=color1, quality=calidad.strip(), + language=idioma.strip(), + server = server, + title="Ver en %s %s" %(server, calidad) + )) + data = httptools.downloadpage(url_m + "&page=%s" %page).data + matches = scrapertools.find_multiple_matches(data, patron) + page +=1 + sublist = sorted(sublist, key=lambda Item: Item.quality + Item.server) for k in ["Español", "Latino", "Ingles - Sub Español", "Ingles"]: lista_idioma = filter(lambda i: i.language == k, sublist) if lista_idioma: @@ -213,6 +219,6 @@ def play(item): ddd = httptools.downloadpage(item.url).data url = "http://olimpo.link" + scrapertools.find_single_match(ddd, '