From 7ffa90f92b8151237ae3d06feb365c5c01b5653b Mon Sep 17 00:00:00 2001
From: Alhaziel01 <alhaziel01@gmail.com>
Date: Mon, 16 Nov 2020 16:40:51 +0100
Subject: [PATCH] Fix doodstream

---
 servers/doodstream.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/servers/doodstream.py b/servers/doodstream.py
index 84f0c0e7..c8945e57 100644
--- a/servers/doodstream.py
+++ b/servers/doodstream.py
@@ -18,11 +18,12 @@ def test_video_exists(page_url):
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    # from core.support import dbg;dbg()
     global data
     logger.info("URL", page_url)
 
     video_urls = list()
-    host = "https://dood.watch"
+    host = "https://dood.to"
 
     new_url = scrapertools.find_single_match(data, r'<iframe src="([^"]+)"')
     if new_url:
@@ -31,16 +32,17 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
 
     label = scrapertools.find_single_match(data, r'type:\s*"video/([^"]+)"')
 
-    js_code = scrapertools.find_single_match(data, ('(function makePlay.*?;})'))
-    js_code = re.sub(r"\+Date.now\(\)", '', js_code)
-    js = js2py.eval_js(js_code)
-    makeplay = js() + str(int(time.time()*1000))
+    # js_code = scrapertools.find_single_match(data, ('(function makePlay.*?;})'))
+    # js_code = re.sub(r"\+Date.now\(\)", '', js_code)
+    # js = js2py.eval_js(js_code)
+    # makeplay = js() + str(int(time.time()*1000))
 
-    base_url = scrapertools.find_single_match(data, r"\$.get\('([^']+)'")
-    data = httptools.downloadpage("%s%s" % (host, base_url), headers={"referer": page_url}).data
-    data = re.sub(r'\s+', '', data)
-
-    url = data + makeplay + "|Referer=%s" % page_url
+    # base_url = scrapertools.find_single_match(data, r"\$.get\('([^']+)'")
+    # data = httptools.downloadpage("%s%s" % (host, base_url), headers={"referer": page_url}).data
+    # data = re.sub(r'\s+', '', data)
+    base_url, token = scrapertools.find_single_match(data, r'''dsplayer\.hotkeys[^']+'([^']+).+?function\s*makePlay.+?return[^?]+([^"]+)''')
+    url = httptools.downloadpage(host + base_url, headers={"referer": page_url}).data
+    url += token + "|Referer=%s" % page_url
     video_urls.append([ label + ' [DooD Stream]', url])
 
     return video_urls
\ No newline at end of file