debian/control: Update list of supported sites (and list one per line).

[youtubedl] / youtube_dl / extractor / cspan.py

diff --git a/youtube_dl/extractor/cspan.py b/youtube_dl/extractor/cspan.py
index b8b9d058ddce866fa497597863c80d1de0a7f5c5..d4576160b4489e599e4ca7dabc1e18c9d685610f 100644 (file)
--- a/youtube_dl/extractor/cspan.py
+++ b/youtube_dl/extractor/cspan.py
@@ -12,24 +12,24 @@ from ..utils import (
     ExtractorError,
 )
 from .senateisvp import SenateISVPIE
     ExtractorError,
 )
 from .senateisvp import SenateISVPIE

+from .ustream import UstreamIE

 
 
 class CSpanIE(InfoExtractor):
 
 
 class CSpanIE(InfoExtractor):

-    _VALID_URL = r'http://(?:www\.)?c-span\.org/video/\?(?P<id>[0-9a-f]+)'
+    _VALID_URL = r'https?://(?:www\.)?c-span\.org/video/\?(?P<id>[0-9a-f]+)'

     IE_DESC = 'C-SPAN'
     _TESTS = [{
         'url': 'http://www.c-span.org/video/?313572-1/HolderonV',
         'md5': '94b29a4f131ff03d23471dd6f60b6a1d',
         'info_dict': {
             'id': '315139',
     IE_DESC = 'C-SPAN'
     _TESTS = [{
         'url': 'http://www.c-span.org/video/?313572-1/HolderonV',
         'md5': '94b29a4f131ff03d23471dd6f60b6a1d',
         'info_dict': {
             'id': '315139',

-            'ext': 'mp4',

             'title': 'Attorney General Eric Holder on Voting Rights Act Decision',
             'title': 'Attorney General Eric Holder on Voting Rights Act Decision',

-            'description': 'Attorney General Eric Holder speaks to reporters following the Supreme Court decision in [Shelby County v. Holder], in which the court ruled that the preclearance provisions of the Voting Rights Act could not be enforced.',

         },
         },

+        'playlist_mincount': 2,

         'skip': 'Regularly fails on travis, for unknown reasons',
     }, {
         'url': 'http://www.c-span.org/video/?c4486943/cspan-international-health-care-models',
         'skip': 'Regularly fails on travis, for unknown reasons',
     }, {
         'url': 'http://www.c-span.org/video/?c4486943/cspan-international-health-care-models',

-        'md5': '8e5fbfabe6ad0f89f3012a7943c1287b',
+        # md5 is unstable

         'info_dict': {
             'id': 'c4486943',
             'ext': 'mp4',
         'info_dict': {
             'id': 'c4486943',
             'ext': 'mp4',


@@ -38,28 +38,46 @@ class CSpanIE(InfoExtractor):
         }
     }, {
         'url': 'http://www.c-span.org/video/?318608-1/gm-ignition-switch-recall',
         }
     }, {
         'url': 'http://www.c-span.org/video/?318608-1/gm-ignition-switch-recall',

-        'md5': '2ae5051559169baadba13fc35345ae74',

         'info_dict': {
             'id': '342759',
         'info_dict': {
             'id': '342759',

-            'ext': 'mp4',

             'title': 'General Motors Ignition Switch Recall',
             'title': 'General Motors Ignition Switch Recall',

-            'duration': 14848,
-            'description': 'md5:118081aedd24bf1d3b68b3803344e7f3'

         },
         },

+        'playlist_mincount': 6,

     }, {
         # Video from senate.gov
         'url': 'http://www.c-span.org/video/?104517-1/immigration-reforms-needed-protect-skilled-american-workers',
         'info_dict': {
             'id': 'judiciary031715',
     }, {
         # Video from senate.gov
         'url': 'http://www.c-span.org/video/?104517-1/immigration-reforms-needed-protect-skilled-american-workers',
         'info_dict': {
             'id': 'judiciary031715',

-            'ext': 'flv',
+            'ext': 'mp4',

             'title': 'Immigration Reforms Needed to Protect Skilled American Workers',
             'title': 'Immigration Reforms Needed to Protect Skilled American Workers',

+        },
+        'params': {
+            'skip_download': True,  # m3u8 downloads

         }
         }

+    }, {
+        # Ustream embedded video
+        'url': 'https://www.c-span.org/video/?114917-1/armed-services',
+        'info_dict': {
+            'id': '58428542',
+            'ext': 'flv',
+            'title': 'USHR07 Armed Services Committee',
+            'description': 'hsas00-2118-20150204-1000et-07\n\n\nUSHR07 Armed Services Committee',
+            'timestamp': 1423060374,
+            'upload_date': '20150204',
+            'uploader': 'HouseCommittee',
+            'uploader_id': '12987475',
+        },

     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         video_type = None
         webpage = self._download_webpage(url, video_id)
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         video_type = None
         webpage = self._download_webpage(url, video_id)

+
+        ustream_url = UstreamIE._extract_url(webpage)
+        if ustream_url:
+            return self.url_result(ustream_url, UstreamIE.ie_key())
+

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