depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-25 19:52:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:rg3/youtube-dl

Browse source
This commit is contained in:
remitamine 2016-01-26 15:55:38 +01:00
commit ab180fc648
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
youtube_dl/extractor/cspan.py
View file

@ -68,11 +68,16 @@ class CSpanIE(InfoExtractor):
video_type, video_id = matches.groups() video_type, video_id = matches.groups()
video_type = 'clip' if video_type == 'id' else 'program' video_type = 'clip' if video_type == 'id' else 'program'
else: else:
senate_isvp_url = SenateISVPIE._search_iframe_url(webpage) m = re.search(r'data-(?P<type>clip|prog)id=["\'](?P<id>\d+)', webpage)
if senate_isvp_url: if m:
title = self._og_search_title(webpage) video_id = m.group('id')
surl = smuggle_url(senate_isvp_url, {'force_title': title}) video_type = 'program' if m.group('type') == 'prog' else 'clip'
return self.url_result(surl, 'SenateISVP', video_id, title) 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: if video_type is None or video_id is None:
raise ExtractorError('unable to find video id and type') raise ExtractorError('unable to find video id and type')