diff options
| author | Remita Amine <remitamine@gmail.com> | 2017-12-17 19:13:25 +0100 | 
|---|---|---|
| committer | Remita Amine <remitamine@gmail.com> | 2017-12-17 19:15:59 +0100 | 
| commit | 7e810109877bb59d213574b115e46d9621db9a18 (patch) | |
| tree | e0d94dd63d71f75d9ae433e7104013cba28caa45 /youtube_dl/extractor/cspan.py | |
| parent | 549bb416f5a9d15c03749a98abd582d0e40418ac (diff) | |
[cspan] add support for audio only pages and catch page errors(closes #14995)
Diffstat (limited to 'youtube_dl/extractor/cspan.py')
| -rw-r--r-- | youtube_dl/extractor/cspan.py | 23 | 
1 files changed, 18 insertions, 5 deletions
diff --git a/youtube_dl/extractor/cspan.py b/youtube_dl/extractor/cspan.py index 171820e27..67d6df4b0 100644 --- a/youtube_dl/extractor/cspan.py +++ b/youtube_dl/extractor/cspan.py @@ -4,13 +4,14 @@ import re  from .common import InfoExtractor  from ..utils import ( -    int_or_none, -    unescapeHTML, -    find_xpath_attr, -    smuggle_url,      determine_ext,      ExtractorError,      extract_attributes, +    find_xpath_attr, +    get_element_by_class, +    int_or_none, +    smuggle_url, +    unescapeHTML,  )  from .senateisvp import SenateISVPIE  from .ustream import UstreamIE @@ -68,6 +69,10 @@ class CSpanIE(InfoExtractor):              'uploader': 'HouseCommittee',              'uploader_id': '12987475',          }, +    }, { +        # Audio Only +        'url': 'https://www.c-span.org/video/?437336-1/judiciary-antitrust-competition-policy-consumer-rights', +        'only_matching': True,      }]      BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/%s_%s/index.html?videoId=%s' @@ -111,7 +116,15 @@ class CSpanIE(InfoExtractor):                      title = self._og_search_title(webpage)                      surl = smuggle_url(senate_isvp_url, {'force_title': title})                      return self.url_result(surl, 'SenateISVP', video_id, title) +                video_id = self._search_regex( +                    r'jwsetup\.clipprog\s*=\s*(\d+);', +                    webpage, 'jwsetup program id', default=None) +                if video_id: +                    video_type = 'program'          if video_type is None or video_id is None: +            error_message = get_element_by_class('VLplayer-error-message', webpage) +            if error_message: +                raise ExtractorError(error_message)              raise ExtractorError('unable to find video id and type')          def get_text_attr(d, attr): @@ -138,7 +151,7 @@ class CSpanIE(InfoExtractor):          entries = []          for partnum, f in enumerate(files):              formats = [] -            for quality in f['qualities']: +            for quality in f.get('qualities', []):                  formats.append({                      'format_id': '%s-%sp' % (get_text_attr(quality, 'bitrate'), get_text_attr(quality, 'height')),                      'url': unescapeHTML(get_text_attr(quality, 'file')),  | 
