Fix Wstream (di nuovo..)

servers/wstream.json

@@ -8,11 +8,11 @@
         "patterns": [
             {
                 "pattern": "wstream\\.video/video\\.php\\?file_code=([a-z0-9A-Z]+)",
-                "url": "http:\/\/wstream.video\/videoj\/\\1"
+                "url": "http:\/\/wstream.video\/\\1"
             },
             {
                 "pattern": "wstream\\.video/(?:embed-|videos/|video/|videow/|videoj/)?([a-z0-9A-Z]+)",
-                "url": "http:\/\/wstream.video\/videoj\/\\1"
+                "url": "http:\/\/wstream.video\/\\1"
             }
         ],
         "ignore_urls": [        ]

servers/wstream.py

@@ -33,7 +33,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
         data = jsunpack.unpack(post_data)
     logger.info("[wstream.py] data=" + data)
     block = scrapertools.find_single_match(data, 'sources:\s*\[[^\]]+\]')
-    if block: data = block
+    if block:
+        data = block
 
         media_urls = scrapertools.find_multiple_matches(data, '(http.*?\.mp4)')
         _headers = urllib.urlencode(dict(headers))
@@ -46,7 +47,13 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
         for video_url in video_urls:
             logger.info("[wstream.py] %s - %s" % (video_url[0], video_url[1]))
 
+        logger.info(video_urls)
+
         return video_urls
+    else:
+        page_urls = scrapertools.find_multiple_matches(data, '''<a href=(?:"|')([^"']+)(?:"|')>''')
+        if page_urls: page_url = page_urls[-1]
+        return get_video_url(page_url)
 
 
 def find_videos(data):