')
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,
- '

(?:
([^<]+)
|)([^<]+)
'
matches = scrapertools.find_multiple_matches(data, patron)
-
for scrapedurl, scrapedthumbnail, marca, serie, episodio, scrapedtitle in matches:
tipo = "movie"
scrapedurl = host + scrapedurl.rsplit("-dc=")[0]
diff --git a/plugin.video.alfa/servers/flashx.json b/plugin.video.alfa/servers/flashx.json
index af46c3c0..ce0c3633 100644
--- a/plugin.video.alfa/servers/flashx.json
+++ b/plugin.video.alfa/servers/flashx.json
@@ -19,7 +19,7 @@
"patterns": [
{
"pattern": "flashx.(?:tv|pw)/(?:embed.php\\?c=|embed-|playvid-|)([A-z0-9]+)",
- "url": "https://www.flashx.tv/playvid-\\1.html"
+ "url": "https://www.flashx.tv/\\1.html"
}
]
},
diff --git a/plugin.video.alfa/servers/flashx.py b/plugin.video.alfa/servers/flashx.py
index 86fac9d8..69ad0430 100644
--- a/plugin.video.alfa/servers/flashx.py
+++ b/plugin.video.alfa/servers/flashx.py
@@ -27,8 +27,6 @@ def test_video_exists(page_url):
def get_video_url(page_url, premium=False, user="", password="", video_password=""):
logger.info("url=" + page_url)
- page_url = page_url.replace("playvid-", "")
-
headers = {'Host': 'www.flashx.tv',
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.137 Safari/537.36',
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
@@ -60,8 +58,18 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
headers['Content-Type'] = 'application/x-www-form-urlencoded'
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
+
matches = scrapertools.find_multiple_matches(data, "(eval\(function\(p,a,c,k.*?)\s+")
-
video_urls = []
for match in matches:
try:
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"
}
]