From e4fc87d17ebf59bf0e097ab6de8b7cf129ed55ff Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Sun, 24 Sep 2017 09:18:12 -0500 Subject: [PATCH 1/3] Update cloudy.json --- plugin.video.alfa/servers/cloudy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/servers/cloudy.json b/plugin.video.alfa/servers/cloudy.json index e6ad3b7a..a0d0f523 100755 --- a/plugin.video.alfa/servers/cloudy.json +++ b/plugin.video.alfa/servers/cloudy.json @@ -15,7 +15,7 @@ "patterns": [ { "pattern": "cloudy.ec/(?:embed.php\\?id=|v/)([A-z0-9]+)", - "url": "https://www.cloudy.ec/embed.php?id=\\1" + "url": "https://www.cloudy.ec/embed.php?id=\\1&playerPage=1" } ] }, @@ -49,4 +49,4 @@ } ], "version": 1 -} \ No newline at end of file +} From 98b355b6f0a6282877054fefc64efe648f9041cf Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Sun, 24 Sep 2017 09:27:34 -0500 Subject: [PATCH 2/3] Update uptobox.py --- plugin.video.alfa/servers/uptobox.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/plugin.video.alfa/servers/uptobox.py b/plugin.video.alfa/servers/uptobox.py index afcb5559..d563ca52 100755 --- a/plugin.video.alfa/servers/uptobox.py +++ b/plugin.video.alfa/servers/uptobox.py @@ -2,6 +2,7 @@ import urllib +from core import httptools from core import scrapertools from platformcode import logger @@ -9,11 +10,11 @@ from platformcode import logger def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) - data = scrapertools.cache_page(page_url) + data = httptools.downloadpage(page_url).data if "Streaming link:" in data: return True, "" - elif "Unfortunately, the file you want is not available." in data: + elif "Unfortunately, the file you want is not available." in data or "Unfortunately, the video you want to see is not available" in data: return False, "[Uptobox] El archivo no existe o ha sido borrado" wait = scrapertools.find_single_match(data, "You have to wait ([0-9]+) (minute|second)") if len(wait) > 0: @@ -27,20 +28,20 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= logger.info("(page_url='%s')" % page_url) # Si el enlace es directo de upstream if "uptobox" not in page_url: - data = scrapertools.cache_page(page_url) + data = httptools.downloadpage(page_url).data if "Video not found" in data: page_url = page_url.replace("uptostream.com/iframe/", "uptobox.com/") - data = scrapertools.cache_page(page_url) + data = httptools.downloadpage(page_url).data video_urls = uptobox(page_url, data) else: video_urls = uptostream(data) else: - data = scrapertools.cache_page(page_url) + data = httptools.downloadpage(page_url).data # Si el archivo tiene enlace de streaming se redirige a upstream if "Streaming link:" in data: page_url = "http://uptostream.com/iframe/" + scrapertools.find_single_match(page_url, 'uptobox.com/([a-z0-9]+)') - data = scrapertools.cache_page(page_url) + data = httptools.downloadpage(page_url).data video_urls = uptostream(data) else: # Si no lo tiene se utiliza la descarga normal @@ -76,7 +77,7 @@ def uptobox(url, data): for inputname, inputvalue in matches: post += inputname + "=" + inputvalue + "&" - data = scrapertools.cache_page(url, post=post[:-1]) + data = httptools.downloadpage(url, post=post[:-1]).data media = scrapertools.find_single_match(data, '\s*') # Solo es necesario codificar la ultima parte de la url url_strip = urllib.quote(media.rsplit('/', 1)[1]) From 1637afcebc0d1c63a58c706d2c5d4e33f72c6c07 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Sun, 24 Sep 2017 09:35:36 -0500 Subject: [PATCH 3/3] Update openload.py --- plugin.video.alfa/servers/openload.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/plugin.video.alfa/servers/openload.py b/plugin.video.alfa/servers/openload.py index e667b72f..692f57c3 100644 --- a/plugin.video.alfa/servers/openload.py +++ b/plugin.video.alfa/servers/openload.py @@ -52,7 +52,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= numeros = scrapertools.find_single_match(data, '_[A-f0-9]+x[A-f0-9]+\s*(?:=|\^)\s*([0-9]{4,}|0x[A-f0-9]{4,})') op1, op2 = scrapertools.find_single_match(data, '\(0x(\d),0x(\d)\);') idparse, hexparse = scrapertools.find_multiple_matches(data, "parseInt\('([0-9]+)'") - numeros = [numeros, str(int(hexparse, 8))] + # numeros = [numeros, str(int(hexparse, 8))] + rangos, rangos2 = scrapertools.find_single_match(data, "\)-([0-9]+).0x4\)/\(([0-9]+)") videourl = "" for encode in var_encodes: text_decode = "" @@ -81,11 +82,12 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= if value3 < index1: break - value4 = value2 ^ decode1[j % (mult / 8)] ^ int(idparse,8) - for n in numeros: - if not n.isdigit(): - n = int(n, 16) - value4 ^= int(n) + # value4 = value2 ^ decode1[j % (mult / 8)] ^ int(idparse,8) + # for n in numeros: + # if not n.isdigit(): + # n = int(n, 16) + # value4 ^= int(n) + value4 = value2 ^ decode1[(j % 9)] ^ (int(idparse, 8) - int(rangos) + 4) / (int(rangos2) - 8) ^ int(hexparse, 8) value5 = index1 * 2 + 127 for h in range(4): valorfinal = (value4 >> 8 * h) & (value5)