From 1b02644233d819b3b0083e8935d8a1cea6f1ca27 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Sun, 15 Oct 2017 09:22:17 -0500 Subject: [PATCH 01/10] Actualizado Nuevo canal: pelismundo --- plugin.video.alfa/channels/pelismundo.json | 61 ++++++ plugin.video.alfa/channels/pelismundo.py | 244 +++++++++++++++++++++ 2 files changed, 305 insertions(+) create mode 100644 plugin.video.alfa/channels/pelismundo.json create mode 100644 plugin.video.alfa/channels/pelismundo.py diff --git a/plugin.video.alfa/channels/pelismundo.json b/plugin.video.alfa/channels/pelismundo.json new file mode 100644 index 00000000..d570c0f6 --- /dev/null +++ b/plugin.video.alfa/channels/pelismundo.json @@ -0,0 +1,61 @@ +{ + "id": "pelismundo", + "name": "Pelismundo", + "active": true, + "adult": false, + "language": ["lat"], + "thumbnail": "https://s26.postimg.org/72c9mr3ux/pelismundo1.png", + "banner": "", + "version": 1, + "changes": [ + { + "date": "12/10/2017", + "description": "Primera version" + } + ], + "categories": [ + "movie" + ], + "settings": [ + { + "id": "modo_grafico", + "type": "bool", + "label": "Buscar información extra", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_global_search", + "type": "bool", + "label": "Incluir en busqueda global", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_peliculas", + "type": "bool", + "label": "Incluir en Novedades - Peliculas", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_infantiles", + "type": "bool", + "label": "Incluir en Novedades - Infantiles", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_terror", + "type": "bool", + "label": "Incluir en Novedades - terror", + "default": true, + "enabled": true, + "visible": true + } + ] +} diff --git a/plugin.video.alfa/channels/pelismundo.py b/plugin.video.alfa/channels/pelismundo.py new file mode 100644 index 00000000..160f22f9 --- /dev/null +++ b/plugin.video.alfa/channels/pelismundo.py @@ -0,0 +1,244 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------ +# Alfa addon - KODI Plugin +# Canal para pelismundo +# https://github.com/alfa-addon +# ------------------------------------------------------------ + +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 + +__channel__='allcalidad' + +host = "http://www.pelismundo.com/" + +try: + __modo_grafico__ = config.get_setting('modo_grafico', __channel__) +except: + __modo_grafico__ = True + + +def mainlist(item): + logger.info() + itemlist = [] + itemlist.append(Item(channel = item.channel, title = "Recientes", action = "peliculas", url = host)) + itemlist.append(Item(channel = item.channel, title = "Por audio", action = "filtro", url = host, filtro = "Películas por audio")) + itemlist.append(Item(channel = item.channel, title = "Por género", action = "filtro", url = host, filtro = "Películas por género")) + itemlist.append(Item(channel = item.channel)) + itemlist.append(Item(channel = item.channel, title = "Buscar", action = "search", url = host)) + return itemlist + + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'peliculas': + item.url = host + elif categoria == 'infantiles': + item.url = host + 'genero/infantil/' + elif categoria == 'terror': + item.url = host + 'genero/terror/' + itemlist = peliculas(item) + if "Pagina" in itemlist[-1].title: + itemlist.pop() + except: + import sys + for line in sys.exc_info(): + logger.error("{0}".format(line)) + return [] + + return itemlist + + +def search(item, texto): + logger.info() + item.url += "?s=" + texto = texto.replace(" ", "+") + item.url = item.url + texto + try: + return sub_search(item) + # Se captura la excepción, para no interrumpir al buscador global si un canal falla + except: + import sys + for line in sys.exc_info(): + logger.error("%s" % line) + return [] + + +def sub_search(item): + logger.info() + itemlist = [] + data = httptools.downloadpage(item.url).data + patron = 'search-results-content infinite.*?' + bloque = scrapertools.find_single_match(data, patron) + patron = '(?s)href="([^"]+)".*?' + patron += 'title="([^"]+)".*?' + patron += 'src="([^"]+)".*?' + patron += 'Idioma.*?tag">([^<]+).*?' + patron += 'Calidad(.*?<)\/' + match = scrapertools.find_multiple_matches(bloque, patron) + scrapertools.printMatches(match) + for scrapedurl, scrapedtitle, scrapedthumbnail, scrapedlanguages, scrapedquality in match: + year = scrapertools.find_single_match(scrapedtitle, '[0-9]{4}') + scrapedquality = scrapertools.find_single_match(scrapedquality, 'rel="tag">([^<]+)<') + st = scrapertools.find_single_match(scrapedtitle, 'Online.*') + scrapedtitle = scrapedtitle.replace(st, "") + st = scrapertools.find_single_match(scrapedtitle, '\(.*?\)') + scrapedtitle = scrapedtitle.replace(st, "") + title = scrapedtitle + if year: + title += " (" + year + ")" + if scrapedquality: + title += " (" + scrapedquality + ")" + patronidiomas = '' + idiomas_disponibles = [] + matchidioma = scrapertools.find_single_match(scrapedlanguages, 'Castellano') + if matchidioma: + idiomas_disponibles.append("ESP") + matchidioma = scrapertools.find_single_match(scrapedlanguages, 'Subtitulado') + if matchidioma: + idiomas_disponibles.append("VOSE") + matchidioma = scrapertools.find_single_match(scrapedlanguages, 'Latino') + if matchidioma: + idiomas_disponibles.append("LAT") + idiomas_disponibles1 = "" + if idiomas_disponibles: + idiomas_disponibles1 = "[" + "/".join(idiomas_disponibles) + "]" + title += " %s" %idiomas_disponibles1 + itemlist.append(Item(channel = item.channel, + action = "findvideos", + title = title, + contentTitle = scrapedtitle, + thumbnail = scrapedthumbnail, + quality = scrapedquality, + language = idiomas_disponibles, + infoLabels={"year": year}, + url = scrapedurl + )) + tmdb.set_infoLabels(itemlist) + url_pagina = scrapertools.find_single_match(data, 'next" href="([^"]+)') + if url_pagina != "": + pagina = "Pagina: " + scrapertools.find_single_match(url_pagina, "page/([0-9]+)") + itemlist.append(Item(channel = item.channel, action = "peliculas", title = pagina, url = url_pagina)) + return itemlist + + +def filtro(item): + logger.info() + itemlist = [] + data = httptools.downloadpage(item.url).data + patron = 'class="sbi-header">%s.*?' %item.filtro + bloque = scrapertools.find_single_match(data, patron) + patron = '(?s)href="([^"]+)".*?' + patron += '([^<]+)' + matches = scrapertools.find_multiple_matches(bloque, patron) + for url, title in matches: + if "eroti33cas" in title and config.get_setting("adult_mode") == 0: + continue + itemlist.append(item.clone(action = "peliculas", + title = title.title(), + url = url + )) + return itemlist + +def peliculas(item): + logger.info() + itemlist = [] + data = httptools.downloadpage(item.url).data + patron = 'movie-list" class="clearfix.*?pagination movie-pagination clearfix' + bloque = scrapertools.find_single_match(data, patron) + patron = '(?s)href="([^"]+)".*?' + patron += 'title="([^"]+)".*?' + patron += 'class="mq([^"]+)".*?' + patron += 'src="([^"]+)".*?' + patron += '_audio(.*?)class.*?' + patron += 'label_year">([^<]+)<' + match = scrapertools.find_multiple_matches(bloque, patron) + for scrapedurl, scrapedtitle, scrapedquality, scrapedthumbnail, scrapedlanguages, year in match: + year = scrapertools.find_single_match(year, '[0-9]{4}') + st = scrapertools.find_single_match(scrapedtitle, 'Online.*') + scrapedtitle = scrapedtitle.replace(st, "").strip() + st = scrapertools.find_single_match(scrapedtitle, '\(.*?\)') + scrapedtitle = scrapedtitle.replace(st, "") + title = scrapedtitle + if year: + title += " (" + year + ")" + if scrapedquality: + title += " (" + scrapedquality + ")" + patronidiomas = '' + idiomas_disponibles = [] + matchidioma = scrapertools.find_single_match(scrapedlanguages, 'Castellano') + if matchidioma: + idiomas_disponibles.append("ESP") + matchidioma = scrapertools.find_single_match(scrapedlanguages, 'Subtitulado') + if matchidioma: + idiomas_disponibles.append("VOSE") + matchidioma = scrapertools.find_single_match(scrapedlanguages, 'Latino') + if matchidioma: + idiomas_disponibles.append("LAT") + idiomas_disponibles1 = "" + if idiomas_disponibles: + idiomas_disponibles1 = "[" + "/".join(idiomas_disponibles) + "]" + title += " %s" %idiomas_disponibles1 + itemlist.append(Item(channel = item.channel, + action = "findvideos", + title = title, + contentTitle = scrapedtitle, + thumbnail = scrapedthumbnail, + quality = scrapedquality, + language = idiomas_disponibles, + infoLabels={"year": year}, + url = scrapedurl + )) + tmdb.set_infoLabels(itemlist) + url_pagina = scrapertools.find_single_match(data, 'next" href="([^"]+)') + if url_pagina != "": + pagina = "Pagina: " + scrapertools.find_single_match(url_pagina, "page/([0-9]+)") + itemlist.append(Item(channel = item.channel, action = "peliculas", title = pagina, url = url_pagina)) + return itemlist + + +def findvideos(item): + logger.info() + itemlist = [] + data = httptools.downloadpage(item.url).data + patron = 'SegundaParte.*?ventana-flotante' + bloque = scrapertools.find_single_match(data, patron) + patron = 'hand" rel="([^"]+)".*?' + patron += 'optxt">([^<]+).*?' + matches = scrapertools.find_multiple_matches(bloque, patron) + for scrapedurl, scrapedlanguage in matches: + if "youtube" in scrapedurl: + scrapedurl += "&" + title = "Ver en: %s " + "(" + scrapedlanguage + ")" + itemlist.append(item.clone(action = "play", + title = title, + language = item.language, + quality = item.quality, + url = scrapedurl + )) + tmdb.set_infoLabels(itemlist) + itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) + if itemlist: + itemlist.append(Item(channel = item.channel)) + itemlist.append(item.clone(channel="trailertools", title="Buscar Tráiler", action="buscartrailer", context="", + text_color="magenta")) + # Opción "Añadir esta película a la biblioteca de KODI" + if item.extra != "library": + if config.get_videolibrary_support(): + itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green", + action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail, + fulltitle = item.contentTitle + )) + return itemlist + + +def play(item): + item.thumbnail = item.contentThumbnail + return [item] From fa0ddda0900b544881a4e43c14af50bc45a0d075 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Sun, 15 Oct 2017 09:49:46 -0500 Subject: [PATCH 02/10] Update animeflv_me.py --- plugin.video.alfa/channels/animeflv_me.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/plugin.video.alfa/channels/animeflv_me.py b/plugin.video.alfa/channels/animeflv_me.py index b73b174f..34e395ca 100755 --- a/plugin.video.alfa/channels/animeflv_me.py +++ b/plugin.video.alfa/channels/animeflv_me.py @@ -58,10 +58,9 @@ def get_cookie_value(): return cookies_value -header_string = "|User-Agent=Mozilla/5.0&Referer=http://animeflv.me&Cookie=" + \ +header_string = "|User-Agent=Mozilla/5.0&Referer=http://animeflv.co&Cookie=" + \ get_cookie_value() - def __find_next_page(html): """ Busca el enlace a la pagina siguiente @@ -71,12 +70,6 @@ def __find_next_page(html): def __extract_info_from_serie(html): - """ - Extrae la información de una serie o pelicula desde su página - Util para cuando una busqueda devuelve un solo resultado y animeflv.me - redirecciona a la página de este. - """ - title = scrapertools.find_single_match(html, REGEX_TITLE) title = clean_title(title) url = scrapertools.find_single_match(html, REGEX_URL) @@ -156,7 +149,7 @@ def mainlist(item): def letras(item): logger.info() - base_url = 'http://animeflv.me/ListadeAnime?c=' + base_url = 'http://animeflv.co/ListadeAnime?c=' itemlist = list() itemlist.append(Item(channel=item.channel, action="series", title="#", url=base_url + "#")) From e1517f20c9c7f604c28f8f386821f5dce75a6d05 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Mon, 16 Oct 2017 11:16:49 -0500 Subject: [PATCH 03/10] Update gvideo.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cambio de patrón --- plugin.video.alfa/servers/gvideo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/servers/gvideo.json b/plugin.video.alfa/servers/gvideo.json index a5d78fe4..c4f0afb9 100644 --- a/plugin.video.alfa/servers/gvideo.json +++ b/plugin.video.alfa/servers/gvideo.json @@ -18,7 +18,7 @@ "url": "http://docs.google.com/get_video_info?docid=\\1" }, { - "pattern": "(?s)\"https://(?!docs)(.*?).googleusercontent.com/([^\"]+)", + "pattern": "(?s)\"https://(lh.*?).googleusercontent.com/([^\"]+)", "url": "https://\\1.googleusercontent.com/\\2" } ] From 155e54e01e4f685642d4b2fdc708b4fd96fec0fb Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Mon, 16 Oct 2017 11:38:57 -0500 Subject: [PATCH 04/10] Update animeflv_me.py --- plugin.video.alfa/channels/animeflv_me.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugin.video.alfa/channels/animeflv_me.py b/plugin.video.alfa/channels/animeflv_me.py index 34e395ca..52ba1639 100755 --- a/plugin.video.alfa/channels/animeflv_me.py +++ b/plugin.video.alfa/channels/animeflv_me.py @@ -298,18 +298,20 @@ def episodios(item): def findvideos(item): logger.info() - itemlist = [] - + encontrados = [] page_html = get_url_contents(item.url) regex_api = r'http://player\.animeflv\.co/[^\"]+' iframe_url = scrapertools.find_single_match(page_html, regex_api) iframe_html = get_url_contents(iframe_url) itemlist.extend(servertools.find_video_items(data=iframe_html)) - + qualities = ["360", "480", "720", "1080"] for videoitem in itemlist: + if videoitem.url in encontrados: + continue + encontrados.append(videoitem.url) videoitem.fulltitle = item.fulltitle videoitem.title = "%s en calidad [%s]" % (videoitem.server, qualities[1]) videoitem.channel = item.channel @@ -319,10 +321,11 @@ def findvideos(item): videos_html = scrapertools.find_single_match(iframe_html, regex_video_list) videos = re.findall('"([^"]+)"', videos_html, re.DOTALL) - for quality_id, video_url in enumerate(videos): + if video_url in encontrados: + continue + encontrados.append(video_url) itemlist.append(Item(channel=item.channel, action="play", url=video_url, show=re.escape(item.show), title="Ver en calidad [%s]" % (qualities[quality_id]), plot=item.plot, fulltitle=item.title)) - return __sort_by_quality(itemlist) From 9b2919b38f8469d87ca3b785f5d427a892bf9317 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Mon, 16 Oct 2017 11:48:28 -0500 Subject: [PATCH 05/10] Update pelismundo.py --- plugin.video.alfa/channels/pelismundo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/pelismundo.py b/plugin.video.alfa/channels/pelismundo.py index 160f22f9..2e89c06e 100644 --- a/plugin.video.alfa/channels/pelismundo.py +++ b/plugin.video.alfa/channels/pelismundo.py @@ -87,7 +87,7 @@ def sub_search(item): for scrapedurl, scrapedtitle, scrapedthumbnail, scrapedlanguages, scrapedquality in match: year = scrapertools.find_single_match(scrapedtitle, '[0-9]{4}') scrapedquality = scrapertools.find_single_match(scrapedquality, 'rel="tag">([^<]+)<') - st = scrapertools.find_single_match(scrapedtitle, 'Online.*') + st = scrapertools.find_single_match(scrapedtitle, '(?i)Online.*') scrapedtitle = scrapedtitle.replace(st, "") st = scrapertools.find_single_match(scrapedtitle, '\(.*?\)') scrapedtitle = scrapedtitle.replace(st, "") @@ -162,7 +162,7 @@ def peliculas(item): match = scrapertools.find_multiple_matches(bloque, patron) for scrapedurl, scrapedtitle, scrapedquality, scrapedthumbnail, scrapedlanguages, year in match: year = scrapertools.find_single_match(year, '[0-9]{4}') - st = scrapertools.find_single_match(scrapedtitle, 'Online.*') + st = scrapertools.find_single_match(scrapedtitle, '(?i)Online.*') scrapedtitle = scrapedtitle.replace(st, "").strip() st = scrapertools.find_single_match(scrapedtitle, '\(.*?\)') scrapedtitle = scrapedtitle.replace(st, "") From 382d07c15630b17d6271f715a6a7b44f8434935b Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Mon, 16 Oct 2017 12:00:22 -0500 Subject: [PATCH 06/10] Update gvideo.json --- plugin.video.alfa/servers/gvideo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/servers/gvideo.json b/plugin.video.alfa/servers/gvideo.json index c4f0afb9..24bf7661 100644 --- a/plugin.video.alfa/servers/gvideo.json +++ b/plugin.video.alfa/servers/gvideo.json @@ -10,7 +10,7 @@ "ignore_urls": [], "patterns": [ { - "pattern": "(?s)https://youtube.googleapis.com.*?docid=([^(?:&|\")]+)", + "pattern": "(?s)https://youtube.googleapis.com.*?docid=([0-9a-zA-Z-_]+)", "url": "http://docs.google.com/get_video_info?docid=\\1" }, { From 23c16774f1c97ad2fd67cf0978b5f84623493b33 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Mon, 16 Oct 2017 12:08:37 -0500 Subject: [PATCH 07/10] Update peliscity.py --- plugin.video.alfa/channels/peliscity.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugin.video.alfa/channels/peliscity.py b/plugin.video.alfa/channels/peliscity.py index f26ecb38..d871a39a 100755 --- a/plugin.video.alfa/channels/peliscity.py +++ b/plugin.video.alfa/channels/peliscity.py @@ -140,11 +140,8 @@ def findvideos(item): data = httptools.downloadpage(item.url).data patron = 'cursor: hand" rel="(.*?)".*?class="optxt">(.*?)<.*?width.*?class="q">(.*?) Date: Mon, 16 Oct 2017 14:45:43 -0500 Subject: [PATCH 08/10] fix by robalo --- plugin.video.alfa/servers/powvideo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/servers/powvideo.py b/plugin.video.alfa/servers/powvideo.py index 9f75449d..f21cdacf 100755 --- a/plugin.video.alfa/servers/powvideo.py +++ b/plugin.video.alfa/servers/powvideo.py @@ -58,7 +58,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= matches = scrapertools.find_multiple_matches(data, "[src|file]:'([^']+)'") video_urls = [] for video_url in matches: - _hash = scrapertools.find_single_match(video_url, '[A-z0-9\_\-]{40,}') + _hash = scrapertools.find_single_match(video_url, '[A-z0-9\_\-]{78,}') hash = decrypt(_hash, key) video_url = video_url.replace(_hash, hash) From 7c8f5d95d588e6d855dfa8ea431877885e7707a2 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Mon, 16 Oct 2017 14:51:50 -0500 Subject: [PATCH 09/10] fix newpct1 --- plugin.video.alfa/channels/newpct1.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/plugin.video.alfa/channels/newpct1.py b/plugin.video.alfa/channels/newpct1.py index d64b241b..ae393d51 100644 --- a/plugin.video.alfa/channels/newpct1.py +++ b/plugin.video.alfa/channels/newpct1.py @@ -98,10 +98,10 @@ def listado(item): fichas = data page_extra = item.extra - patron = '
  • Date: Mon, 16 Oct 2017 15:56:51 -0500 Subject: [PATCH 10/10] wopelis fix enlaces --- plugin.video.alfa/channels/wopelis.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/wopelis.py b/plugin.video.alfa/channels/wopelis.py index 3f3f8785..99fd1111 100755 --- a/plugin.video.alfa/channels/wopelis.py +++ b/plugin.video.alfa/channels/wopelis.py @@ -255,10 +255,10 @@ def findvideos(item): dic_servers = {'ntfof': 'Servidor Desconocido', 'stramango': 'streamango', 'flasht': 'flashx'} data1 = downloadpage(item.url) - patron = 'onclick="redir\(([^\)]+).*?' + patron = '(?s)onclick="redir\(([^\)]+).*?' patron += '" in data1: list_showlinks = [('Online:', 'Online:(.*?)Descarga:'),