From 1b0f91d4f2c3429cf3e0fc1bf5a6a61721ac93b4 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Tue, 21 Nov 2017 14:59:49 -0500 Subject: [PATCH 01/13] powvideo: fix --- plugin.video.alfa/servers/powvideo.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugin.video.alfa/servers/powvideo.py b/plugin.video.alfa/servers/powvideo.py index b18431a4..dc78800e 100755 --- a/plugin.video.alfa/servers/powvideo.py +++ b/plugin.video.alfa/servers/powvideo.py @@ -16,9 +16,6 @@ def test_video_exists(page_url): referer = page_url.replace('iframe', 'preview') data = httptools.downloadpage(page_url, headers={'referer': referer}).data - - if "watch " in data.lower(): - return False, "[powvideo] El archivo no existe o ha sido borrado" if "el archivo ha sido borrado por no respetar" in data.lower(): return False, "[powvideo] El archivo no existe o ha sido borrado por no respetar los Terminos de uso" From 411b3ce23d38b62a1f7642b89d59973d9e0c6dfb Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Tue, 21 Nov 2017 16:00:41 -0500 Subject: [PATCH 02/13] pelisplus: actualizado --- plugin.video.alfa/channels/pelisplus.py | 36 +++++++++---------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/plugin.video.alfa/channels/pelisplus.py b/plugin.video.alfa/channels/pelisplus.py index 3e06e516..93dd1fa9 100644 --- a/plugin.video.alfa/channels/pelisplus.py +++ b/plugin.video.alfa/channels/pelisplus.py @@ -238,23 +238,12 @@ def lista(item): itemlist.append(new_item) tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) - - #Encuentra los elementos que no tienen plot y carga las paginas correspondientes para obtenerlo# - for item in itemlist: - if item.infoLabels['plot'] == '': - data = httptools.downloadpage(item.url).data - item.fanart = scrapertools.find_single_match(data, 'meta property="og:image" content="([^"]+)" \/>') - item.plot = scrapertools.find_single_match(data, - 'Sinopsis:<\/span>.([^<]+)<\/span>.<\/p>') - - # Paginacion if item.title != 'Buscar' and actual != '': if itemlist != []: next_page = str(int(actual) + 1) next_page_url = item.extra + 'pag-' + next_page if not next_page_url.startswith("http"): - next_page_url = host + next_page_url + next_page_url = host + next_page_url itemlist.append( Item(channel=item.channel, action="lista", @@ -441,9 +430,8 @@ def get_vip(url): else: id = scrapertools.find_single_match(item,'episodes\/(\d+)') new_url = 'https://www.elreyxhd.com/samir.php?id=%s&tipo=capitulo&idioma=latino&x=&sv=' % id - data=httptools.downloadpage(new_url, follow_redirects=False).headers - itemlist.extend(servertools.find_video_items(data=str(data))) - + data=httptools.downloadpage(new_url, follow_redirects=False).headers.get("location", "") + itemlist.append(Item(url=data)) return itemlist @@ -463,22 +451,17 @@ def findvideos(item): itemlist.extend(servertools.find_video_items(data=data)) for videoitem in itemlist: - # videoitem.infoLabels = item.infoLabels videoitem.channel = item.channel + videoitem.infoLabels = item.infoLabels if videoitem.quality == '' or videoitem.language == '': videoitem.quality = 'default' videoitem.language = 'Latino' - if videoitem.server != '': - videoitem.thumbnail = item.thumbnail - else: - videoitem.thumbnail = item.thumbnail - videoitem.server = 'directo' videoitem.action = 'play' videoitem.fulltitle = item.title - if videoitem.extra != 'directo' and 'youtube' not in videoitem.url: - videoitem.title = item.contentTitle + ' (' + videoitem.server + ')' + videoitem.title = item.contentTitle + ' (%s)' + itemlist=servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) n = 0 for videoitem in itemlist: if 'youtube' in videoitem.url: @@ -490,7 +473,7 @@ def findvideos(item): itemlist.pop(1) # Requerido para FilterTools - + tmdb.set_infoLabels_itemlist(itemlist, True) itemlist = filtertools.get_links(itemlist, item, list_language) # Requerido para AutoPlay @@ -511,6 +494,11 @@ def findvideos(item): return itemlist +def play(item): + item.thumbnail = item.contentThumbnail + return [item] + + def newest(categoria): logger.info() itemlist = [] From 4cb704a6c329f0842c32d85c65e199984222ecfc Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Tue, 21 Nov 2017 16:02:58 -0500 Subject: [PATCH 03/13] Delete kingvid.json --- plugin.video.alfa/servers/kingvid.json | 42 -------------------------- 1 file changed, 42 deletions(-) delete mode 100755 plugin.video.alfa/servers/kingvid.json diff --git a/plugin.video.alfa/servers/kingvid.json b/plugin.video.alfa/servers/kingvid.json deleted file mode 100755 index 22057bd2..00000000 --- a/plugin.video.alfa/servers/kingvid.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "active": true, - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "kingvid.tv/(?:embed-|)([A-z0-9]+)", - "url": "http://kingvid.tv/embed-\\1.html" - } - ] - }, - "free": true, - "id": "kingvid", - "name": "kingvid", - "settings": [ - { - "default": false, - "enabled": true, - "id": "black_list", - "label": "Incluir en lista negra", - "type": "bool", - "visible": true - }, - { - "default": 0, - "enabled": true, - "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", - "lvalues": [ - "No", - "1", - "2", - "3", - "4", - "5" - ], - "type": "list", - "visible": false - } - ], - "thumbnail": "http://i.imgur.com/oq0tPhY.png?1" -} \ No newline at end of file From aaa0149bc8a84d276bb3f90331d78eda51d5ea7d Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Tue, 21 Nov 2017 16:03:09 -0500 Subject: [PATCH 04/13] Delete kingvid.py --- plugin.video.alfa/servers/kingvid.py | 46 ---------------------------- 1 file changed, 46 deletions(-) delete mode 100755 plugin.video.alfa/servers/kingvid.py diff --git a/plugin.video.alfa/servers/kingvid.py b/plugin.video.alfa/servers/kingvid.py deleted file mode 100755 index b669ccca..00000000 --- a/plugin.video.alfa/servers/kingvid.py +++ /dev/null @@ -1,46 +0,0 @@ -# -*- coding: utf-8 -*- - -from core import httptools -from core import scrapertools -from lib import jsunpack -from platformcode import logger - - -def test_video_exists(page_url): - logger.info("(page_url='%s')" % page_url) - - data = httptools.downloadpage(page_url).data - if "watch " in data.lower() or "File was deleted" in data: - return False, "[kingvid] El archivo no existe o ha sido borrado" - - return True, "" - - -def get_video_url(page_url, premium=False, user="", password="", video_password=""): - logger.info("(page_url='%s')" % page_url) - - data = httptools.downloadpage(page_url, add_referer = True).data - match = scrapertools.find_single_match(data, "") - data = jsunpack.unpack(match) - - matches = scrapertools.find_multiple_matches(data, 'file\s*:\s*"([^"]+)"\}') - video_urls = [] - for video_url in matches: - filename = scrapertools.get_filename_from_url(video_url)[-4:] - if video_url.endswith("smil"): - playpath = video_url.rsplit("/", 1)[1].replace(".smil", "") - rtmp = scrapertools.find_single_match(data, 'image\s*:\s*"([^"]+)"') - rtmp = scrapertools.find_single_match(rtmp, 'i/(.*?)_') - video_url = "rtmp://kingvid.tv:1935/vod/ playpath=mp4:%s_n?h=%s " \ - "swfUrl=http://kingvid.tv/player7/jwplayer.flash.swf pageUrl=%s" % \ - (rtmp, playpath, page_url) - filename = "RTMP" - video_urls.append([filename + " [kingvid]", video_url]) - elif video_url[-4:] in ['.mp4', 'm3u8']: - video_urls.append([filename + " [kingvid]", video_url]) - - video_urls.sort(key=lambda x: x[0], reverse=True) - for video_url in video_urls: - logger.info("%s - %s" % (video_url[0], video_url[1])) - - return video_urls From 1ebe99ede17d1f743f96e770288ea88248865de8 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Tue, 21 Nov 2017 17:06:00 -0500 Subject: [PATCH 05/13] mejortorrent: dominio cambiado --- plugin.video.alfa/channels/mejortorrent.py | 107 +++------------------ 1 file changed, 15 insertions(+), 92 deletions(-) diff --git a/plugin.video.alfa/channels/mejortorrent.py b/plugin.video.alfa/channels/mejortorrent.py index 014562fd..63eced5a 100755 --- a/plugin.video.alfa/channels/mejortorrent.py +++ b/plugin.video.alfa/channels/mejortorrent.py @@ -12,7 +12,7 @@ from core.item import Item from core.tmdb import Tmdb from platformcode import logger -host = "http://www.mejortorrent.com" +host = "https://mejortorrent.website" def mainlist(item): @@ -29,19 +29,19 @@ def mainlist(item): thumb_buscar = get_thumb("search.png") itemlist.append(Item(channel=item.channel, title="Peliculas", action="getlist", - url="http://www.mejortorrent.com/torrents-de-peliculas.html", thumbnail=thumb_pelis)) + url= host + "/torrents-de-peliculas.html", thumbnail=thumb_pelis)) itemlist.append(Item(channel=item.channel, title="Peliculas HD", action="getlist", - url="http://www.mejortorrent.com/torrents-de-peliculas-hd-alta-definicion.html", + url= host + "/torrents-de-peliculas-hd-alta-definicion.html", thumbnail=thumb_pelis_hd)) itemlist.append(Item(channel=item.channel, title="Series", action="getlist", - url="http://www.mejortorrent.com/torrents-de-series.html", thumbnail=thumb_series)) + url= host + "/torrents-de-series.html", thumbnail=thumb_series)) itemlist.append(Item(channel=item.channel, title="Series HD", action="getlist", - url="http://www.mejortorrent.com/torrents-de-series-hd-alta-definicion.html", + url= host + "/torrents-de-series-hd-alta-definicion.html", thumbnail=thumb_series_hd)) itemlist.append(Item(channel=item.channel, title="Series Listado Alfabetico", action="listalfabetico", - url="http://www.mejortorrent.com/torrents-de-series.html", thumbnail=thumb_series_az)) + url= host + "/torrents-de-series.html", thumbnail=thumb_series_az)) itemlist.append(Item(channel=item.channel, title="Documentales", action="getlist", - url="http://www.mejortorrent.com/torrents-de-documentales.html", thumbnail=thumb_docus)) + url= host + "/torrents-de-documentales.html", thumbnail=thumb_docus)) itemlist.append(Item(channel=item.channel, title="Buscar...", action="search", thumbnail=thumb_buscar)) return itemlist @@ -55,10 +55,10 @@ def listalfabetico(item): for letra in ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']: itemlist.append(Item(channel=item.channel, action="getlist", title=letra, - url="http://www.mejortorrent.com/series-letra-" + letra.lower() + ".html")) + url= host + "/series-letra-" + letra.lower() + ".html")) itemlist.append(Item(channel=item.channel, action="getlist", title="Todas", - url="http://www.mejortorrent.com/series-letra..html")) + url= host + "/series-letra..html")) return itemlist @@ -67,7 +67,7 @@ def search(item, texto): logger.info() texto = texto.replace(" ", "+") - item.url = "http://www.mejortorrent.com/secciones.php?sec=buscador&valor=%s" % (texto) + item.url = host + "/secciones.php?sec=buscador&valor=%s" % (texto) try: return buscador(item) @@ -81,30 +81,12 @@ def search(item, texto): def buscador(item): logger.info() itemlist = [] - data = httptools.downloadpage(item.url).data - - # pelis - # - # - # - # - # docs - # - # - # - - # busca series patron = "]+>(.*?)" patron += ".*?([^']+)" patron_enlace = "/serie-descargar-torrents-\d+-\d+-(.*?)\.html" matches = scrapertools.find_multiple_matches(data, patron) - scrapertools.printMatches(matches) for scrapedurl, scrapedtitle, scrapedinfo in matches: title = scrapertools.remove_htmltags(scrapedtitle).decode('iso-8859-1').encode( @@ -119,10 +101,7 @@ def buscador(item): # busca pelis patron = "]+>(.*?)" patron_enlace = "/peli-descargar-torrent-\d+(.*?)\.html" - matches = re.compile(patron, re.DOTALL).findall(data) - scrapertools.printMatches(matches) - for scrapedurl, scrapedtitle in matches: title = scrapertools.remove_htmltags(scrapedtitle).decode('iso-8859-1').encode('utf-8') url = urlparse.urljoin(item.url, scrapedurl) @@ -135,10 +114,7 @@ def buscador(item): patron += "(.*?).*?" patron += "(.*?)" patron_enlace = "/doc-descargar-torrent-\d+-\d+-(.*?)\.html" - matches = re.compile(patron, re.DOTALL).findall(data) - scrapertools.printMatches(matches) - for scrapedurl, scrapedtitle, scrapedinfo in matches: title = scrapedtitle.decode('iso-8859-1').encode('utf8') + " " + scrapedinfo.decode('iso-8859-1').encode('utf8') url = urlparse.urljoin(item.url, scrapedurl) @@ -154,23 +130,7 @@ def buscador(item): def getlist(item): logger.info() itemlist = [] - data = httptools.downloadpage(item.url).data - - # pelis - # - # - # - # - # docs - # - # - # - if item.url.find("peliculas") > -1: patron = '[^<]+' patron += '' @@ -202,27 +162,18 @@ def getlist(item): action = "episodios" folder = True extra = "docus" - matches = re.compile(patron, re.DOTALL).findall(data) - scrapertools.printMatches(matches) - for scrapedurl, scrapedthumbnail in matches: title = scrapertools.get_match(scrapedurl, patron_enlace) title = title.replace("-", " ") url = urlparse.urljoin(item.url, scrapedurl) - thumbnail = urlparse.urljoin(item.url, urllib.quote(scrapedthumbnail)) + thumbnail = host + urllib.quote(scrapedthumbnail) plot = "" - logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]") itemlist.append(Item(channel=item.channel, action=action, title=title, url=url, thumbnail=thumbnail, plot=plot, folder=folder, extra=extra)) matches = re.compile(patron_title, re.DOTALL).findall(data) - scrapertools.printMatches(matches) - # Cambia el título sacado de la URL por un título con más información. - # esta implementación asume que va a encontrar las mismas coincidencias - # que en el bucle anterior, lo cual técnicamente es erróneo, pero que - # funciona mientras no cambien el formato de la página cnt = 0 for scrapedtitle, notused, scrapedinfo in matches: title = re.sub('\r\n', '', scrapedtitle).decode('iso-8859-1').encode('utf8').strip() @@ -244,7 +195,6 @@ def getlist(item): # Extrae el paginador patronvideos = " Siguiente >>" matches = re.compile(patronvideos, re.DOTALL).findall(data) - scrapertools.printMatches(matches) if len(matches) > 0: scrapedurl = urlparse.urljoin(item.url, matches[0]) @@ -267,18 +217,11 @@ def episodios(item): item.thumbnail = scrapertools.find_single_match(data, "src='http://www\.mejortorrent\.com(/uploads/imagenes/" + tabla + "/[a-zA-Z0-9_ ]+.jpg)'") - item.thumbnail = 'http://www.mejortorrent.com' + urllib.quote(item.thumbnail) + item.thumbnail = host + + urllib.quote(item.thumbnail) #
data = scrapertools.get_match(data, "(.*?)
") - ''' - 4x01 - Episodio en V.O. Sub Esp. -
Fecha: 2014-04-07
- - - ''' - if item.extra == "series": patron = "]+>]+>([^>]+)[^<]+" else: @@ -289,7 +232,6 @@ def episodios(item): patron += "") link = urlparse.urljoin(url, link) - logger.debug("link=" + link) - itemlist.append(Item(channel=item.channel, action="play", server="torrent", title=item.title, url=link, thumbnail=item.thumbnail, plot=item.plot, fanart=item.fanart, folder=False)) @@ -402,26 +339,12 @@ def play(item): data = httptools.downloadpage(item.url, post=item.extra).data logger.debug("data=" + data) - # series - # - # El sue–o de todos. - params = dict(urlparse.parse_qsl(item.extra)) - patron = '>": itemlist.pop() - item.url = 'http://www.mejortorrent.com/torrents-de-series.html' + item.url = host + "/torrents-de-series.html" itemlist.extend(getlist(item)) if itemlist[-1].title == "Pagina siguiente >>": itemlist.pop() From a6206420b5534b29a3e9f02352249bf0bde69050 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Tue, 21 Nov 2017 17:54:53 -0500 Subject: [PATCH 06/13] Update powvideo.py --- plugin.video.alfa/servers/powvideo.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugin.video.alfa/servers/powvideo.py b/plugin.video.alfa/servers/powvideo.py index dc78800e..a957cc21 100755 --- a/plugin.video.alfa/servers/powvideo.py +++ b/plugin.video.alfa/servers/powvideo.py @@ -16,6 +16,8 @@ def test_video_exists(page_url): referer = page_url.replace('iframe', 'preview') data = httptools.downloadpage(page_url, headers={'referer': referer}).data + if "File was deleted" in data: + return False, "[powvideo] El archivo no existe o ha sido borrado" if "el archivo ha sido borrado por no respetar" in data.lower(): return False, "[powvideo] El archivo no existe o ha sido borrado por no respetar los Terminos de uso" From ca943ab6ef910c96be0a059c921841c3d143f90d Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Wed, 22 Nov 2017 08:39:55 -0500 Subject: [PATCH 07/13] bajui: fix thumbnail --- plugin.video.alfa/channels/bajui.py | 38 ++++++----------------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/plugin.video.alfa/channels/bajui.py b/plugin.video.alfa/channels/bajui.py index 0baf7190..017562e3 100644 --- a/plugin.video.alfa/channels/bajui.py +++ b/plugin.video.alfa/channels/bajui.py @@ -1,8 +1,9 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- import re import urlparse +from core import httptools from core import scrapertools from core import servertools from core.item import Item @@ -33,8 +34,7 @@ def menupeliculas(item): Item(channel=item.channel, title="Películas - A-Z", action="peliculas", url=item.url + "/orden:nombre", fanart=item.fanart, viewmode="movie_with_plot")) - # - data = scrapertools.cache_page(item.url) + data = httptools.downloadpage(item.url).data data = scrapertools.get_match(data, '
    (.*?)
') patron = '([^<]+)' matches = re.compile(patron, re.DOTALL).findall(data) @@ -78,7 +78,6 @@ def menudocumentales(item): return itemlist -# Al llamarse "search" la función, el launcher pide un texto a buscar y lo añade como parámetro def search(item, texto, categoria=""): logger.info(item.url + " search " + texto) itemlist = [] @@ -101,9 +100,7 @@ def search(item, texto, categoria=""): def peliculas(item, paginacion=True): logger.info() url = item.url - - # Descarga la página - data = scrapertools.cache_page(url) + data = httptools.downloadpage(url).data patron = '
  • (.*?)') @@ -201,18 +193,6 @@ def enlaces(item): except: pass - ''' -
    -
  • -
    -
    Enlaces de: - jerobien
    -
    Actualizado: Hace 8 minutos
    -
    Mostrar enlaces
    -
    uploaded.combitshare.comfreakshare.comletitbit.netturbobit.netrapidgator.netclz.to
    -
    - ''' - patron = '
    freakshare.comrapidgator.netturbobit.netmuchshare.netletitbit.netshareflare.netOtros patronservidores = ' Date: Wed, 22 Nov 2017 09:18:05 -0500 Subject: [PATCH 08/13] animemovil: fix buscador --- plugin.video.alfa/channels/animemovil.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin.video.alfa/channels/animemovil.py b/plugin.video.alfa/channels/animemovil.py index fe586fa3..e26f0c97 100644 --- a/plugin.video.alfa/channels/animemovil.py +++ b/plugin.video.alfa/channels/animemovil.py @@ -96,7 +96,6 @@ def recientes(item): action = "peliculas" if not thumb.startswith("http"): thumb = "http:%s" % thumb - action ="findvideos" infoLabels = {'filtro': {"original_language": "ja"}.items()} itemlist.append(item.clone(action=action, title=title, url=url, thumbnail=thumb, text_color=color3, contentTitle=contentTitle, contentSerieName=show, infoLabels=infoLabels, From 0dbf9c544a5da8abd96a73d8298274ae9d06ed91 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Wed, 22 Nov 2017 09:42:26 -0500 Subject: [PATCH 09/13] Update infoplus.py --- plugin.video.alfa/channels/infoplus.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/infoplus.py b/plugin.video.alfa/channels/infoplus.py index fff79d6a..bd20e668 100755 --- a/plugin.video.alfa/channels/infoplus.py +++ b/plugin.video.alfa/channels/infoplus.py @@ -177,7 +177,8 @@ class main(xbmcgui.WindowDialog): self.infoLabels["originaltitle"] = otmdb.result.get("original_title", otmdb.result.get("original_name", "")) self.trailers = otmdb.get_videos() - self.infoLabels["duration"] = int(otmdb.result.get("runtime", 0)) + if otmdb.result.get("runtime", 0): + self.infoLabels["duration"] = int(otmdb.result.get("runtime", 0)) else: self.trailers = [] From d6f73e1f06b8a3a51e70da5f36641c7b782075e2 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Wed, 22 Nov 2017 10:14:29 -0500 Subject: [PATCH 10/13] Update rapidvideo.py --- plugin.video.alfa/servers/rapidvideo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/servers/rapidvideo.py b/plugin.video.alfa/servers/rapidvideo.py index a6584eef..b92df605 100755 --- a/plugin.video.alfa/servers/rapidvideo.py +++ b/plugin.video.alfa/servers/rapidvideo.py @@ -23,7 +23,7 @@ def test_video_exists(page_url): if "Object not found" in response.data: return False, "[Rapidvideo] El archivo no existe o ha sido borrado" - if reponse.code == 500: + if response.code == 500: return False, "[Rapidvideo] Error de servidor, inténtelo más tarde." return True, "" From 2848692d79abe1cff94cef99063afaf73c0363a3 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Wed, 22 Nov 2017 14:25:14 -0500 Subject: [PATCH 11/13] cinefox: fix --- plugin.video.alfa/channels/cinefox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/cinefox.py b/plugin.video.alfa/channels/cinefox.py index 4fd1983b..20949389 100644 --- a/plugin.video.alfa/channels/cinefox.py +++ b/plugin.video.alfa/channels/cinefox.py @@ -512,7 +512,7 @@ def episodios(item): else: action = "menu_info_episode" - seasons = scrapertools.find_multiple_matches(data, ']+>]+>Sinopsis
    ([^<]+)
    ') - item.plot = scrapertoolsV2.decodeHtmlentities(item.plot) - - patron = '(/embed/[^"]+).*?' - patron += 'quality text-overflow ">([^<]+).*?' - patron += 'title="([^"]+)' + patron = '/\?tmdb=[^"]+.*?domain=(?:www\.|)([^\.]+).*?text-overflow.*?href="([^"]+).*?' + patron += '\[([^\]]+)\].*?\[([^\]]+)\]' matches = scrapertools.find_multiple_matches(data, patron) - - for url, calidad, idioma in matches: - if 'embed' in url: - url = "http://widget.olimpo.link" + url - data = httptools.downloadpage(url).data - url = scrapertools.find_single_match(data, 'iframe src="([^"]+)') - sublist.append(item.clone(channel=item.channel, action="play", url=url, folder=False, text_color=color1, quality=calidad.strip(), - language=idioma.strip())) - sublist = servertools.get_servers_itemlist(sublist, lambda i: "Ver en %s %s" % (i.server, i.quality), True) - - # Añadir servidores encontrados, agrupandolos por idioma + for server, url, idioma, calidad in matches: + 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) + )) for k in ["Español", "Latino", "Subtitulado", "Ingles"]: lista_idioma = filter(lambda i: i.language == k, sublist) if lista_idioma: @@ -221,3 +207,12 @@ def findvideos(item): contentTitle=item.contentTitle, extra="library", thumbnail=thumbnail_host)) return itemlist + +def play(item): + logger.info() + itemlist = [] + ddd = httptools.downloadpage(item.url).data + url = "http://olimpo.link" + scrapertools.find_single_match(ddd, '