Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[pbs] fix extraction for geo restricted videos(#7095)

pull/11510/head
Remita Amine 2016-12-19 16:27:12 +01:00
parent 954529c10f
commit 5aaf012a4e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/extractor/pbs.py
View File

@ -350,6 +350,15 @@ class PBSIE(InfoExtractor):
410: 'This video has expired and is no longer available for online streaming.', 410: 'This video has expired and is no longer available for online streaming.',
} }
def _real_initialize(self):
cookie = (self._download_json(
'http://localization.services.pbs.org/localize/auto/cookie/',
None, headers=self.geo_verification_headers(), fatal=False) or {}).get('cookie')
if cookie:
station = self._search_regex(r'#?s=\["([^"]+)"', cookie, 'station')
if station:
self._set_cookie('.pbs.org', 'pbsol.station', station)
def _extract_webpage(self, url): def _extract_webpage(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
@ -476,7 +485,8 @@ class PBSIE(InfoExtractor):
redirect_info = self._download_json( redirect_info = self._download_json(
'%s?format=json' % redirect['url'], display_id, '%s?format=json' % redirect['url'], display_id,
'Downloading %s video url info' % (redirect_id or num)) 'Downloading %s video url info' % (redirect_id or num),
headers=self.geo_verification_headers())
if redirect_info['status'] == 'error': if redirect_info['status'] == 'error':
raise ExtractorError( raise ExtractorError(