dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[pbs] Catch geoblocking errors (closes #4516)

This commit is contained in:
Jaime Marquínez Ferrándiz 2014-12-31 17:24:14 +01:00
parent 60e47a2699
commit f86d543ebb
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
youtube_dl/extractor/pbs.py
View File

@ -4,6 +4,7 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
ExtractorError,
unified_strdate, unified_strdate,
US_RATINGS, US_RATINGS,
) )
@ -151,6 +152,19 @@ class PBSIE(InfoExtractor):
info_url = 'http://video.pbs.org/videoInfo/%s?format=json' % video_id info_url = 'http://video.pbs.org/videoInfo/%s?format=json' % video_id
info = self._download_json(info_url, display_id) info = self._download_json(info_url, display_id)
redirect_url = info['alternate_encoding']['url']
redirect_info = self._download_json(
redirect_url + '?format=json', display_id,
'Downloading video url info')
if redirect_info['status'] == 'error':
if redirect_info['http_code'] == 403:
message = (
'The video is not available in your region due to '
'right restrictions')
else:
message = redirect_info['message']
raise ExtractorError(message, expected=True)
rating_str = info.get('rating') rating_str = info.get('rating')
if rating_str is not None: if rating_str is not None:
rating_str = rating_str.rpartition('-')[2] rating_str = rating_str.rpartition('-')[2]
@ -160,7 +174,7 @@ class PBSIE(InfoExtractor):
'id': video_id, 'id': video_id,
'display_id': display_id, 'display_id': display_id,
'title': info['title'], 'title': info['title'],
'url': info['alternate_encoding']['url'], 'url': redirect_info['url'],
'ext': 'mp4', 'ext': 'mp4',
'description': info['program'].get('description'), 'description': info['program'].get('description'),
'thumbnail': info.get('image_url'), 'thumbnail': info.get('image_url'),