mirror of https://github.com/yt-dlp/yt-dlp
[Senate.gov] Add SenateGovIE and fix SenateISVPIE (#1435)
Authored by: Grabien, pukkandanpull/1814/head
Grabien
3 years ago
committed by
GitHub
parent
dfd78699f5
commit
909b0d66f4
@ -0,0 +1,213 @@
|
|||||||
|
# coding: utf-8
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
import re
|
||||||
|
|
||||||
|
from .common import InfoExtractor
|
||||||
|
from ..compat import (
|
||||||
|
compat_parse_qs,
|
||||||
|
compat_urlparse,
|
||||||
|
)
|
||||||
|
from ..utils import (
|
||||||
|
ExtractorError,
|
||||||
|
parse_qs,
|
||||||
|
unsmuggle_url,
|
||||||
|
)
|
||||||
|
|
||||||
|
_COMMITTEES = {
|
||||||
|
'ag': ('76440', 'http://ag-f.akamaihd.net'),
|
||||||
|
'aging': ('76442', 'http://aging-f.akamaihd.net'),
|
||||||
|
'approps': ('76441', 'http://approps-f.akamaihd.net'),
|
||||||
|
'arch': ('', 'http://ussenate-f.akamaihd.net'),
|
||||||
|
'armed': ('76445', 'http://armed-f.akamaihd.net'),
|
||||||
|
'banking': ('76446', 'http://banking-f.akamaihd.net'),
|
||||||
|
'budget': ('76447', 'http://budget-f.akamaihd.net'),
|
||||||
|
'cecc': ('76486', 'http://srs-f.akamaihd.net'),
|
||||||
|
'commerce': ('80177', 'http://commerce1-f.akamaihd.net'),
|
||||||
|
'csce': ('75229', 'http://srs-f.akamaihd.net'),
|
||||||
|
'dpc': ('76590', 'http://dpc-f.akamaihd.net'),
|
||||||
|
'energy': ('76448', 'http://energy-f.akamaihd.net'),
|
||||||
|
'epw': ('76478', 'http://epw-f.akamaihd.net'),
|
||||||
|
'ethics': ('76449', 'http://ethics-f.akamaihd.net'),
|
||||||
|
'finance': ('76450', 'http://finance-f.akamaihd.net'),
|
||||||
|
'foreign': ('76451', 'http://foreign-f.akamaihd.net'),
|
||||||
|
'govtaff': ('76453', 'http://govtaff-f.akamaihd.net'),
|
||||||
|
'help': ('76452', 'http://help-f.akamaihd.net'),
|
||||||
|
'indian': ('76455', 'http://indian-f.akamaihd.net'),
|
||||||
|
'intel': ('76456', 'http://intel-f.akamaihd.net'),
|
||||||
|
'intlnarc': ('76457', 'http://intlnarc-f.akamaihd.net'),
|
||||||
|
'jccic': ('85180', 'http://jccic-f.akamaihd.net'),
|
||||||
|
'jec': ('76458', 'http://jec-f.akamaihd.net'),
|
||||||
|
'judiciary': ('76459', 'http://judiciary-f.akamaihd.net'),
|
||||||
|
'rpc': ('76591', 'http://rpc-f.akamaihd.net'),
|
||||||
|
'rules': ('76460', 'http://rules-f.akamaihd.net'),
|
||||||
|
'saa': ('76489', 'http://srs-f.akamaihd.net'),
|
||||||
|
'smbiz': ('76461', 'http://smbiz-f.akamaihd.net'),
|
||||||
|
'srs': ('75229', 'http://srs-f.akamaihd.net'),
|
||||||
|
'uscc': ('76487', 'http://srs-f.akamaihd.net'),
|
||||||
|
'vetaff': ('76462', 'http://vetaff-f.akamaihd.net'),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class SenateISVPIE(InfoExtractor):
|
||||||
|
_IE_NAME = 'senate.gov:isvp'
|
||||||
|
_VALID_URL = r'https?://(?:www\.)?senate\.gov/isvp/?\?(?P<qs>.+)'
|
||||||
|
|
||||||
|
_TESTS = [{
|
||||||
|
'url': 'http://www.senate.gov/isvp/?comm=judiciary&type=live&stt=&filename=judiciary031715&auto_play=false&wmode=transparent&poster=http%3A%2F%2Fwww.judiciary.senate.gov%2Fthemes%2Fjudiciary%2Fimages%2Fvideo-poster-flash-fit.png',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'judiciary031715',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': 'Integrated Senate Video Player',
|
||||||
|
'thumbnail': r're:^https?://.*\.(?:jpg|png)$',
|
||||||
|
},
|
||||||
|
'params': {
|
||||||
|
# m3u8 download
|
||||||
|
'skip_download': True,
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
'url': 'http://www.senate.gov/isvp/?type=live&comm=commerce&filename=commerce011514.mp4&auto_play=false',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'commerce011514',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': 'Integrated Senate Video Player'
|
||||||
|
},
|
||||||
|
'params': {
|
||||||
|
# m3u8 download
|
||||||
|
'skip_download': True,
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
'url': 'http://www.senate.gov/isvp/?type=arch&comm=intel&filename=intel090613&hc_location=ufi',
|
||||||
|
# checksum differs each time
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'intel090613',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': 'Integrated Senate Video Player'
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
# From http://www.c-span.org/video/?96791-1
|
||||||
|
'url': 'http://www.senate.gov/isvp?type=live&comm=banking&filename=banking012715',
|
||||||
|
'only_matching': True,
|
||||||
|
}]
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _search_iframe_url(webpage):
|
||||||
|
mobj = re.search(
|
||||||
|
r"<iframe[^>]+src=['\"](?P<url>https?://www\.senate\.gov/isvp/?\?[^'\"]+)['\"]",
|
||||||
|
webpage)
|
||||||
|
if mobj:
|
||||||
|
return mobj.group('url')
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
url, smuggled_data = unsmuggle_url(url, {})
|
||||||
|
|
||||||
|
qs = compat_parse_qs(self._match_valid_url(url).group('qs'))
|
||||||
|
if not qs.get('filename') or not qs.get('type') or not qs.get('comm'):
|
||||||
|
raise ExtractorError('Invalid URL', expected=True)
|
||||||
|
|
||||||
|
video_id = re.sub(r'.mp4$', '', qs['filename'][0])
|
||||||
|
|
||||||
|
webpage = self._download_webpage(url, video_id)
|
||||||
|
|
||||||
|
if smuggled_data.get('force_title'):
|
||||||
|
title = smuggled_data['force_title']
|
||||||
|
else:
|
||||||
|
title = self._html_search_regex(r'<title>([^<]+)</title>', webpage, video_id)
|
||||||
|
poster = qs.get('poster')
|
||||||
|
thumbnail = poster[0] if poster else None
|
||||||
|
|
||||||
|
video_type = qs['type'][0]
|
||||||
|
committee = video_type if video_type == 'arch' else qs['comm'][0]
|
||||||
|
|
||||||
|
stream_num, domain = _COMMITTEES[committee]
|
||||||
|
|
||||||
|
formats = []
|
||||||
|
if video_type == 'arch':
|
||||||
|
filename = video_id if '.' in video_id else video_id + '.mp4'
|
||||||
|
m3u8_url = compat_urlparse.urljoin(domain, 'i/' + filename + '/master.m3u8')
|
||||||
|
formats = self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4', m3u8_id='m3u8')
|
||||||
|
else:
|
||||||
|
hdcore_sign = 'hdcore=3.1.0'
|
||||||
|
url_params = (domain, video_id, stream_num)
|
||||||
|
f4m_url = f'%s/z/%s_1@%s/manifest.f4m?{hdcore_sign}' % url_params
|
||||||
|
m3u8_url = '%s/i/%s_1@%s/master.m3u8' % url_params
|
||||||
|
for entry in self._extract_f4m_formats(f4m_url, video_id, f4m_id='f4m'):
|
||||||
|
# URLs without the extra param induce an 404 error
|
||||||
|
entry.update({'extra_param_to_segment_url': hdcore_sign})
|
||||||
|
formats.append(entry)
|
||||||
|
for entry in self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4', m3u8_id='m3u8'):
|
||||||
|
mobj = re.search(r'(?P<tag>(?:-p|-b)).m3u8', entry['url'])
|
||||||
|
if mobj:
|
||||||
|
entry['format_id'] += mobj.group('tag')
|
||||||
|
formats.append(entry)
|
||||||
|
|
||||||
|
self._sort_formats(formats)
|
||||||
|
|
||||||
|
return {
|
||||||
|
'id': video_id,
|
||||||
|
'title': title,
|
||||||
|
'formats': formats,
|
||||||
|
'thumbnail': thumbnail,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class SenateGovIE(InfoExtractor):
|
||||||
|
_IE_NAME = 'senate.gov'
|
||||||
|
_VALID_URL = r'https?:\/\/(?:www\.)?(help|appropriations|judiciary|banking|armed-services|finance)\.senate\.gov'
|
||||||
|
_TESTS = [{
|
||||||
|
'url': 'https://www.help.senate.gov/hearings/vaccines-saving-lives-ensuring-confidence-and-protecting-public-health',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'help090920',
|
||||||
|
'display_id': 'vaccines-saving-lives-ensuring-confidence-and-protecting-public-health',
|
||||||
|
'title': 'Vaccines: Saving Lives, Ensuring Confidence, and Protecting Public Health',
|
||||||
|
'description': 'The U.S. Senate Committee on Health, Education, Labor & Pensions',
|
||||||
|
'ext': 'mp4',
|
||||||
|
},
|
||||||
|
'params': {'skip_download': 'm3u8'},
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.appropriations.senate.gov/hearings/watch?hearingid=B8A25434-5056-A066-6020-1F68CB75F0CD',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'appropsA051518',
|
||||||
|
'display_id': 'watch?hearingid=B8A25434-5056-A066-6020-1F68CB75F0CD',
|
||||||
|
'title': 'Review of the FY2019 Budget Request for the U.S. Army',
|
||||||
|
'ext': 'mp4',
|
||||||
|
},
|
||||||
|
'params': {'skip_download': 'm3u8'},
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.banking.senate.gov/hearings/21st-century-communities-public-transportation-infrastructure-investment-and-fast-act-reauthorization',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'banking041521',
|
||||||
|
'display_id': '21st-century-communities-public-transportation-infrastructure-investment-and-fast-act-reauthorization',
|
||||||
|
'title': '21st Century Communities: Public Transportation Infrastructure Investment and FAST Act Reauthorization',
|
||||||
|
'description': 'The Official website of The United States Committee on Banking, Housing, and Urban Affairs',
|
||||||
|
'ext': 'mp4',
|
||||||
|
},
|
||||||
|
'params': {'skip_download': 'm3u8'},
|
||||||
|
}]
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
display_id = self._generic_id(url)
|
||||||
|
webpage = self._download_webpage(url, display_id)
|
||||||
|
parse_info = parse_qs(self._search_regex(
|
||||||
|
r'<iframe class="[^>"]*streaminghearing[^>"]*"\s[^>]*\bsrc="([^">]*)', webpage, 'hearing URL'))
|
||||||
|
|
||||||
|
stream_num, stream_domain = _COMMITTEES[parse_info['comm'][-1]]
|
||||||
|
filename = parse_info['filename'][-1]
|
||||||
|
|
||||||
|
formats = self._extract_m3u8_formats(
|
||||||
|
f'{stream_domain}/i/{filename}_1@{stream_num}/master.m3u8',
|
||||||
|
display_id, ext='mp4')
|
||||||
|
self._sort_formats(formats)
|
||||||
|
|
||||||
|
title = self._html_search_regex(
|
||||||
|
(*self._og_regexes('title'), r'(?s)<title>([^<]*?)</title>'), webpage, 'video title')
|
||||||
|
|
||||||
|
return {
|
||||||
|
'id': re.sub(r'.mp4$', '', filename),
|
||||||
|
'display_id': display_id,
|
||||||
|
'title': re.sub(r'\s+', ' ', title.split('|')[0]).strip(),
|
||||||
|
'description': self._og_search_description(webpage, default=None),
|
||||||
|
'thumbnail': self._og_search_thumbnail(webpage, default=None),
|
||||||
|
'age_limit': self._rta_search(webpage),
|
||||||
|
'formats': formats
|
||||||
|
}
|
||||||
@ -1,153 +0,0 @@
|
|||||||
# coding: utf-8
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
import re
|
|
||||||
from .common import InfoExtractor
|
|
||||||
from ..utils import (
|
|
||||||
ExtractorError,
|
|
||||||
unsmuggle_url,
|
|
||||||
)
|
|
||||||
from ..compat import (
|
|
||||||
compat_parse_qs,
|
|
||||||
compat_urlparse,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class SenateISVPIE(InfoExtractor):
|
|
||||||
_COMM_MAP = [
|
|
||||||
['ag', '76440', 'http://ag-f.akamaihd.net'],
|
|
||||||
['aging', '76442', 'http://aging-f.akamaihd.net'],
|
|
||||||
['approps', '76441', 'http://approps-f.akamaihd.net'],
|
|
||||||
['armed', '76445', 'http://armed-f.akamaihd.net'],
|
|
||||||
['banking', '76446', 'http://banking-f.akamaihd.net'],
|
|
||||||
['budget', '76447', 'http://budget-f.akamaihd.net'],
|
|
||||||
['cecc', '76486', 'http://srs-f.akamaihd.net'],
|
|
||||||
['commerce', '80177', 'http://commerce1-f.akamaihd.net'],
|
|
||||||
['csce', '75229', 'http://srs-f.akamaihd.net'],
|
|
||||||
['dpc', '76590', 'http://dpc-f.akamaihd.net'],
|
|
||||||
['energy', '76448', 'http://energy-f.akamaihd.net'],
|
|
||||||
['epw', '76478', 'http://epw-f.akamaihd.net'],
|
|
||||||
['ethics', '76449', 'http://ethics-f.akamaihd.net'],
|
|
||||||
['finance', '76450', 'http://finance-f.akamaihd.net'],
|
|
||||||
['foreign', '76451', 'http://foreign-f.akamaihd.net'],
|
|
||||||
['govtaff', '76453', 'http://govtaff-f.akamaihd.net'],
|
|
||||||
['help', '76452', 'http://help-f.akamaihd.net'],
|
|
||||||
['indian', '76455', 'http://indian-f.akamaihd.net'],
|
|
||||||
['intel', '76456', 'http://intel-f.akamaihd.net'],
|
|
||||||
['intlnarc', '76457', 'http://intlnarc-f.akamaihd.net'],
|
|
||||||
['jccic', '85180', 'http://jccic-f.akamaihd.net'],
|
|
||||||
['jec', '76458', 'http://jec-f.akamaihd.net'],
|
|
||||||
['judiciary', '76459', 'http://judiciary-f.akamaihd.net'],
|
|
||||||
['rpc', '76591', 'http://rpc-f.akamaihd.net'],
|
|
||||||
['rules', '76460', 'http://rules-f.akamaihd.net'],
|
|
||||||
['saa', '76489', 'http://srs-f.akamaihd.net'],
|
|
||||||
['smbiz', '76461', 'http://smbiz-f.akamaihd.net'],
|
|
||||||
['srs', '75229', 'http://srs-f.akamaihd.net'],
|
|
||||||
['uscc', '76487', 'http://srs-f.akamaihd.net'],
|
|
||||||
['vetaff', '76462', 'http://vetaff-f.akamaihd.net'],
|
|
||||||
['arch', '', 'http://ussenate-f.akamaihd.net/']
|
|
||||||
]
|
|
||||||
_IE_NAME = 'senate.gov'
|
|
||||||
_VALID_URL = r'https?://(?:www\.)?senate\.gov/isvp/?\?(?P<qs>.+)'
|
|
||||||
_TESTS = [{
|
|
||||||
'url': 'http://www.senate.gov/isvp/?comm=judiciary&type=live&stt=&filename=judiciary031715&auto_play=false&wmode=transparent&poster=http%3A%2F%2Fwww.judiciary.senate.gov%2Fthemes%2Fjudiciary%2Fimages%2Fvideo-poster-flash-fit.png',
|
|
||||||
'info_dict': {
|
|
||||||
'id': 'judiciary031715',
|
|
||||||
'ext': 'mp4',
|
|
||||||
'title': 'Integrated Senate Video Player',
|
|
||||||
'thumbnail': r're:^https?://.*\.(?:jpg|png)$',
|
|
||||||
},
|
|
||||||
'params': {
|
|
||||||
# m3u8 download
|
|
||||||
'skip_download': True,
|
|
||||||
},
|
|
||||||
}, {
|
|
||||||
'url': 'http://www.senate.gov/isvp/?type=live&comm=commerce&filename=commerce011514.mp4&auto_play=false',
|
|
||||||
'info_dict': {
|
|
||||||
'id': 'commerce011514',
|
|
||||||
'ext': 'mp4',
|
|
||||||
'title': 'Integrated Senate Video Player'
|
|
||||||
},
|
|
||||||
'params': {
|
|
||||||
# m3u8 download
|
|
||||||
'skip_download': True,
|
|
||||||
},
|
|
||||||
}, {
|
|
||||||
'url': 'http://www.senate.gov/isvp/?type=arch&comm=intel&filename=intel090613&hc_location=ufi',
|
|
||||||
# checksum differs each time
|
|
||||||
'info_dict': {
|
|
||||||
'id': 'intel090613',
|
|
||||||
'ext': 'mp4',
|
|
||||||
'title': 'Integrated Senate Video Player'
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
# From http://www.c-span.org/video/?96791-1
|
|
||||||
'url': 'http://www.senate.gov/isvp?type=live&comm=banking&filename=banking012715',
|
|
||||||
'only_matching': True,
|
|
||||||
}]
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _search_iframe_url(webpage):
|
|
||||||
mobj = re.search(
|
|
||||||
r"<iframe[^>]+src=['\"](?P<url>https?://www\.senate\.gov/isvp/?\?[^'\"]+)['\"]",
|
|
||||||
webpage)
|
|
||||||
if mobj:
|
|
||||||
return mobj.group('url')
|
|
||||||
|
|
||||||
def _get_info_for_comm(self, committee):
|
|
||||||
for entry in self._COMM_MAP:
|
|
||||||
if entry[0] == committee:
|
|
||||||
return entry[1:]
|
|
||||||
|
|
||||||
def _real_extract(self, url):
|
|
||||||
url, smuggled_data = unsmuggle_url(url, {})
|
|
||||||
|
|
||||||
qs = compat_parse_qs(self._match_valid_url(url).group('qs'))
|
|
||||||
if not qs.get('filename') or not qs.get('type') or not qs.get('comm'):
|
|
||||||
raise ExtractorError('Invalid URL', expected=True)
|
|
||||||
|
|
||||||
video_id = re.sub(r'.mp4$', '', qs['filename'][0])
|
|
||||||
|
|
||||||
webpage = self._download_webpage(url, video_id)
|
|
||||||
|
|
||||||
if smuggled_data.get('force_title'):
|
|
||||||
title = smuggled_data['force_title']
|
|
||||||
else:
|
|
||||||
title = self._html_search_regex(r'<title>([^<]+)</title>', webpage, video_id)
|
|
||||||
poster = qs.get('poster')
|
|
||||||
thumbnail = poster[0] if poster else None
|
|
||||||
|
|
||||||
video_type = qs['type'][0]
|
|
||||||
committee = video_type if video_type == 'arch' else qs['comm'][0]
|
|
||||||
stream_num, domain = self._get_info_for_comm(committee)
|
|
||||||
|
|
||||||
formats = []
|
|
||||||
if video_type == 'arch':
|
|
||||||
filename = video_id if '.' in video_id else video_id + '.mp4'
|
|
||||||
formats = [{
|
|
||||||
# All parameters in the query string are necessary to prevent a 403 error
|
|
||||||
'url': compat_urlparse.urljoin(domain, filename) + '?v=3.1.0&fp=&r=&g=',
|
|
||||||
}]
|
|
||||||
else:
|
|
||||||
hdcore_sign = 'hdcore=3.1.0'
|
|
||||||
url_params = (domain, video_id, stream_num)
|
|
||||||
f4m_url = '%s/z/%s_1@%s/manifest.f4m?' % url_params + hdcore_sign
|
|
||||||
m3u8_url = '%s/i/%s_1@%s/master.m3u8' % url_params
|
|
||||||
for entry in self._extract_f4m_formats(f4m_url, video_id, f4m_id='f4m'):
|
|
||||||
# URLs without the extra param induce an 404 error
|
|
||||||
entry.update({'extra_param_to_segment_url': hdcore_sign})
|
|
||||||
formats.append(entry)
|
|
||||||
for entry in self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4', m3u8_id='m3u8'):
|
|
||||||
mobj = re.search(r'(?P<tag>(?:-p|-b)).m3u8', entry['url'])
|
|
||||||
if mobj:
|
|
||||||
entry['format_id'] += mobj.group('tag')
|
|
||||||
formats.append(entry)
|
|
||||||
|
|
||||||
self._sort_formats(formats)
|
|
||||||
|
|
||||||
return {
|
|
||||||
'id': video_id,
|
|
||||||
'title': title,
|
|
||||||
'formats': formats,
|
|
||||||
'thumbnail': thumbnail,
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue