diff --git a/servers/streamz.py b/servers/streamz.py index 0d6ed8e0..2615a1a0 100644 --- a/servers/streamz.py +++ b/servers/streamz.py @@ -4,9 +4,8 @@ # -------------------------------------------------------- import re -from core import httptools, scrapertools +from core import httptools from platformcode import logger, config -from lib import jsunpack def test_video_exists(page_url): @@ -22,11 +21,14 @@ def test_video_exists(page_url): def get_video_url(page_url, video_password=""): logger.info("(page_url='%s')" % page_url) video_urls = [] - packed_data = scrapertools.find_single_match(data.data, r'(function\(p,a,c,k,e,d\)[^<]+)') - if packed_data: - url = scrapertools.find_single_match(jsunpack.unpack(packed_data), r"src:\\'([^'\\]+)") - else: - url = re.sub(r'(\.\w{2,3})/\w', '\\1/getl1nk-', data.url) + '.dll' + # real_video = scrapertools.find_single_match(data.data, r"var player = [^\(]+\('(video_\d)") + # packed_data = scrapertools.find_single_match(data.data, r'(eval\(function\(p,a,c,k,e,d\).*?{}[^<]+)'.format(real_video)) + # if packed_data: + # url = scrapertools.find_single_match(jsunpack.unpack(packed_data), r"src:\\'([^'\\]+)") + # url += "|User-Agent=%s" % httptools.get_user_agent() + # video_urls.append([".mp4 [streamZ]", url]) + # else: + url = re.sub(r'(\.\w{2,3})/\w', '\\1/getl1nk-', data.url) + '.dll' url += "|User-Agent=%s" % httptools.get_user_agent() video_urls.append([".mp4 [streamZ]", url])