Fix DooD Stream

servers/doodstream.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import re,  time
+import re, time
 from lib import js2py
 from core import httptools, scrapertools
 from platformcode import logger, config
@@ -22,27 +22,19 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     global data
     logger.debug("URL", page_url)
 
-    video_urls = list()
-    host = "https://dood.to"
+    video_urls = []
 
     new_url = scrapertools.find_single_match(data, r'<iframe src="([^"]+)"')
     if new_url:
+        host = scrapertools.find_single_match(new_url, r'http[s]?://[^/]+')
         data = httptools.downloadpage(host + new_url).data
-        logger.debug('DATA', data)
+    else:
+        host = scrapertools.find_single_match(page_url, r'http[s]?://[^/]+')
 
     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))
-
-    # 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
+    url = '{}{}{}|Referer={}'.format(httptools.downloadpage(host + base_url, headers={"Referer": page_url}).data, token, str(int(time.time() * 1000)), page_url)
     video_urls.append([ label + ' [DooD Stream]', url])
 
     return video_urls