From: Sergey M․ <dstftw@gmail.com>
Date: Tue, 26 Jan 2016 14:42:20 +0000 (+0600)
Subject: [cspan] Fix clip/prog id extraction (#8317)
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=f693213567010ecc108447cba4615ae2932d1c18;p=youtube-dl

[cspan] Fix clip/prog id extraction (#8317)
---

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')