|
@ -60,11 +60,13 @@ class CSpanIE(InfoExtractor): |
|
|
video_id = self._match_id(url) |
|
|
video_id = self._match_id(url) |
|
|
video_type = None |
|
|
video_type = None |
|
|
webpage = self._download_webpage(url, video_id) |
|
|
webpage = self._download_webpage(url, video_id) |
|
|
matches = re.search(r'data-(prog|clip)id=\'([0-9]+)\'', webpage) |
|
|
|
|
|
if matches: |
|
|
|
|
|
|
|
|
# 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, video_id = matches.groups() |
|
|
if video_type == 'prog': |
|
|
|
|
|
video_type = 'program' |
|
|
|
|
|
|
|
|
video_type = 'clip' if video_type == 'id' else 'program' |
|
|
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: |
|
|