diff --git a/plugin.video.alfa/servers/netutv.py b/plugin.video.alfa/servers/netutv.py index df396157..db65a7ee 100755 --- a/plugin.video.alfa/servers/netutv.py +++ b/plugin.video.alfa/servers/netutv.py @@ -8,45 +8,38 @@ from core import jsontools from core import scrapertools from platformcode import logger + def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) - # http://netu.tv/watch_video.php=XX solo contiene una redireccion, ir directamente a http://hqq.tv/player/embed_player.php?vid=XX page_url = page_url.replace("http://netu.tv/watch_video.php?v=", "http://hqq.tv/player/embed_player.php?vid=") - data = httptools.downloadpage(page_url).data - if "var userid = '';" in data.lower(): return False, "[netutv] El archivo no existe o ha sido borrado" - return True, "" + def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("url=" + page_url) - if "hash=" in page_url: data = urllib.unquote(httptools.downloadpage(page_url).data) - id_video = scrapertools.find_single_match(data, "vid\s*=\s*'([^']+)'") + id_video = scrapertools.find_single_match(data, "vid':'([^']+)'") else: id_video = page_url.rsplit("=", 1)[1] page_url_hqq = "http://hqq.watch/player/embed_player.php?vid=%s&autoplay=no" % id_video data_page_url_hqq = httptools.downloadpage(page_url_hqq, add_referer=True).data - js_wise = scrapertools.find_single_match(data_page_url_hqq, "") data_unwise = jswise(js_wise).replace("\\", "") at = scrapertools.find_single_match(data_unwise, 'var at\s*=\s*"([^"]+)"') http_referer = scrapertools.find_single_match(data_unwise, 'var http_referer\s*=\s*"([^"]+)"') - url = "http://hqq.watch/sec/player/embed_player.php?iss=&vid=%s&at=%s&autoplayed=yes&referer=on" \ "&http_referer=%s&pass=&embed_from=&need_captcha=0&hash_from=" % (id_video, at, http_referer) data_player = httptools.downloadpage(url, add_referer=True).data - data_unescape = scrapertools.find_multiple_matches(data_player, 'document.write\(unescape\("([^"]+)"') data = "" for d in data_unescape: data += urllib.unquote(d) - subtitle = scrapertools.find_single_match(data, 'value="sublangs=Spanish.*?sub=([^&]+)&') if not subtitle: subtitle = scrapertools.find_single_match(data, 'value="sublangs=English.*?sub=([^&]+)&') @@ -55,7 +48,6 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= "") if js_wise: data_unwise_player = jswise(js_wise).replace("\\", "") - vars_data = scrapertools.find_single_match(data, '/player/get_md5.php",\s*\{(.*?)\}') matches = scrapertools.find_multiple_matches(vars_data, '\s*([^:]+):\s*([^,]*)[,"]') params = {} @@ -69,22 +61,17 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= if not value_var and data_unwise_player: value_var = scrapertools.find_single_match(data_unwise_player, 'var\s*%s\s*=\s*"([^"]+)"' % value) params[key] = value_var - params = urllib.urlencode(params) head = {'X-Requested-With': 'XMLHttpRequest', 'Referer': url} data = httptools.downloadpage("http://hqq.watch/player/get_md5.php?" + params, headers=head).data - media_urls = [] url_data = jsontools.load(data) - media_url = tb(url_data["html5_file"].replace("#", "")) - + media_url = "https:" + tb(url_data["obf_link"].replace("#", "")) + ".mp4.m3u8" video_urls = [] media = media_url + "|User-Agent=Mozilla/5.0 (iPhone; CPU iPhone OS 5_0_1 like Mac OS X)" video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " [netu.tv]", media, 0, subtitle]) - for video_url in video_urls: logger.info("%s - %s" % (video_url[0], video_url[1])) - return video_urls @@ -95,7 +82,6 @@ def tb(b_m3u8_2): while j < len(b_m3u8_2): s2 += "\\u0" + b_m3u8_2[j:(j + 3)] j += 3 - return s2.decode('unicode-escape').encode('ASCII', 'ignore') @@ -105,15 +91,12 @@ def tb(b_m3u8_2): def jswise(wise): ## js2python def js_wise(wise): - w, i, s, e = wise - v0 = 0; v1 = 0; v2 = 0 v3 = []; v4 = [] - while True: if v0 < 5: v4.append(w[v0]) @@ -131,12 +114,10 @@ def jswise(wise): v3.append(s[v2]) v2 += 1 if len(w) + len(i) + len(s) + len(e) == len(v3) + len(v4) + len(e): break - v5 = "".join(v3); v6 = "".join(v4) v1 = 0 v7 = [] - for v0 in range(0, len(v3), 2): v8 = -1 if ord(v6[v1]) % 2: v8 = 1 @@ -144,7 +125,6 @@ def jswise(wise): v1 += 1 if v1 >= len(v4): v1 = 0 return "".join(v7) - ## loop2unobfuscated while True: wise = re.search("var\s.+?\('([^']+)','([^']+)','([^']+)','([^']+)'\)", wise, re.DOTALL)