Merge tag 'upstream/2013.08.02'

[youtubedl] / youtube_dl / extractor / cspan.py

diff --git a/youtube_dl/extractor/cspan.py b/youtube_dl/extractor/cspan.py
index 2246515f2a9205da9a329a78343b759e460bf3df..7bf03c584c7388b162c9b3912a4aa0f410ed5b22 100644 (file)
--- a/youtube_dl/extractor/cspan.py
+++ b/youtube_dl/extractor/cspan.py
@@ -7,6 +7,15 @@ from ..utils import (
 
 class CSpanIE(InfoExtractor):
     _VALID_URL = r'http://www.c-spanvideo.org/program/(.*)'
 
 class CSpanIE(InfoExtractor):
     _VALID_URL = r'http://www.c-spanvideo.org/program/(.*)'

+    _TEST = {
+        u'url': u'http://www.c-spanvideo.org/program/HolderonV',
+        u'file': u'315139.flv',
+        u'md5': u'74a623266956f69e4df0068ab6c80fe4',
+        u'info_dict': {
+            u"title": u"Attorney General Eric Holder on Voting Rights Act Decision"
+        },
+        u'skip': u'Requires rtmpdump'
+    }

 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)


@@ -25,8 +34,6 @@ class CSpanIE(InfoExtractor):
         description = self._html_search_regex(r'<meta (?:property="og:|name=")description" content="(.*?)"',
                                               webpage, 'description',
                                               flags=re.MULTILINE|re.DOTALL)
         description = self._html_search_regex(r'<meta (?:property="og:|name=")description" content="(.*?)"',
                                               webpage, 'description',
                                               flags=re.MULTILINE|re.DOTALL)

-        thumbnail = self._html_search_regex(r'<meta property="og:image" content="(.*?)"',
-                                            webpage, 'thumbnail')

 
         url = self._search_regex(r'<string name="URL">(.*?)</string>',
                                  video_info, 'video url')
 
         url = self._search_regex(r'<string name="URL">(.*?)</string>',
                                  video_info, 'video url')


@@ -40,5 +47,5 @@ class CSpanIE(InfoExtractor):
                 'url': url,
                 'play_path': path,
                 'description': description,
                 'url': url,
                 'play_path': path,
                 'description': description,

-                'thumbnail': thumbnail,
+                'thumbnail': self._og_search_thumbnail(webpage),

                 }
                 }