piccoli fix

servers/speedvideo.py

@@ -21,7 +21,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
               'NORMAL':2,
               'HD':3}
     data = httptools.downloadpage(page_url).data
-    logger.debug('SPEEDVIDEO DATA '+ data)
+    # logger.debug('SPEEDVIDEO DATA '+ data)
 
     media_urls = scrapertools.find_multiple_matches(data, r"file:[^']'([^']+)',\s*label:[^\"]\"([^\"]+)\"")
     logger.debug("speed video - media urls: %s " % media_urls)

servers/streamz.py

@@ -1,35 +1,29 @@
 # -*- coding: utf-8 -*-
+# --------------------------------------------------------
+# Conector Streamz By Alfa development Group
+# --------------------------------------------------------
+
 import re
 from core import httptools
-from core import scrapertools
 from platformcode import logger, config
-from lib import jsunpack
 
 
 def test_video_exists(page_url):
     global data
-    logger.debug("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
+    logger.info("(page_url='%s')" % page_url)
+    data = httptools.downloadpage(page_url)
 
-    if "<font color=\"red\"><b>File not found, sorry!" in data:
-        return False, config.get_localized_string(70449) % "streamZ"
+    if "<b>File not found, sorry!</b" in data.data:
+        return False, config.get_localized_string(70449) % "streamz"
     return True, ""
 
 
-def get_video_url(page_url, video_password):
-    logger.debug("(page_url='%s')" % page_url)
+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+</script>').matches
-    unpacked = ''
-    for packed in matches:
-        unpacked += jsunpack.unpack(packed) + '\n'
 
-    urls = match(unpacked, patron=r"videojs\d+[^;]+[^']+'[^']+'[^']+'(https://streamz.*?/get.*?.dll)").matches
-
-    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])
+    url = re.sub(r'(\.\w{2,3})/\w', '\\1/getlink-', data.url) + '.dll'
+    url += "|User-Agent=%s" % httptools.get_user_agent()
+    video_urls.append([".mp4 [Streamz]", url])
 
     return video_urls