From 5d0331a59a9b25acd7742f200cc6dcd2cde42ba7 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Sat, 7 Nov 2020 18:48:15 +0100 Subject: [PATCH] Fix streamZ --- servers/streamz.json | 2 +- servers/streamz.py | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/servers/streamz.json b/servers/streamz.json index c5249ad9..5c1f3ed5 100644 --- a/servers/streamz.json +++ b/servers/streamz.json @@ -11,7 +11,7 @@ }, "free": true, "id": "streamz", - "name": "streamz", + "name": "streamZ", "settings": [ { "default": false, diff --git a/servers/streamz.py b/servers/streamz.py index fcdc86ec..5540558d 100644 --- a/servers/streamz.py +++ b/servers/streamz.py @@ -12,22 +12,24 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url).data if "File not found, sorry!" in data: - return False, config.get_localized_string(70449) % "Streamz" + return False, config.get_localized_string(70449) % "streamZ" return True, "" def get_video_url(page_url, video_password): logger.info("(page_url='%s')" % page_url) video_urls = [] + from core.support import match + matches = match(data, patron=r'(eval\(function\(p,a,c,k,e,d\).*?)\s+').matches + unpacked = '' + for packed in matches: + unpacked += jsunpack.unpack(packed) + '\n' - packed = scrapertools.find_single_match(data, r'(eval\(function\(p,a,c,k,e,d\).*?)\s+') - unpacked = jsunpack.unpack(packed) + urls = match(unpacked, patron=r"videojs\d+[^;]+[^']+'[^']+'[^']+'(https://streamz.*?/get.*?.dll)").matches - url = scrapertools.find_single_match(unpacked, '(https://streamz.*?/get.*?.dll)') - - url = url.replace("getmp4", "getlink").replace("getIink", "getlink") - - url += "|User-Agent=%s" % httptools.get_user_agent() - video_urls.append(["[streamz]", url]) + for url in urls: + url = url + "|User-Agent=%s" % httptools.get_user_agent() + if not video_urls or url not in video_urls[-1]: + video_urls.append(["[streamZ]", url]) return video_urls \ No newline at end of file