From 04001850963a68cbcc7b7ac87db072ba27e72566 Mon Sep 17 00:00:00 2001 From: Intel1 Date: Sat, 5 Aug 2017 08:59:07 -0500 Subject: [PATCH 1/6] Update fastplay.py --- plugin.video.alfa/servers/fastplay.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugin.video.alfa/servers/fastplay.py b/plugin.video.alfa/servers/fastplay.py index 709b9fa6..d01bc6fc 100755 --- a/plugin.video.alfa/servers/fastplay.py +++ b/plugin.video.alfa/servers/fastplay.py @@ -12,9 +12,8 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url).data - if "Object not found" in data: + if "Object not found" in data or "longer exists on our servers" in data: return False, "[Fastplay] El archivo no existe o ha sido borrado" - return True, "" From 34c35d4472a5c6935e3fa4f9b3bad23ab6045f07 Mon Sep 17 00:00:00 2001 From: Intel1 Date: Sat, 5 Aug 2017 09:59:11 -0500 Subject: [PATCH 2/6] allcalidad: actualizado actualizado --- plugin.video.alfa/channels/allcalidad.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/allcalidad.py b/plugin.video.alfa/channels/allcalidad.py index fa8ca804..8875adbb 100755 --- a/plugin.video.alfa/channels/allcalidad.py +++ b/plugin.video.alfa/channels/allcalidad.py @@ -116,7 +116,7 @@ def findvideos(item): data = httptools.downloadpage(item.url).data patron = '(?s)fmi(.*?)thead' bloque = scrapertools.find_single_match(data, patron) - match = scrapertools.find_multiple_matches(bloque, '(?is)iframe .*?src="([^"]+)') + match = scrapertools.find_multiple_matches(bloque, '(?is)(?:iframe|script) .*?src="([^"]+)') for url in match: server = servertools.get_server_from_url(url) titulo = "Ver en: " + server @@ -139,7 +139,7 @@ def findvideos(item): 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 XBMC" + # 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", From caab79bb554da524a0c3841ff692d1ff668fdb20 Mon Sep 17 00:00:00 2001 From: Intel1 Date: Sat, 5 Aug 2017 12:52:51 -0500 Subject: [PATCH 3/6] Update allcalidad.json --- plugin.video.alfa/channels/allcalidad.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/allcalidad.json b/plugin.video.alfa/channels/allcalidad.json index 0804f221..30a42828 100755 --- a/plugin.video.alfa/channels/allcalidad.json +++ b/plugin.video.alfa/channels/allcalidad.json @@ -5,7 +5,7 @@ "adult": false, "language": "es", "thumbnail": "https://s22.postimg.org/irnlwuizh/allcalidad1.png", - "bannermenu": "https://s22.postimg.org/9y1athlep/allcalidad2.png", + "banner": "https://s22.postimg.org/9y1athlep/allcalidad2.png", "version": 1, "changes": [ { @@ -43,4 +43,4 @@ "visible": true } ] -} \ No newline at end of file +} From 01debb3c5c2f65409a34f9f8e759a257358328a4 Mon Sep 17 00:00:00 2001 From: Intel1 Date: Sat, 5 Aug 2017 12:53:29 -0500 Subject: [PATCH 4/6] Update vernovelasonline.json --- plugin.video.alfa/channels/vernovelasonline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/vernovelasonline.json b/plugin.video.alfa/channels/vernovelasonline.json index 72c26165..617a9a61 100644 --- a/plugin.video.alfa/channels/vernovelasonline.json +++ b/plugin.video.alfa/channels/vernovelasonline.json @@ -5,7 +5,7 @@ "adult": false, "language": "es", "thumbnail": "https://s16.postimg.org/g4lzydrmd/vernovelasonline1.png", - "bannermenu": "https://s16.postimg.org/w44nhxno5/vernovelasonline2.png", + "banner": "https://s16.postimg.org/w44nhxno5/vernovelasonline2.png", "version": 1, "changes": [ { From 653313f7acc6c5b65ac066456675b622bba37706 Mon Sep 17 00:00:00 2001 From: Intel1 Date: Sun, 6 Aug 2017 09:57:38 -0500 Subject: [PATCH 5/6] vimeo: Cambio de estructura Cambio de estructura --- plugin.video.alfa/servers/vimeo.py | 32 +++++++++++------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/plugin.video.alfa/servers/vimeo.py b/plugin.video.alfa/servers/vimeo.py index 857f18ac..ead9058f 100755 --- a/plugin.video.alfa/servers/vimeo.py +++ b/plugin.video.alfa/servers/vimeo.py @@ -2,39 +2,31 @@ import re -from core import jsontools from core import logger from core import scrapertools +from core import httptools - -# Returns an array of possible video url's from the page_url def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("(page_url='%s')" % page_url) - + video_urls = [] headers = [['User-Agent', 'Mozilla/5.0']] if "|" in page_url: page_url, referer = page_url.split("|", 1) headers.append(['Referer', referer]) - if not page_url.endswith("/config"): - page_url = find_videos(page_url)[0][1] + page_url = scrapertools.find_single_match(page_url, ".*?video/[0-9]+") - video_urls = [] - data = scrapertools.downloadpage(page_url, headers=headers) - json_object = jsontools.load(data) - - url_data = json_object['request']['files']['progressive'] - for data_media in url_data: - media_url = data_media['url'] - title = "%s (%s) [vimeo]" % (data_media['mime'].replace("video/", "."), data_media['quality']) - video_urls.append([title, media_url, data_media['height']]) + data = httptools.downloadpage(page_url, headers = headers).data + logger.info("Intel11 %s" %data) + patron = 'mime":"([^"]+)"' + patron += '.*?url":"([^"]+)"' + patron += '.*?quality":"([^"]+)"' + match = scrapertools.find_multiple_matches(data, patron) + for mime, media_url, calidad in match: + title = "%s (%s) [vimeo]" % (mime.replace("video/", "."), calidad) + video_urls.append([title, media_url, int(calidad.replace("p",""))]) video_urls.sort(key=lambda x: x[2]) - try: - video_urls.insert(0, [".m3u8 (SD) [vimeo]", json_object['request']['files']['hls']['cdns'] - ["akfire_interconnect"]["url"].replace("master.m3u8", "playlist.m3u8"), 0]) - except: - pass for video_url in video_urls: video_url[2] = 0 logger.info("%s - %s" % (video_url[0], video_url[1])) From eacb391af8a7880c27e86bbf35a0010174913836 Mon Sep 17 00:00:00 2001 From: Intel1 Date: Sun, 6 Aug 2017 09:59:42 -0500 Subject: [PATCH 6/6] allcalidad: Actualizado para vimeo Actualizado para vimeo --- plugin.video.alfa/channels/allcalidad.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugin.video.alfa/channels/allcalidad.py b/plugin.video.alfa/channels/allcalidad.py index 8875adbb..a07ceca6 100755 --- a/plugin.video.alfa/channels/allcalidad.py +++ b/plugin.video.alfa/channels/allcalidad.py @@ -126,6 +126,8 @@ def findvideos(item): titulo = "[COLOR = yellow]Ver trailer: " + server + "[/COLOR]" elif "directo" in server: continue + elif "vimeo" in url: + url += "|" + "http://www.allcalidad.com" itemlist.append( Item(channel = item.channel, action = "play",