Merge c375c01a29 into 929576bb9e

youtube_dlc/extractor/doodstream.py

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 import string
 import random
 import time
+import re
 
 from .common import InfoExtractor
 
@@ -32,6 +33,12 @@ class DoodStreamIE(InfoExtractor):
         }
     }]
 
+    @staticmethod
+    def _extract_urls(webpage):
+        return re.findall(
+            r'<iframe[^>]+?src=["\'](?P<url>(?:https?://)?dood\.(?:watch|to)/e/.+?)["\']',
+            webpage)
+
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)

youtube_dlc/extractor/generic.py

@@ -120,6 +120,7 @@ from .expressen import ExpressenIE
 from .zype import ZypeIE
 from .odnoklassniki import OdnoklassnikiIE
 from .kinja import KinjaEmbedIE
+from .doodstream import DoodStreamIE
 from .rcs import RCSEmbedsIE
 from .bitchute import BitChuteIE
 
@@ -3192,6 +3193,11 @@ 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)]