]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[extractor/generic] Add support for webcaster.pro embeds
authorSergey M․ <dstftw@gmail.com>
Sun, 27 Nov 2016 12:56:32 +0000 (19:56 +0700)
committerSergey M․ <dstftw@gmail.com>
Sun, 27 Nov 2016 12:56:32 +0000 (19:56 +0700)
youtube_dl/extractor/generic.py
youtube_dl/extractor/webcaster.py

index f9707c155c60841d8acd819ddbab2151c0039807..5aac65162834eb82cbda9247b5d52d2902eaac80 100644 (file)
@@ -60,6 +60,7 @@ from .screenwavemedia import ScreenwaveMediaIE
 from .mtv import MTVServicesEmbeddedIE
 from .pladform import PladformIE
 from .videomore import VideomoreIE
+from .webcaster import WebcasterFeedIE
 from .googledrive import GoogleDriveIE
 from .jwplatform import JWPlatformIE
 from .digiteka import DigitekaIE
@@ -2140,6 +2141,11 @@ class GenericIE(InfoExtractor):
         if videomore_url:
             return self.url_result(videomore_url)
 
+        # Look for Webcaster embeds
+        webcaster_url = WebcasterFeedIE._extract_url(self, webpage)
+        if webcaster_url:
+            return self.url_result(webcaster_url, ie=WebcasterFeedIE.ie_key())
+
         # Look for Playwire embeds
         mobj = re.search(
             r'<script[^>]+data-config=(["\'])(?P<url>(?:https?:)?//config\.playwire\.com/.+?)\1', webpage)
index d366511a20818d5640a6125195f06f4ca3b30120..7486cb347d8523a932c2bddd56f26c9a95f78641 100644 (file)
@@ -74,6 +74,23 @@ class WebcasterFeedIE(InfoExtractor):
         'only_matching': True,
     }
 
+    @staticmethod
+    def _extract_url(ie, webpage):
+        mobj = re.search(
+            r'<(?:object|a[^>]+class=["\']webcaster-player["\'])[^>]+data(?:-config)?=(["\']).*?config=(?P<url>https?://bl\.webcaster\.pro/feed/start/free_.*?)(?:[?&]|\1)',
+            webpage)
+        if mobj:
+            return mobj.group('url')
+        for secure in (True, False):
+            video_url = ie._og_search_video_url(
+                webpage, secure=secure, default=None)
+            if video_url:
+                mobj = re.search(
+                    r'config=(?P<url>https?://bl\.webcaster\.pro/feed/start/free_[^?&=]+)',
+                    video_url)
+                if mobj:
+                    return mobj.group('url')
+
     def _real_extract(self, url):
         video_id = self._match_id(url)