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

[pbs] Add support for HD (Closes #3564, closes #5390)

This commit is contained in:
Sergey M․ 2015-05-01 17:43:06 +06:00
parent 083c1bb960
commit 5890eef6b0
1 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
youtube_dl/extractor/pbs.py
View File

@ -5,6 +5,8 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
ExtractorError, ExtractorError,
determine_ext,
int_or_none,
unified_strdate, unified_strdate,
US_RATINGS, US_RATINGS,
) )
@ -149,13 +151,23 @@ class PBSIE(InfoExtractor):
for vid_id in video_id] for vid_id in video_id]
return self.playlist_result(entries, display_id) return self.playlist_result(entries, display_id)
info_url = 'http://video.pbs.org/videoInfo/%s?format=json' % video_id info = self._download_json(
info = self._download_json(info_url, display_id) 'http://video.pbs.org/videoInfo/%s?format=json&type=partner' % video_id,
display_id)
formats = []
for encoding_name in ('recommended_encoding', 'alternate_encoding'):
redirect = info.get(encoding_name)
if not redirect:
continue
redirect_url = redirect.get('url')
if not redirect_url:
continue
redirect_url = info['alternate_encoding']['url']
redirect_info = self._download_json( redirect_info = self._download_json(
redirect_url + '?format=json', display_id, redirect_url + '?format=json', display_id,
'Downloading video url info') 'Downloading %s video url info' % encoding_name)
if redirect_info['status'] == 'error': if redirect_info['status'] == 'error':
if redirect_info['http_code'] == 403: if redirect_info['http_code'] == 403:
message = ( message = (
@ -165,6 +177,19 @@ class PBSIE(InfoExtractor):
message = redirect_info['message'] message = redirect_info['message']
raise ExtractorError(message, expected=True) raise ExtractorError(message, expected=True)
format_url = redirect_info.get('url')
if not format_url:
continue
if determine_ext(format_url) == 'm3u8':
formats.extend(self._extract_m3u8_formats(
format_url, display_id, 'mp4', preference=1, m3u8_id='hls'))
else:
formats.append({
'url': format_url,
})
self._sort_formats(formats)
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]
@ -174,11 +199,10 @@ class PBSIE(InfoExtractor):
'id': video_id, 'id': video_id,
'display_id': display_id, 'display_id': display_id,
'title': info['title'], 'title': info['title'],
'url': redirect_info['url'],
'ext': 'mp4',
'description': info['program'].get('description'), 'description': info['program'].get('description'),
'thumbnail': info.get('image_url'), 'thumbnail': info.get('image_url'),
'duration': info.get('duration'), 'duration': int_or_none(info.get('duration')),
'age_limit': age_limit, 'age_limit': age_limit,
'upload_date': upload_date, 'upload_date': upload_date,
'formats': formats,
} }