fix streamz e supporto a nuovi url shortener

servers/streamz.json

@@ -4,14 +4,14 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "(https://streamz.cc/[A-z0-9]+)",
+        "pattern": "(https://streamz(?:z|).\\w{2,3}/[A-z0-9]+)",
         "url": "\\1"
       }
     ]
   },
   "free": true,
   "id": "streamz",
-  "name": "streamZ",
+  "name": "streamz",
   "settings": [
     {
       "default": false,
@@ -38,4 +38,4 @@
       "visible": false
     }
   ]
-}
+}

servers/streamz.py

@@ -1,19 +1,33 @@
 # -*- coding: utf-8 -*-
+import re
 from core import httptools
 from core import scrapertools
+from platformcode import logger, config
 from lib import jsunpack
-from platformcode import logger
+
+
+def test_video_exists(page_url):
+    global data
+    logger.info("(page_url='%s')" % page_url)
+    data = httptools.downloadpage(page_url).data
+
+    if "<font color=\"red\"><b>File not found, sorry!" in data:
+        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 = []
-    url = httptools.downloadpage(page_url).url
-    data = httptools.downloadpage(url).data
-    data = scrapertools.find_single_match(data, '<footer id="Footer" class="clearfix">(.*?)</html>')
-    packed = scrapertools.find_single_match(data, r'(eval.*?)</script>')
-    unpacked = jsunpack.unpack(packed)
-    url = scrapertools.find_single_match(unpacked, '(https://streamz.cc/getlink.*?.dll)')
-    video_urls.append(["[streamz]", url])
-    return video_urls
 
+    packed = scrapertools.find_single_match(data, r'(eval\(function\(p,a,c,k,e,d\).*?)\s+</script>')
+    unpacked = jsunpack.unpack(packed)
+
+    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])
+
+    return video_urls