([^<]+)<\/div[^<]+
([^<]+)'
+ patron += '<\/div[^<]+
([^<]+)<\/div[^<]+
watch " in data.lower():
+ if "watch " in data.lower() or "File was deleted" in data:
return False, "[kingvid] El archivo no existe o ha sido borrado"
return True, ""
diff --git a/plugin.video.alfa/servers/mailru.json b/plugin.video.alfa/servers/mailru.json
index b7d1d70d..e29ef6d4 100755
--- a/plugin.video.alfa/servers/mailru.json
+++ b/plugin.video.alfa/servers/mailru.json
@@ -52,5 +52,6 @@
"visible": false
}
],
+ "thumbnail": "https://s26.postimg.org/6ebn509jd/mailru1.png",
"version": 1
-}
\ No newline at end of file
+}
diff --git a/plugin.video.alfa/servers/pelismundo.json b/plugin.video.alfa/servers/pelismundo.json
new file mode 100644
index 00000000..1d9e3395
--- /dev/null
+++ b/plugin.video.alfa/servers/pelismundo.json
@@ -0,0 +1,49 @@
+{
+ "active": true,
+ "changes": [
+ {
+ "date": "18/09/2017",
+ "description": "Versión inicial"
+ }
+ ],
+ "find_videos": {
+ "ignore_urls": [],
+ "patterns": [
+ {
+ "pattern": "http://www.pelismundo.com/gkvip/vip/playervip3/.*?id=([A-z0-9]+)",
+ "url": "http://www.pelismundo.com/gkvip/vip/playervip3/player.php?id=\\1"
+ }
+ ]
+ },
+ "free": true,
+ "id": "pelismundo",
+ "name": "pelismundo",
+ "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": "https://s26.postimg.org/72c9mr3ux/pelismundo1.png",
+ "version": 1
+}
diff --git a/plugin.video.alfa/servers/pelismundo.py b/plugin.video.alfa/servers/pelismundo.py
new file mode 100644
index 00000000..c86ad7f3
--- /dev/null
+++ b/plugin.video.alfa/servers/pelismundo.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------
+# Alfa addon - KODI Plugin
+# Conector para pelismundo
+# https://github.com/alfa-addon
+# ------------------------------------------------------------
+
+from core import httptools
+from core import scrapertools
+from platformcode import logger
+
+
+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 or "no longer exists" in data or '"sources": [false]' in data:
+ return False, "[pelismundo] El archivo no existe o ha sido borrado"
+
+ return True, ""
+
+
+def get_video_url(page_url, user="", password="", video_password=""):
+ logger.info("(page_url='%s')" % page_url)
+ video_urls = []
+ data = httptools.downloadpage(page_url, add_referer = True).data
+ patron = 'sources.*?}],'
+ bloque = scrapertools.find_single_match(data, patron)
+ patron = 'file.*?"([^"]+)".*?label:"([^"]+)"'
+ match = scrapertools.find_multiple_matches(bloque, patron)
+ for scrapedurl, scrapedquality in match:
+ video_urls.append([scrapedquality + " [pelismundo]", scrapedurl])
+ #video_urls.sort(key=lambda it: int(it[0].split("p ", 1)[0]))
+ return video_urls
diff --git a/plugin.video.alfa/servers/raptu.py b/plugin.video.alfa/servers/raptu.py
deleted file mode 100755
index d833e279..00000000
--- a/plugin.video.alfa/servers/raptu.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from core import httptools
-from core import scrapertools
-from platformcode import logger
-
-
-def test_video_exists(page_url):
- logger.info("(page_url='%s')" % page_url)
- try:
- response = httptools.downloadpage(page_url)
- except:
- pass
-
- if not response.data or "urlopen error [Errno 1]" in str(response.code):
- from platformcode import config
- if config.is_xbmc():
- return False, "[Raptu] Este conector solo funciona a partir de Kodi 17"
- elif config.get_platform() == "plex":
- return False, "[Raptu] Este conector no funciona con tu versión de Plex, intenta actualizarla"
- elif config.get_platform() == "mediaserver":
- return False, "[Raptu] Este conector requiere actualizar python a la versión 2.7.9 o superior"
-
- if "Object not found" in response.data:
- return False, "[Raptu] 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).data
- video_urls = []
- # Detección de subtítulos
- subtitulo = ""
- videos = scrapertools.find_multiple_matches(data, '"file"\s*:\s*"([^"]+)","label"\s*:\s*"([^"]+)"')
- for video_url, calidad in videos:
- video_url = video_url.replace("\\", "")
- extension = scrapertools.get_filename_from_url(video_url)[-4:]
- if ".srt" in extension:
- subtitulo = "https://www.raptu.com" + video_url
- else:
- video_urls.append(["%s %s [raptu]" % (extension, calidad), video_url, 0, subtitulo])
-
- try:
- video_urls.sort(key=lambda it: int(it[0].split("p ", 1)[0].rsplit(" ")[1]))
- except:
- pass
- for video_url in video_urls:
- logger.info(" %s - %s" % (video_url[0], video_url[1]))
-
- return video_urls
diff --git a/plugin.video.alfa/servers/streamcherry.py b/plugin.video.alfa/servers/streamcherry.py
index 61b3c28b..5aa5f7e0 100644
--- a/plugin.video.alfa/servers/streamcherry.py
+++ b/plugin.video.alfa/servers/streamcherry.py
@@ -35,7 +35,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
if not media_url.startswith("http"):
media_url = "http:" + media_url
- video_urls.append([".%s %sp [streamango]" % (ext, quality), media_url])
+ video_urls.append([".%s %sp [streamcherry]" % (ext, quality), media_url])
video_urls.reverse()
for video_url in video_urls:
diff --git a/plugin.video.alfa/servers/thevideome.json b/plugin.video.alfa/servers/thevideome.json
index b5fac37f..b353ed66 100755
--- a/plugin.video.alfa/servers/thevideome.json
+++ b/plugin.video.alfa/servers/thevideome.json
@@ -14,7 +14,7 @@
"ignore_urls": [],
"patterns": [
{
- "pattern": "thevideo.me/(?:embed-|)([A-z0-9]+)",
+ "pattern": "(?:thevideo.me|tvad.me)/(?:embed-|)([A-z0-9]+)",
"url": "http://thevideo.me/embed-\\1.html"
}
]
@@ -48,5 +48,6 @@
"visible": false
}
],
+ "thumbnail": "https://s26.postimg.org/fzmu2c761/thevideo.me1.png",
"version": 1
-}
\ No newline at end of file
+}
diff --git a/plugin.video.alfa/servers/vidlox.py b/plugin.video.alfa/servers/vidlox.py
index 492cd93b..6dfd69f8 100644
--- a/plugin.video.alfa/servers/vidlox.py
+++ b/plugin.video.alfa/servers/vidlox.py
@@ -13,7 +13,7 @@ from platformcode import logger
def test_video_exists(page_url):
logger.info("(page_url='%s')" % page_url)
data = httptools.downloadpage(page_url).data
- if "borrado" in data:
+ if "borrado" in data or "Deleted" in data:
return False, "[vidlox] El fichero ha sido borrado"
return True, ""