diff options
| author | Sergey M. <dstftw@gmail.com> | 2015-10-09 00:06:49 +0600 |
|---|---|---|
| committer | Sergey M. <dstftw@gmail.com> | 2015-10-09 00:06:49 +0600 |
| commit | cbb72872043734bbcf1fd2c5a1d432ebd643e440 (patch) | |
| tree | 7f8cb9b294fbbafb894f0137a94b117f0f1e23fa | |
| parent | 4356d907c1afae09ff67a17c90b53be466b13623 (diff) | |
| parent | 0553d0ee40b6ecd62ed25ba8999aa2e4f7641590 (diff) | |
| download | youtube-dl-cbb72872043734bbcf1fd2c5a1d432ebd643e440.tar.xz | |
Merge pull request #7105 from remitamine/pbs
[pbs] detect errors from http error code
| -rw-r--r-- | youtube_dl/extractor/pbs.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/youtube_dl/extractor/pbs.py b/youtube_dl/extractor/pbs.py index 6923c6094..814e97f48 100644 --- a/youtube_dl/extractor/pbs.py +++ b/youtube_dl/extractor/pbs.py @@ -108,12 +108,12 @@ class PBSIE(InfoExtractor): { 'url': 'http://www.pbs.org/wgbh/americanexperience/films/death/player/', 'info_dict': { - 'id': '2280706814', + 'id': '2276541483', 'display_id': 'player', 'ext': 'mp4', - 'title': 'American Experience - Death and the Civil War', + 'title': 'American Experience - Death and the Civil War, Chapter 1', 'description': 'American Experience, TV’s most-watched history series, brings to life the compelling stories from our past that inform our understanding of the world today.', - 'duration': 6705, + 'duration': 682, 'thumbnail': 're:^https?://.*\.jpg$', }, 'params': { @@ -134,6 +134,7 @@ class PBSIE(InfoExtractor): 'params': { 'skip_download': True, # requires ffmpeg }, + 'skip': 'Expired', }, { # Video embedded in iframe containing angle brackets as attribute's value (e.g. @@ -154,6 +155,12 @@ class PBSIE(InfoExtractor): }, } ] + _ERRORS = { + 101: 'We\'re sorry, but this video is not yet available.', + 403: 'We\'re sorry, but this video is not available in your region due to right restrictions.', + 404: 'We are experiencing technical difficulties that are preventing us from playing the video at this time. Please check back again soon.', + 410: 'This video has expired and is no longer available for online streaming.', + } def _extract_webpage(self, url): mobj = re.match(self._VALID_URL, url) @@ -231,13 +238,7 @@ class PBSIE(InfoExtractor): 'Downloading %s video url info' % encoding_name) 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) + raise ExtractorError('PBS said: %s' % self._ERRORS.get(redirect_info['http_code'], redirect_info['message']), expected=True) format_url = redirect_info.get('url') if not format_url: |