Altro Fix Wstream

servers/wstream.json

@@ -7,8 +7,12 @@
     "find_videos": {
         "patterns": [
             {
-                "pattern": "wstream\\.video.*?(?<!api)(?:=|/)(?:embed-)?([a-z0-9A-Z]+)(?:[^/_.a-z0-9A-Z]|$|\\.)",
+                "pattern": "wstream\\.video.*?(?<!api)(?:=|/)(?:embed-)?([a-z0-9A-Z]+)(?:[^/_.a-z0-9A-Z]|$)",
                 "url": "https://wstream.video/video.php?file_code=\\1"
+            },
+            {
+                "pattern": "wstream\\.video/([a-zA-Z0-9/]+.html)",
+                "url": "https://wstream.video/\\1"
             }
         ],
         "ignore_urls": []

servers/wstream.py

@@ -22,8 +22,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     logger.info("[Wstream] url=" + page_url)
     video_urls = []
 
-    if '/streaming.php' in page_url:
+    if '/streaming.php' in page_url or 'html' in page_url:
-        code = httptools.downloadpage(page_url, headers=headers, follow_redirects=False).headers['location'].split('/')[-1]
+        code = httptools.downloadpage(page_url, headers=headers, follow_redirects=False).headers['location'].split('/')[-1].replace('.html','')
         logger.info('WCODE='+code)
         page_url = 'https://wstream.video/video.php?file_code=' + code