From 935887cce743038db4bfb9ebf613ad5932132392 Mon Sep 17 00:00:00 2001
From: Alhaziel01 <alhaziel01@gmail.com>
Date: Fri, 19 Jun 2020 17:57:57 +0200
Subject: [PATCH] fix dooplay_get_links e Wstream

---
 core/support.py    |  5 +++--
 servers/wstream.py | 13 +++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/core/support.py b/core/support.py
index 61cbd2df..157b689f 100755
--- a/core/support.py
+++ b/core/support.py
@@ -553,12 +553,13 @@ def dooplay_get_links(item, host):
     for type, post, nume, title, server in matches:
         postData = urlencode({
             "action": "doo_player_ajax",
-            "post": post,
+            "post": post, 
             "nume": nume,
             "type": type
         })
         dataAdmin = httptools.downloadpage(host + '/wp-admin/admin-ajax.php', post=postData,headers={'Referer': item.url}).data
-        link = scrapertools.find_single_match(dataAdmin, "<iframe.*src='([^']+)'")
+        link = scrapertools.find_single_match(dataAdmin, r"<iframe.*src='([^']+)'")
+        if not link: link = scrapertools.find_single_match(dataAdmin, r'"embed_url":"([^"]+)"').replace('\\','')
         ret.append({
             'url': link,
             'title': title,
diff --git a/servers/wstream.py b/servers/wstream.py
index 479f5087..ebf28d83 100644
--- a/servers/wstream.py
+++ b/servers/wstream.py
@@ -7,6 +7,7 @@ import re
 
 try:
     import urllib.parse as urllib
+    # unichr = chr
 except ImportError:
     import urllib
 
@@ -32,6 +33,18 @@ def test_video_exists(page_url):
         page_url = 'https://116.202.226.34/video.php?file_code=' + code
         data = httptools.downloadpage(page_url, headers=headers, follow_redirects=True, verify=False).data
 
+    if 'nored.icu' in str(headers):
+        var = scrapertools.find_single_match(data, r'var [a-zA-Z0-9]+ = \[([^\]]+).*?')
+        value = scrapertools.find_single_match(data, r'String\.fromCharCode\(parseInt\(value\) \D (\d+)')
+        if var and value:
+            dec = ''
+            for v in var.split(','):
+                dec += chr(int(v) - int(value))
+            page_url = scrapertools.find_single_match(dec, "src='([^']+)")
+            new_data = httptools.downloadpage(page_url, headers=headers, follow_redirects=True, verify=False).data
+            if new_data:
+                data = new_data
+
     real_url = page_url
     if "Not Found" in data or "File was deleted" in data or 'Video is processing' in data or 'Sorry this video is unavailable' in data:
         return False, config.get_localized_string(70449) % 'Wstream'