mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-08-16 20:31:05 +02:00
[cspan] move get_text_attr to CSpanIE
This commit is contained in:
parent
355c7ad361
commit
4bf5614195
@ -14,10 +14,6 @@
|
||||
from .senateisvp import SenateISVPIE
|
||||
|
||||
|
||||
def get_text_attr(d, attr):
|
||||
return d.get(attr, {}).get('#text')
|
||||
|
||||
|
||||
class CSpanIE(InfoExtractor):
|
||||
_VALID_URL = r'http://(?:www\.)?c-span\.org/video/\?(?P<id>[0-9a-f]+)'
|
||||
IE_DESC = 'C-SPAN'
|
||||
@ -60,6 +56,9 @@ class CSpanIE(InfoExtractor):
|
||||
}
|
||||
}]
|
||||
|
||||
def get_text_attr(self, d, attr):
|
||||
return d.get(attr, {}).get('#text')
|
||||
|
||||
def _real_extract(self, url):
|
||||
video_id = self._match_id(url)
|
||||
webpage = self._download_webpage(url, video_id)
|
||||
@ -79,7 +78,7 @@ def _real_extract(self, url):
|
||||
'http://www.c-span.org/assets/player/ajax-player.php?os=android&html5=%s&id=%s' % (video_type, video_id),
|
||||
video_id)['video']
|
||||
if data['@status'] != 'Success':
|
||||
raise ExtractorError('%s said: %s' % (self.IE_NAME, get_text_attr(data, 'error')), expected=True)
|
||||
raise ExtractorError('%s said: %s' % (self.IE_NAME, self.get_text_attr(data, 'error')), expected=True)
|
||||
|
||||
doc = self._download_xml(
|
||||
'http://www.c-span.org/common/services/flashXml.php?%sid=%s' % (video_type, video_id),
|
||||
@ -91,17 +90,17 @@ def _real_extract(self, url):
|
||||
thumbnail = find_xpath_attr(doc, './/string', 'name', 'poster').text
|
||||
|
||||
files = data['files']
|
||||
capfile = get_text_attr(data, 'capfile')
|
||||
capfile = self.get_text_attr(data, 'capfile')
|
||||
|
||||
entries = []
|
||||
for partnum, f in enumerate(files):
|
||||
formats = []
|
||||
for quality in f['qualities']:
|
||||
formats.append({
|
||||
'format_id': '%s-%sp' % (get_text_attr(quality, 'bitrate'), get_text_attr(quality, 'height')),
|
||||
'url': unescapeHTML(get_text_attr(quality, 'file')),
|
||||
'height': int_or_none(get_text_attr(quality, 'height')),
|
||||
'tbr': int_or_none(get_text_attr(quality, 'bitrate')),
|
||||
'format_id': '%s-%sp' % (self.get_text_attr(quality, 'bitrate'), self.get_text_attr(quality, 'height')),
|
||||
'url': unescapeHTML(self.get_text_attr(quality, 'file')),
|
||||
'height': int_or_none(self.get_text_attr(quality, 'height')),
|
||||
'tbr': int_or_none(self.get_text_attr(quality, 'bitrate')),
|
||||
})
|
||||
self._sort_formats(formats)
|
||||
entries.append({
|
||||
@ -112,7 +111,7 @@ def _real_extract(self, url):
|
||||
'formats': formats,
|
||||
'description': description,
|
||||
'thumbnail': thumbnail,
|
||||
'duration': int_or_none(get_text_attr(f, 'length')),
|
||||
'duration': int_or_none(self.get_text_attr(f, 'length')),
|
||||
'subtitles': {
|
||||
'en': [{
|
||||
'url': capfile,
|
||||
|
Loading…
Reference in New Issue
Block a user