X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fcspan.py;h=67d6df4b0eb285f588b1352eae4a46e0c4b220fd;hb=a6211d237b4e7051ca018cc09440502561fedaa7;hp=a2cbd4d8d592fd2dd6899361a3ab8f4bb3b8a8ed;hpb=ca9e79225323a2c18ebc2e8cbbaaba1bd11a704c;p=youtube-dl diff --git a/youtube_dl/extractor/cspan.py b/youtube_dl/extractor/cspan.py index a2cbd4d8d..67d6df4b0 100644 --- a/youtube_dl/extractor/cspan.py +++ b/youtube_dl/extractor/cspan.py @@ -1,48 +1,196 @@ from __future__ import unicode_literals -import json import re from .common import InfoExtractor from ..utils import ( + determine_ext, + ExtractorError, + extract_attributes, + find_xpath_attr, + get_element_by_class, + int_or_none, + smuggle_url, unescapeHTML, ) +from .senateisvp import SenateISVPIE +from .ustream import UstreamIE class CSpanIE(InfoExtractor): - _VALID_URL = r'http://www\.c-spanvideo\.org/program/(.*)' + _VALID_URL = r'https?://(?:www\.)?c-span\.org/video/\?(?P[0-9a-f]+)' IE_DESC = 'C-SPAN' - _TEST = { - 'url': 'http://www.c-spanvideo.org/program/HolderonV', - 'file': '315139.mp4', - 'md5': '8e44ce11f0f725527daccc453f553eb0', + _TESTS = [{ + 'url': 'http://www.c-span.org/video/?313572-1/HolderonV', + 'md5': '94b29a4f131ff03d23471dd6f60b6a1d', 'info_dict': { + 'id': '315139', 'title': 'Attorney General Eric Holder on Voting Rights Act Decision', - 'description': 'Attorney General Eric Holder spoke to reporters following the Supreme Court decision in [Shelby County v. Holder] in which the court ruled that the preclearance provisions of the Voting Rights Act could not be enforced until Congress established new guidelines for review.', }, - } + 'playlist_mincount': 2, + 'skip': 'Regularly fails on travis, for unknown reasons', + }, { + 'url': 'http://www.c-span.org/video/?c4486943/cspan-international-health-care-models', + # md5 is unstable + 'info_dict': { + 'id': 'c4486943', + 'ext': 'mp4', + 'title': 'CSPAN - International Health Care Models', + 'description': 'md5:7a985a2d595dba00af3d9c9f0783c967', + } + }, { + 'url': 'http://www.c-span.org/video/?318608-1/gm-ignition-switch-recall', + 'info_dict': { + 'id': '342759', + 'title': 'General Motors Ignition Switch Recall', + }, + 'playlist_mincount': 6, + }, { + # Video from senate.gov + 'url': 'http://www.c-span.org/video/?104517-1/immigration-reforms-needed-protect-skilled-american-workers', + 'info_dict': { + 'id': 'judiciary031715', + 'ext': 'mp4', + 'title': 'Immigration Reforms Needed to Protect Skilled American Workers', + }, + 'params': { + 'skip_download': True, # m3u8 downloads + } + }, { + # Ustream embedded video + 'url': 'https://www.c-span.org/video/?114917-1/armed-services', + 'info_dict': { + 'id': '58428542', + 'ext': 'flv', + 'title': 'USHR07 Armed Services Committee', + 'description': 'hsas00-2118-20150204-1000et-07\n\n\nUSHR07 Armed Services Committee', + 'timestamp': 1423060374, + 'upload_date': '20150204', + 'uploader': 'HouseCommittee', + 'uploader_id': '12987475', + }, + }, { + # Audio Only + 'url': 'https://www.c-span.org/video/?437336-1/judiciary-antitrust-competition-policy-consumer-rights', + 'only_matching': True, + }] + BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/%s_%s/index.html?videoId=%s' def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - prog_name = mobj.group(1) - webpage = self._download_webpage(url, prog_name) - video_id = self._search_regex(r'programid=(.*?)&', webpage, 'video id') - - title = self._html_search_regex( - r'\n\s*]*>(.*?)', webpage, 'title') - description = self._og_search_description(webpage) - - info_url = 'http://c-spanvideo.org/videoLibrary/assets/player/ajax-player.php?os=android&html5=program&id=' + video_id - data_json = self._download_webpage( - info_url, video_id, 'Downloading video info') - data = json.loads(data_json) - - url = unescapeHTML(data['video']['files'][0]['path']['#text']) - - return { - 'id': video_id, - 'title': title, - 'url': url, - 'description': description, - 'thumbnail': self._og_search_thumbnail(webpage), - } + video_id = self._match_id(url) + video_type = None + webpage = self._download_webpage(url, video_id) + + ustream_url = UstreamIE._extract_url(webpage) + if ustream_url: + return self.url_result(ustream_url, UstreamIE.ie_key()) + + if '&vod' not in url: + bc = self._search_regex( + r"(<[^>]+id='brightcove-player-embed'[^>]+>)", + webpage, 'brightcove embed', default=None) + if bc: + bc_attr = extract_attributes(bc) + bc_url = self.BRIGHTCOVE_URL_TEMPLATE % ( + bc_attr.get('data-bcaccountid', '3162030207001'), + bc_attr.get('data-noprebcplayerid', 'SyGGpuJy3g'), + bc_attr.get('data-newbcplayerid', 'default'), + bc_attr['data-bcid']) + return self.url_result(smuggle_url(bc_url, {'source_url': url})) + + # We first look for clipid, because clipprog always appears before + patterns = [r'id=\'clip(%s)\'\s*value=\'([0-9]+)\'' % t for t in ('id', 'prog')] + results = list(filter(None, (re.search(p, webpage) for p in patterns))) + if results: + matches = results[0] + video_type, video_id = matches.groups() + video_type = 'clip' if video_type == 'id' else 'program' + else: + m = re.search(r'data-(?Pclip|prog)id=["\'](?P\d+)', webpage) + if m: + video_id = m.group('id') + video_type = 'program' if m.group('type') == 'prog' else 'clip' + else: + senate_isvp_url = SenateISVPIE._search_iframe_url(webpage) + if senate_isvp_url: + title = self._og_search_title(webpage) + surl = smuggle_url(senate_isvp_url, {'force_title': title}) + return self.url_result(surl, 'SenateISVP', video_id, title) + video_id = self._search_regex( + r'jwsetup\.clipprog\s*=\s*(\d+);', + webpage, 'jwsetup program id', default=None) + if video_id: + video_type = 'program' + if video_type is None or video_id is None: + error_message = get_element_by_class('VLplayer-error-message', webpage) + if error_message: + raise ExtractorError(error_message) + raise ExtractorError('unable to find video id and type') + + def get_text_attr(d, attr): + return d.get(attr, {}).get('#text') + + data = self._download_json( + 'http://www.c-span.org/assets/player/ajax-player.php?os=android&html5=%s&id=%s' % (video_type, video_id), + video_id)['video'] + if data['@status'] != 'Success': + raise ExtractorError('%s said: %s' % (self.IE_NAME, get_text_attr(data, 'error')), expected=True) + + doc = self._download_xml( + 'http://www.c-span.org/common/services/flashXml.php?%sid=%s' % (video_type, video_id), + video_id) + + description = self._html_search_meta('description', webpage) + + title = find_xpath_attr(doc, './/string', 'name', 'title').text + thumbnail = find_xpath_attr(doc, './/string', 'name', 'poster').text + + files = data['files'] + capfile = get_text_attr(data, 'capfile') + + entries = [] + for partnum, f in enumerate(files): + formats = [] + for quality in f.get('qualities', []): + formats.append({ + 'format_id': '%s-%sp' % (get_text_attr(quality, 'bitrate'), get_text_attr(quality, 'height')), + 'url': unescapeHTML(get_text_attr(quality, 'file')), + 'height': int_or_none(get_text_attr(quality, 'height')), + 'tbr': int_or_none(get_text_attr(quality, 'bitrate')), + }) + if not formats: + path = unescapeHTML(get_text_attr(f, 'path')) + if not path: + continue + formats = self._extract_m3u8_formats( + path, video_id, 'mp4', entry_protocol='m3u8_native', + m3u8_id='hls') if determine_ext(path) == 'm3u8' else [{'url': path, }] + self._sort_formats(formats) + entries.append({ + 'id': '%s_%d' % (video_id, partnum + 1), + 'title': ( + title if len(files) == 1 else + '%s part %d' % (title, partnum + 1)), + 'formats': formats, + 'description': description, + 'thumbnail': thumbnail, + 'duration': int_or_none(get_text_attr(f, 'length')), + 'subtitles': { + 'en': [{ + 'url': capfile, + 'ext': determine_ext(capfile, 'dfxp') + }], + } if capfile else None, + }) + + if len(entries) == 1: + entry = dict(entries[0]) + entry['id'] = 'c' + video_id if video_type == 'clip' else video_id + return entry + else: + return { + '_type': 'playlist', + 'entries': entries, + 'title': title, + 'id': 'c' + video_id if video_type == 'clip' else video_id, + }