(?:
'
+ patron = '(?s)([^<]+)
|)([^<]+)]*>[^<]*<[^>]+href="\.([^"]+)".*?'
+ patron += 'src-data="([^"]+)".*?'
+ patron += '
Date: Tue, 26 Sep 2017 13:09:32 -0500
Subject: [PATCH 6/8] Update rapidvideo.json
---
plugin.video.alfa/servers/rapidvideo.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugin.video.alfa/servers/rapidvideo.json b/plugin.video.alfa/servers/rapidvideo.json
index 75ec9156..a462660e 100755
--- a/plugin.video.alfa/servers/rapidvideo.json
+++ b/plugin.video.alfa/servers/rapidvideo.json
@@ -18,7 +18,7 @@
"ignore_urls": [],
"patterns": [
{
- "pattern": "rapidvideo.(?:org|com)/(?:\\?v=|e/|embed/)([A-z0-9]+)",
+ "pattern": "rapidvideo.(?:org|com)/(?:\\?v=|e/|embed/|v/)([A-z0-9]+)",
"url": "https://www.rapidvideo.com/e/\\1"
}
]
From 3ac0059ba21b7aa3274f085e243a35f8e669542a Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Tue, 26 Sep 2017 14:26:57 -0500
Subject: [PATCH 7/8] Update flashx.py
---
plugin.video.alfa/servers/flashx.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/plugin.video.alfa/servers/flashx.py b/plugin.video.alfa/servers/flashx.py
index 373a1526..69ad0430 100644
--- a/plugin.video.alfa/servers/flashx.py
+++ b/plugin.video.alfa/servers/flashx.py
@@ -59,11 +59,13 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
data = httptools.downloadpage('https://www.flashx.tv/dl?playnow', post, headers, replace_headers=True).data
# Si salta aviso, se carga la pagina de comprobacion y luego la inicial
+ # LICENSE GPL3, de alfa-addon: https://github.com/alfa-addon/ ES OBLIGATORIO AÑADIR ESTAS LÍNEAS
if "You try to access this video with Kodi" in data:
url_reload = scrapertools.find_single_match(data, 'try to reload the page.*?href="([^"]+)"')
try:
data = httptools.downloadpage(url_reload, cookies=False).data
data = httptools.downloadpage('https://www.flashx.tv/dl?playnow', post, headers, replace_headers=True).data
+ # LICENSE GPL3, de alfa-addon: https://github.com/alfa-addon/ ES OBLIGATORIO AÑADIR ESTAS LÍNEAS
except:
pass
From 085ba6e4187c55dd927ad6ae998a953e9277e3e8 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Tue, 26 Sep 2017 15:40:56 -0500
Subject: [PATCH 8/8] Update gnula.py
---
plugin.video.alfa/channels/gnula.py | 101 ++++++++++++++++------------
1 file changed, 58 insertions(+), 43 deletions(-)
diff --git a/plugin.video.alfa/channels/gnula.py b/plugin.video.alfa/channels/gnula.py
index 0e5d47d1..c9306666 100755
--- a/plugin.video.alfa/channels/gnula.py
+++ b/plugin.video.alfa/channels/gnula.py
@@ -1,24 +1,24 @@
-# -*- 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
from platformcode import logger
+host = "http://gnula.nu/"
def mainlist(item):
logger.info()
itemlist = []
itemlist.append(Item(channel=item.channel, title="Estrenos", action="peliculas",
- url="http://gnula.nu/peliculas-online/lista-de-peliculas-online-parte-1/", viewmode="movie"))
+ url= host +"peliculas-online/lista-de-peliculas-online-parte-1/", viewmode="movie"))
itemlist.append(
- Item(channel=item.channel, title="Generos", action="generos", url="http://gnula.nu/generos/lista-de-generos/"))
+ Item(channel=item.channel, title="Generos", action="generos", url= host + "generos/lista-de-generos/"))
itemlist.append(Item(channel=item.channel, title="Recomendadas", action="peliculas",
- url="http://gnula.nu/peliculas-online/lista-de-peliculas-recomendadas/", viewmode="movie"))
- # itemlist.append( Item(channel=item.channel, title="Portada" , action="portada" , url="http://gnula.nu/"))
+ url= host + "peliculas-online/lista-de-peliculas-recomendadas/", viewmode="movie"))
return itemlist
@@ -26,23 +26,23 @@ def generos(item):
logger.info()
itemlist = []
- data = scrapertools.cache_page(item.url)
-
- # Lista de géneros
+ data = httptools.downloadpage(item.url).data data = scrapertools.find_single_match(data, ']+>Lista de g(.*?)/table')
- # Historia antigua [With This Ring
-
[18/07/15 (VS)(VC)(VL)] [HD-R]—–Comedia, Romántica
- ''' - ''' - The Adventures of Tintin
-
(2011) [10/07/15 (VS)(VC)(VL)] [DVD-R]—–Animación, Infantil, Aventuras
- ''' # Descarga la página - data = scrapertools.cachePage(item.url) - patron = '([^<]+)(.*?)
+ data = httptools.downloadpage(item.url).data data = scrapertools.find_single_match(data, '
-
[18/07/15 (VS)(VC)(VL)] [HD-R]—–Comedia, Romántica- ''' - ''' - The Adventures of Tintin
-
(2011) [10/07/15 (VS)(VC)(VL)] [DVD-R]—–Animación, Infantil, Aventuras- ''' # Descarga la página - data = scrapertools.cachePage(item.url) - patron = '([^<]+)
')
item.plot = scrapertools.htmlclean(item.plot).strip()
item.contentPlot = item.plot
+ 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')
+ cuenta = 0
+ for datos in bloque:
+ cuenta = cuenta + 1
+ patron = '(opción %s.*?)' %cuenta
+ scrapedopcion = scrapertools.find_single_match(data, patron)
+ titulo_opcion = "(" + scrapertools.find_single_match(scrapedopcion, "op.*?, (.*)").upper() + ")"
+ if "TRAILER" in titulo_opcion or titulo_opcion == "()":
+ titulo_opcion = "(" + titulo_opcional + ")"
+ urls = scrapertools.find_multiple_matches(datos, '(?:src|href)="([^"]+)')
+ titulo = "Ver en %s " + titulo_opcion
+ for url in urls:
+ itemlist.append(Item(channel = item.channel,
+ action = "play",
+ contentThumbnail = item.thumbnail,
+ fulltitle = item.contentTitle,
+ title = titulo,
+ url = url
+ ))
+ itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+ return itemlist
- newthumbnail = scrapertools.find_single_match(data,
- '