From 7496a0401cc1f398bd6d72a566025de178e7871d Mon Sep 17 00:00:00 2001
From: schnusch <schnusch@users.noreply.github.com>
Date: Sat, 24 Apr 2021 21:55:18 +0200
Subject: [PATCH] [doodstream] only fetch embedded page, remove from generic
 extractors

---
 youtube_dl/extractor/doodstream.py | 18 +++++-------------
 youtube_dl/extractor/generic.py    |  6 ------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/youtube_dl/extractor/doodstream.py b/youtube_dl/extractor/doodstream.py
index 2d8fb1476..ddddd717a 100644
--- a/youtube_dl/extractor/doodstream.py
+++ b/youtube_dl/extractor/doodstream.py
@@ -4,9 +4,11 @@ from __future__ import unicode_literals
 import string
 import random
 import time
-import re
 
 from .common import InfoExtractor
+from ..utils import (
+    urljoin,
+)
 
 
 class DoodStreamIE(InfoExtractor):
@@ -22,21 +24,11 @@ class DoodStreamIE(InfoExtractor):
         },
     }]
 
-    @staticmethod
-    def _extract_urls(webpage):
-        return re.findall(
-            r'<iframe[^>]+?src=["\'](?P<url>(?:https?://)?dood\.(?:watch|to|so)/e/.+?)["\']',
-            webpage)
-
     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)
+        url = urljoin(url, '/e/' + video_id)
+        webpage = self._download_webpage(url, video_id)
 
         title = self._html_search_meta(['og:title', 'twitter:title'],
                                        webpage, default=None)
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 296541a8f..09e680c96 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -129,7 +129,6 @@ from .odnoklassniki import OdnoklassnikiIE
 from .kinja import KinjaEmbedIE
 from .arcpublishing import ArcPublishingIE
 from .medialaan import MedialaanIE
-from .doodstream import DoodStreamIE
 
 
 class GenericIE(InfoExtractor):
@@ -3300,11 +3299,6 @@ class GenericIE(InfoExtractor):
             return self.playlist_from_matches(
                 foxnews_urls, video_id, video_title, ie=FoxNewsIE.ie_key())
 
-        doodstream_urls = DoodStreamIE._extract_urls(webpage)
-        if doodstream_urls:
-            return self.playlist_from_matches(
-                doodstream_urls, video_id, video_title, ie=DoodStreamIE.ie_key())
-
         sharevideos_urls = [sharevideos_mobj.group('url') for sharevideos_mobj in re.finditer(
             r'<iframe[^>]+?\bsrc\s*=\s*(["\'])(?P<url>(?:https?:)?//embed\.share-videos\.se/auto/embed/\d+\?.*?\buid=\d+.*?)\1',
             webpage)]