diff options
| author | remitamine <remitamine@gmail.com> | 2016-01-26 15:55:38 +0100 |
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2016-01-26 15:55:38 +0100 |
| commit | ab180fc648d331643aaf340c3cf7e92bcbb10bce (patch) | |
| tree | c762a9ab4cbf1255ad111df02fbbe8f1374033c0 /youtube_dl | |
| parent | 682f8c43b50d8b5e2c02e34187cbddb0d5f8d3ed (diff) | |
| parent | f693213567010ecc108447cba4615ae2932d1c18 (diff) | |
| download | youtube-dl-ab180fc648d331643aaf340c3cf7e92bcbb10bce.tar.xz | |
Merge branch 'master' of github.com:rg3/youtube-dl
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/cspan.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/youtube_dl/extractor/cspan.py b/youtube_dl/extractor/cspan.py index b3ee67018..f78cbbd7e 100644 --- a/youtube_dl/extractor/cspan.py +++ b/youtube_dl/extractor/cspan.py @@ -68,11 +68,16 @@ class CSpanIE(InfoExtractor): video_type, video_id = matches.groups() video_type = 'clip' if video_type == 'id' else 'program' 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) + m = re.search(r'data-(?P<type>clip|prog)id=["\'](?P<id>\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) if video_type is None or video_id is None: raise ExtractorError('unable to find video id and type') |