youtube-dl

commit c8da40d834697c343f64609b2cfbb3ff759c18a4
parent b69ca0ccfcd3bc7b64aa227339e92576baf5fc9a
Author: Sergey M․ <dstftw@gmail.com>
Date:   Sun,  1 Oct 2017 04:49:27 +0700

[yahoo] Bypass geo restriction for brightcove (#14210)

Diffstat:
M
youtube_dl/extractor/yahoo.py
 | 
21
++++++++++++++++-----

1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/youtube_dl/extractor/yahoo.py b/youtube_dl/extractor/yahoo.py
@@ -17,6 +17,7 @@ from ..utils import (
     extract_attributes,
     int_or_none,
     mimetype2ext,
+    smuggle_url,
     unescapeHTML,
 )
 
@@ -29,7 +30,7 @@ from .nbc import NBCSportsVPlayerIE
 
 class YahooIE(InfoExtractor):
     IE_DESC = 'Yahoo screen and movies'
-    _VALID_URL = r'(?P<host>https?://(?:[a-zA-Z]{2}\.)?[\da-zA-Z_-]+\.yahoo\.com)/(?:[^/]+/)*(?:(?P<display_id>.+)?-)?(?P<id>[0-9]+)(?:-[a-z]+)?(?:\.html)?'
+    _VALID_URL = r'(?P<host>https?://(?:(?P<country>[a-zA-Z]{2})\.)?[\da-zA-Z_-]+\.yahoo\.com)/(?:[^/]+/)*(?:(?P<display_id>.+)?-)?(?P<id>[0-9]+)(?:-[a-z]+)?(?:\.html)?'
     _TESTS = [
         {
             'url': 'http://screen.yahoo.com/julian-smith-travis-legg-watch-214727115.html',
@@ -244,6 +245,11 @@ class YahooIE(InfoExtractor):
             'params': {
                 'skip_download': True,
             },
+        },
+        {
+            # custom brightcove, geo-restricted to Australia, bypassable
+            'url': 'https://au.tv.yahoo.com/plus7/sunrise/-/watch/37263964/sunrise-episode-wed-27-sep/',
+            'only_matching': True,
         }
     ]
 
@@ -274,10 +280,15 @@ class YahooIE(InfoExtractor):
         if bc_url:
             return self.url_result(bc_url, BrightcoveLegacyIE.ie_key())
 
+        def brightcove_url_result(bc_url):
+            return self.url_result(
+                smuggle_url(bc_url, {'geo_countries': [mobj.group('country')]}),
+                BrightcoveNewIE.ie_key())
+
         # Look for Brightcove New Studio embeds
         bc_url = BrightcoveNewIE._extract_url(self, webpage)
         if bc_url:
-            return self.url_result(bc_url, BrightcoveNewIE.ie_key())
+            return brightcove_url_result(bc_url)
 
         brightcove_iframe = self._search_regex(
             r'(<iframe[^>]+data-video-id=["\']\d+[^>]+>)', webpage,
@@ -291,9 +302,9 @@ class YahooIE(InfoExtractor):
                 account_id = qs.get('accountId', ['2376984109001'])[0]
                 brightcove_id = attr.get('data-video-id') or qs.get('videoId', [None])[0]
                 if account_id and brightcove_id:
-                    return self.url_result(
-                        'http://players.brightcove.net/%s/default_default/index.html?videoId=%s' % (account_id, brightcove_id),
-                        BrightcoveNewIE.ie_key())
+                    return brightcove_url_result(
+                        'http://players.brightcove.net/%s/default_default/index.html?videoId=%s'
+                        % (account_id, brightcove_id))
 
         # Query result is often embedded in webpage as JSON. Sometimes explicit requests
         # to video API results in a failure with geo restriction reason therefore using