From b69812eb5847bd0bf67b26ddce17957a798653ec Mon Sep 17 00:00:00 2001 From: alfa_addon_10 Date: Sun, 10 Sep 2017 02:37:58 +0200 Subject: [PATCH 1/3] revert to fix in xbmc Helix, fix server --- mediaserver/platformcode/config.py | 2 +- .../language/{resource.language.en_gb => English}/strings.po | 0 .../{resource.language.es_ar => Spanish (Argentina)}/strings.po | 0 .../{resource.language.es_es => Spanish (Mexico)}/strings.po | 0 .../language/{resource.language.es_mx => Spanish}/strings.po | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename plugin.video.alfa/resources/language/{resource.language.en_gb => English}/strings.po (100%) rename plugin.video.alfa/resources/language/{resource.language.es_ar => Spanish (Argentina)}/strings.po (100%) rename plugin.video.alfa/resources/language/{resource.language.es_es => Spanish (Mexico)}/strings.po (100%) rename plugin.video.alfa/resources/language/{resource.language.es_mx => Spanish}/strings.po (100%) diff --git a/mediaserver/platformcode/config.py b/mediaserver/platformcode/config.py index 85314380..832bc738 100644 --- a/mediaserver/platformcode/config.py +++ b/mediaserver/platformcode/config.py @@ -369,7 +369,7 @@ configfilepath = os.path.join(get_data_path(), "settings.xml") if not os.path.exists(get_data_path()): os.mkdir(get_data_path()) # Literales -TRANSLATION_FILE_PATH = os.path.join(get_runtime_path(), "resources", "language", "resource.language.es_es", "strings.po") +TRANSLATION_FILE_PATH = os.path.join(get_runtime_path(), "resources", "language", "Spanish", "strings.po") load_settings() # modo adulto: diff --git a/plugin.video.alfa/resources/language/resource.language.en_gb/strings.po b/plugin.video.alfa/resources/language/English/strings.po similarity index 100% rename from plugin.video.alfa/resources/language/resource.language.en_gb/strings.po rename to plugin.video.alfa/resources/language/English/strings.po diff --git a/plugin.video.alfa/resources/language/resource.language.es_ar/strings.po b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po similarity index 100% rename from plugin.video.alfa/resources/language/resource.language.es_ar/strings.po rename to plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po diff --git a/plugin.video.alfa/resources/language/resource.language.es_es/strings.po b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po similarity index 100% rename from plugin.video.alfa/resources/language/resource.language.es_es/strings.po rename to plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po diff --git a/plugin.video.alfa/resources/language/resource.language.es_mx/strings.po b/plugin.video.alfa/resources/language/Spanish/strings.po similarity index 100% rename from plugin.video.alfa/resources/language/resource.language.es_mx/strings.po rename to plugin.video.alfa/resources/language/Spanish/strings.po From 8a154fd939c3a1679d4f773089fafcd1a48176e4 Mon Sep 17 00:00:00 2001 From: alfa_addon_10 Date: Sun, 10 Sep 2017 02:39:17 +0200 Subject: [PATCH 2/3] fix server --- plugin.video.alfa/servers/streamango.py | 46 +++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/plugin.video.alfa/servers/streamango.py b/plugin.video.alfa/servers/streamango.py index 95bfa1cc..fdfac685 100755 --- a/plugin.video.alfa/servers/streamango.py +++ b/plugin.video.alfa/servers/streamango.py @@ -21,14 +21,54 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= data = httptools.downloadpage(page_url).data video_urls = [] - matches = scrapertools.find_multiple_matches(data, 'type:"video/([^"]+)",src:"([^"]+)",height:(\d+)') - for ext, media_url, calidad in matches: + + matches = scrapertools.find_multiple_matches(data, "type:\"video/([^\"]+)\",src:d\('([^']+)',(.*?)\).+?height:(\d+)") + + for ext, encoded, code, quality in matches: + + media_url = decode(encoded, int(code)) + logger.debug("media_url %s" % media_url) if not media_url.startswith("http"): media_url = "http:" + media_url - video_urls.append([".%s %sp [streamango]" % (ext, calidad), media_url]) + video_urls.append([".%s %sp [streamango]" % (ext, quality), media_url]) video_urls.reverse() for video_url in video_urls: logger.info("%s - %s" % (video_url[0], video_url[1])) return video_urls + + +def decode(encoded, code): + logger.info("encoded '%s', code '%s'" % (encoded, code)) + + _0x59b81a = "" + k = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=' + k = k[::-1] + + count = 0 + + for index in range(0, len(encoded) - 1): + while count <= len(encoded) - 1: + _0x4a2f3a = k.index(encoded[count]) + count += 1 + _0x29d5bf = k.index(encoded[count]) + count += 1 + _0x3b6833 = k.index(encoded[count]) + count += 1 + _0x426d70 = k.index(encoded[count]) + count += 1 + + _0x2e4782 = ((_0x4a2f3a << 2) | (_0x29d5bf >> 4)) + _0x2c0540 = (((_0x29d5bf & 15) << 4) | (_0x3b6833 >> 2)) + _0x5a46ef = ((_0x3b6833 & 3) << 6) | _0x426d70 + _0x2e4782 = _0x2e4782 ^ code + + _0x59b81a = str(_0x59b81a) + chr(_0x2e4782) + + if _0x3b6833 != 64: + _0x59b81a = str(_0x59b81a) + chr(_0x2c0540) + if _0x3b6833 != 64: + _0x59b81a = str(_0x59b81a) + chr(_0x5a46ef) + + return _0x59b81a From 9fed8a7659d3d516c1115b9237aecd6733441d59 Mon Sep 17 00:00:00 2001 From: alfa_addon_10 Date: Sun, 10 Sep 2017 02:40:50 +0200 Subject: [PATCH 3/3] remove log --- plugin.video.alfa/servers/streamango.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/servers/streamango.py b/plugin.video.alfa/servers/streamango.py index fdfac685..a08f765c 100755 --- a/plugin.video.alfa/servers/streamango.py +++ b/plugin.video.alfa/servers/streamango.py @@ -27,7 +27,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= for ext, encoded, code, quality in matches: media_url = decode(encoded, int(code)) - logger.debug("media_url %s" % media_url) + if not media_url.startswith("http"): media_url = "http:" + media_url video_urls.append([".%s %sp [streamango]" % (ext, quality), media_url])