Merge pull request #322 from Intel11/master

Actualizados

plugin.video.alfa/servers/rapidvideo.py

@@ -12,6 +12,8 @@ def test_video_exists(page_url):
     except:
         pass
 
+    if response.code == 404:
+        return False, "[Rapidvideo] El archivo no existe ó ha sido borrado"
     if not response.data or "urlopen error [Errno 1]" in str(response.code):
         from platformcode import config
         if config.is_xbmc():

plugin.video.alfa/servers/vshare.json

@@ -5,6 +5,10 @@
       {
         "pattern": "(vshare.io/v/[a-zA-Z0-9/-]+)",
         "url": "http://\\1"
+      },
+      {
+        "pattern": "(vshare.eu/embed-[a-zA-Z0-9/-]+.html)",
+        "url": "http://\\1"
       }
     ]
   },

plugin.video.alfa/servers/vshare.py

@@ -26,22 +26,25 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     if flowplayer:
         return [["FLV", flowplayer.group(1)]]
 
-    jsUnpack = jsunpack.unpack(data)
-    logger.debug(jsUnpack)
-
     video_urls = []
+    try:
+        jsUnpack = jsunpack.unpack(data)
+        logger.debug(jsUnpack)
+        fields = re.search("\[([^\]]+).*?parseInt\(value\)-(\d+)", jsUnpack)
+        if fields:
+            logger.debug("Values: " + fields.group(1))
+            logger.debug("Substract: " + fields.group(2))
+            substract = int(fields.group(2))
 
-    fields = re.search("\[([^\]]+).*?parseInt\(value\)-(\d+)", jsUnpack)
-    if fields:
-        logger.debug("Values: " + fields.group(1))
-        logger.debug("Substract: " + fields.group(2))
-        substract = int(fields.group(2))
+            arrayResult = [chr(int(value) - substract) for value in fields.group(1).split(",")]
+            strResult = "".join(arrayResult)
+            logger.debug(strResult)
+            videoSources = re.findall("<source[\s]+src=[\"'](?P<url>[^\"']+)[^>]+label=[\"'](?P<label>[^\"']+)", strResult)
+            for url, label in videoSources:
+                video_urls.append([label, url])
+            video_urls.sort(key=lambda i: int(i[0].replace("p","")))
+    except:
+        url = scrapertools.find_single_match(data,'<source src="([^"]+)')
+        video_urls.append(["MP4", url])
 
-        arrayResult = [chr(int(value) - substract) for value in fields.group(1).split(",")]
-        strResult = "".join(arrayResult)
-        logger.debug(strResult)
-        videoSources = re.findall("<source[\s]+src=[\"'](?P<url>[^\"']+)[^>]+label=[\"'](?P<label>[^\"']+)", strResult)
-        for url, label in videoSources:
-            video_urls.append([label, url])
-    video_urls.sort(key=lambda i: int(i[0].replace("p","")))
     return video_urls