diff --git a/plugin.video.alfa/servers/vshare.json b/plugin.video.alfa/servers/vshare.json index 8752af78..94a409eb 100644 --- a/plugin.video.alfa/servers/vshare.json +++ b/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" } ] }, diff --git a/plugin.video.alfa/servers/vshare.py b/plugin.video.alfa/servers/vshare.py index 23a8ddfe..bd3e76e3 100644 --- a/plugin.video.alfa/servers/vshare.py +++ b/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("[^\"']+)[^>]+label=[\"'](?P