Merge pull request #14 from Intel11/patch-1

Actualizado fastplay, vimeo, allcalidad

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
     }
   ]
-}
+}

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
@@ -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",
@@ -139,7 +141,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",

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": [
     {

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, ""
 
 

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]))