stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #360 from pipcat/master

Browse Source 
Correcciones powvideo y mega
This commit is contained in:
Alfa
2018-07-18 08:40:52 -05:00
committed by GitHub
parent af28ebb382 64779236dc
commit df534c31b4
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugin.video.alfa/lib/megaserver/client.py
+5 -3
View File
@@ -4,6 +4,7 @@ import random
import struct import struct
import time import time
import urllib import urllib
from core import httptools
from threading import Thread from threading import Thread
from file import File from file import File
@@ -132,9 +133,9 @@ class Client(object):
raise Exception("Enlace no valido") raise Exception("Enlace no valido")
def api_req(self, req, get=""): def api_req(self, req, get=""):
seqno = random.randint(0, 0xFFFFFFFF) seqno = random.randint(0, 0xFFFFFFFF)
url = 'https://g.api.mega.co.nz/cs?id=%d%s' % (seqno, get) url = 'https://g.api.mega.co.nz/cs?id=%d%s' % (seqno, get)
return json.loads(self.post(url, json.dumps([req])))[0] return json.loads(self.post(url, json.dumps([req])))[0]
def base64urldecode(self,data): def base64urldecode(self,data):
data += '=='[(2 - len(data) * 3) % 4:] 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)), ()) 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): def post(self, url, data):
return httptools.downloadpage(url, data).data
import ssl import ssl
from functools import wraps from functools import wraps
def sslwrap(func): def sslwrap(func):
plugin.video.alfa/servers/powvideo.py
-5
View File
@@ -27,11 +27,6 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
referer = page_url.replace('iframe', 'preview') referer = page_url.replace('iframe', 'preview')
data = httptools.downloadpage(page_url, headers={'referer': referer}).data 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>") packed = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
unpacked = jsunpack.unpack(packed) unpacked = jsunpack.unpack(packed)