ytdl-org
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
remitamine 2016-01-26 15:55:38 +01:00
parent 682f8c43b5 f693213567
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

5
youtube_dl/extractor/cspan.py
View File

@ -67,6 +67,11 @@ class CSpanIE(InfoExtractor):
matches = results[0] matches = results[0]
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:
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: else:
senate_isvp_url = SenateISVPIE._search_iframe_url(webpage) senate_isvp_url = SenateISVPIE._search_iframe_url(webpage)
if senate_isvp_url: if senate_isvp_url: