From b50f352f59ecb1de8261a47fac32c03b9bcbd594 Mon Sep 17 00:00:00 2001
From: sxvghd <sxvghd@firemail.cc>
Date: Sun, 16 Aug 2020 15:40:59 +0200
Subject: [PATCH 1/3] [doodstream] new extractor

---
 youtube_dl/extractor/doodstream.py | 68 ++++++++++++++++++++++++++++++
 youtube_dl/extractor/extractors.py |  1 +
 2 files changed, 69 insertions(+)
 create mode 100644 youtube_dl/extractor/doodstream.py

diff --git a/youtube_dl/extractor/doodstream.py b/youtube_dl/extractor/doodstream.py
new file mode 100644
index 000000000..38af8bee5
--- /dev/null
+++ b/youtube_dl/extractor/doodstream.py
@@ -0,0 +1,68 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+import string
+import random
+import time
+
+from .common import InfoExtractor
+
+
+class DoodStreamIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?dood\.(?:to|watch)/[ed]/(?P<id>[a-z0-9]+)'
+    _TESTS = [{
+        'url': 'http://dood.to/e/5s1wmbdacezb',
+        'md5': '4568b83b31e13242b3f1ff96c55f0595',
+        'info_dict': {
+            'id': '5s1wmbdacezb',
+            'ext': 'mp4',
+            'title': 'Kat Wonders - Monthly May 2020',
+            'description': 'Kat Wonders - Monthly May 2020 | DoodStream.com',
+            'thumbnail': 'https://img.doodcdn.com/snaps/flyus84qgl2fsk4g.jpg',
+        }
+    }, {
+        'url': 'https://dood.to/d/jzrxn12t2s7n',
+        'md5': '3207e199426eca7c2aa23c2872e6728a',
+        'info_dict': {
+            'id': 'jzrxn12t2s7n',
+            'ext': 'mp4',
+            'title': 'Stacy Cruz Cute ALLWAYSWELL',
+            'description': 'Stacy Cruz Cute ALLWAYSWELL | DoodStream.com',
+            'thumbnail': 'https://img.doodcdn.com/snaps/8edqd5nppkac3x8u.jpg',
+        }
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        if '/d/' in url:
+            url = "https://dood.to" + self._html_search_regex(
+                r'<iframe src="(/e/[a-z0-9]+)"', webpage, 'embed')
+            video_id = self._match_id(url)
+            webpage = self._download_webpage(url, video_id)
+
+        title = self._og_search_title(webpage) or self._html_search_meta(
+            'twitter:title', webpage, default=None)
+        thumb = self._og_search_thumbnail(webpage) or self._html_search_meta(
+            'twitter:image', webpage, default=None)
+        token = self._html_search_regex(r'[?&]token=([a-z0-9]+)[&\']', webpage, 'token')
+        description = self._og_search_description(webpage) or self._html_search_meta(
+            'description', webpage, default=None) or self._html_search_meta(
+            'twitter:description', webpage, default=None)
+        auth_url = 'https://dood.to' + self._html_search_regex(
+            r'(/pass_md5.*?)\'', webpage, 'pass_md5')
+        headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:53.0) Gecko/20100101 Firefox/66.0', 'referer': url}
+
+        webpage = self._download_webpage(auth_url, video_id, headers=headers)
+        final_url = webpage + ''.join([random.choice(string.ascii_letters + string.digits) for _ in range(10)]) + "?token=" + token + "&expiry=" + str(int(time.time() * 1000))
+
+        return {
+            'id': video_id,
+            'title': title,
+            'url': final_url,
+            'http_headers': headers,
+            'ext': 'mp4',
+            'description': description,
+            'thumbnail': thumb,
+        }
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 4b3092028..b4f7f7281 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -293,6 +293,7 @@ from .discoverynetworks import DiscoveryNetworksDeIE
 from .discoveryvr import DiscoveryVRIE
 from .disney import DisneyIE
 from .dispeak import DigitallySpeakingIE
+from .doodstream import DoodStreamIE
 from .dropbox import DropboxIE
 from .dw import (
     DWIE,

From c00c1575b6a6e85c7d994e13ae6c81315e4913e7 Mon Sep 17 00:00:00 2001
From: sxvghd <sxvghd@firemail.cc>
Date: Mon, 17 Aug 2020 17:07:22 +0200
Subject: [PATCH 2/3] Styling changes

---
 youtube_dl/extractor/doodstream.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/youtube_dl/extractor/doodstream.py b/youtube_dl/extractor/doodstream.py
index 38af8bee5..32719b054 100644
--- a/youtube_dl/extractor/doodstream.py
+++ b/youtube_dl/extractor/doodstream.py
@@ -42,17 +42,20 @@ class DoodStreamIE(InfoExtractor):
             video_id = self._match_id(url)
             webpage = self._download_webpage(url, video_id)
 
-        title = self._og_search_title(webpage) or self._html_search_meta(
-            'twitter:title', webpage, default=None)
-        thumb = self._og_search_thumbnail(webpage) or self._html_search_meta(
-            'twitter:image', webpage, default=None)
+        title = self._html_search_meta(['og:title', 'twitter:title'], 
+             webpage, default=None)
+        thumb = self._html_search_meta(['og:image', 'twitter:image'],
+             webpage, default=None)
         token = self._html_search_regex(r'[?&]token=([a-z0-9]+)[&\']', webpage, 'token')
-        description = self._og_search_description(webpage) or self._html_search_meta(
-            'description', webpage, default=None) or self._html_search_meta(
-            'twitter:description', webpage, default=None)
+        description = self._html_search_meta(
+            ['og:description', 'description', 'twitter:description'], 
+            webpage, default=None)
         auth_url = 'https://dood.to' + self._html_search_regex(
             r'(/pass_md5.*?)\'', webpage, 'pass_md5')
-        headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:53.0) Gecko/20100101 Firefox/66.0', 'referer': url}
+        headers = {
+            'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:53.0) Gecko/20100101 Firefox/66.0', 
+            'referer': url
+        }
 
         webpage = self._download_webpage(auth_url, video_id, headers=headers)
         final_url = webpage + ''.join([random.choice(string.ascii_letters + string.digits) for _ in range(10)]) + "?token=" + token + "&expiry=" + str(int(time.time() * 1000))

From 92d25998f9e13ebcd7b27babaa64c2d90cb8e62e Mon Sep 17 00:00:00 2001
From: sxvghd <sxvghd@firemail.cc>
Date: Tue, 18 Aug 2020 00:12:14 +0200
Subject: [PATCH 3/3] [doodstream] flake8 compliance

---
 youtube_dl/extractor/doodstream.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/youtube_dl/extractor/doodstream.py b/youtube_dl/extractor/doodstream.py
index 32719b054..2c9ea6898 100644
--- a/youtube_dl/extractor/doodstream.py
+++ b/youtube_dl/extractor/doodstream.py
@@ -42,18 +42,18 @@ class DoodStreamIE(InfoExtractor):
             video_id = self._match_id(url)
             webpage = self._download_webpage(url, video_id)
 
-        title = self._html_search_meta(['og:title', 'twitter:title'], 
-             webpage, default=None)
+        title = self._html_search_meta(['og:title', 'twitter:title'],
+                                       webpage, default=None)
         thumb = self._html_search_meta(['og:image', 'twitter:image'],
-             webpage, default=None)
+                                       webpage, default=None)
         token = self._html_search_regex(r'[?&]token=([a-z0-9]+)[&\']', webpage, 'token')
         description = self._html_search_meta(
-            ['og:description', 'description', 'twitter:description'], 
+            ['og:description', 'description', 'twitter:description'],
             webpage, default=None)
         auth_url = 'https://dood.to' + self._html_search_regex(
             r'(/pass_md5.*?)\'', webpage, 'pass_md5')
         headers = {
-            'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:53.0) Gecko/20100101 Firefox/66.0', 
+            'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:53.0) Gecko/20100101 Firefox/66.0',
             'referer': url
         }