From 1ed7dfd34a9238d0c67ebddef488723800def33e Mon Sep 17 00:00:00 2001
From: Alhaziel01 <alhaziel01@gmail.com>
Date: Sat, 23 Nov 2019 15:38:23 +0100
Subject: [PATCH] Altro Fix Wstream

---
 servers/wstream.json | 6 +++++-
 servers/wstream.py   | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/servers/wstream.json b/servers/wstream.json
index c4f2ef0e..9bca3af8 100644
--- a/servers/wstream.json
+++ b/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": []
diff --git a/servers/wstream.py b/servers/wstream.py
index 8fcae4c9..c8910e73 100644
--- a/servers/wstream.py
+++ b/servers/wstream.py
@@ -22,11 +22,11 @@ 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:
-        code = httptools.downloadpage(page_url, headers=headers, follow_redirects=False).headers['location'].split('/')[-1]
+    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].replace('.html','')
         logger.info('WCODE='+code)
         page_url = 'https://wstream.video/video.php?file_code=' + code
-
+    
     code = page_url.split('=')[-1]
     data = httptools.downloadpage(page_url, headers=headers, follow_redirects=False).data
     ID = scrapertools.find_single_match(data, r'''input\D*id=(?:'|")([^'"]+)(?:'|")''')