ennesimo fix wstream per cambio di struttura

servers/wstream.json

@@ -6,10 +6,14 @@
     "thumbnail": "http:\/\/media.tvalacarta.info\/servers\/server_wstream.png",
     "find_videos": {
         "patterns": [
-            {    
+            {
-                "pattern":"wstream.video\/(api\/vcmod\/fastredirect\/streaming.php\\?id=[0-9a-zA-Z]+)",
+                "pattern": "https://wstream.video/stream/switch_embed.php\\?file_code=([a-z0-9A-Z]+)",
                 "url": "https://wstream.video/video.php?file_code=\\1"
             },
+            {    
+                "pattern":"wstream.video\/api\/vcmod\/fastredirect\/streaming.php\\?id=([0-9a-zA-Z]+)",
+                "url": "https://wstream.video/api/vcmod/fastredirect/streaming.php?id=\\1"
+            },
             {
                 "pattern": "wstream\\.video/video\\.php\\?file_code=([a-z0-9A-Z]+)",
                 "url": "https://wstream.video/video.php?file_code=\\1"
@@ -19,7 +23,7 @@
                 "url": "https://wstream.video/video.php?file_code=\\1"
             },
             {
-                "pattern": "wstream\\.video\/(?!api/)([a-z0-9A-Z]+)",
+                "pattern": "wstream\\.video/(?!api/|stream/)([a-z0-9A-Z]+)",
                 "url": "https://wstream.video/video.php?file_code=\\1"
             }
         ],

servers/wstream.py

@@ -22,6 +22,11 @@ def test_video_exists(page_url):
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("[wstream.py] url=" + page_url)
     video_urls = []
+
+    if '/streaming.php' in page_url:
+        code = httptools.downloadpage(page_url, headers=headers, follow_redirects=False).headers['location'].split('/')[-1]
+        page_url = 'https://wstream.video/video.php?file_code=' + code
+
     code = page_url.split('=')[-1]
     post = urllib.urlencode({
         'videox': code