Merge pull request #360 from pipcat/master

Correcciones powvideo y mega

plugin.video.alfa/lib/megaserver/client.py

@@ -4,6 +4,7 @@ import random
 import struct
 import time
 import urllib
+from core import httptools
 from threading import Thread
 
 from file import File
@@ -132,9 +133,9 @@ class Client(object):
             raise Exception("Enlace no valido")
 
     def api_req(self, req, get=""):
-          seqno = random.randint(0, 0xFFFFFFFF)
-          url = 'https://g.api.mega.co.nz/cs?id=%d%s' % (seqno, get)
-          return json.loads(self.post(url, json.dumps([req])))[0]
+        seqno = random.randint(0, 0xFFFFFFFF)
+        url = 'https://g.api.mega.co.nz/cs?id=%d%s' % (seqno, get)
+        return json.loads(self.post(url, json.dumps([req])))[0]
 
     def base64urldecode(self,data):
       data += '=='[(2 - len(data) * 3) % 4:]
@@ -179,6 +180,7 @@ class Client(object):
       return sum((self.aes_cbc_decrypt_a32(a[i:i+4], key) for i in xrange(0, len(a), 4)), ())
 
     def post(self, url, data):
+      return httptools.downloadpage(url, data).data
       import ssl
       from functools import wraps
       def sslwrap(func):

plugin.video.alfa/servers/powvideo.py

@@ -27,11 +27,6 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     referer = page_url.replace('iframe', 'preview')
 
     data = httptools.downloadpage(page_url, headers={'referer': referer}).data
-    if data == "File was deleted":
-        return "El archivo no existe o ha sido borrado"
-
-    if 'Video is processing now' in data:
-        return "El vídeo está siendo procesado, intentalo de nuevo mas tarde"
 
     packed = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
     unpacked = jsunpack.unpack(packed)