Mirrors
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[extractor/nbc] Fix `NBC` and `NBCStations` extractors (#6033) 

Improve `InfoExtractor._parse_smil_formats` extension detection
Closes #6019
Authored by: bashonly
This commit is contained in:
bashonly 2023-01-14 10:40:42 -06:00 committed by GitHub
parent 7481998b16
commit cb73b8460c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 151 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yt_dlp/extractor/common.py
View File

@ -32,6 +32,7 @@ from ..utils import (
FormatSorter, FormatSorter,
GeoRestrictedError, GeoRestrictedError,
GeoUtils, GeoUtils,
HEADRequest,
LenientJSONDecoder, LenientJSONDecoder,
RegexNotFoundError, RegexNotFoundError,
RetryManager, RetryManager,
@ -80,6 +81,7 @@ from ..utils import (
update_Request, update_Request,
update_url_query, update_url_query,
url_basename, url_basename,
urlhandle_detect_ext,
url_or_none, url_or_none,
urljoin, urljoin,
variadic, variadic,
@ -2311,7 +2313,8 @@ class InfoExtractor:
height = int_or_none(medium.get('height')) height = int_or_none(medium.get('height'))
proto = medium.get('proto') proto = medium.get('proto')
ext = medium.get('ext') ext = medium.get('ext')
src_ext = determine_ext(src) src_ext = determine_ext(src, default_ext=None) or ext or urlhandle_detect_ext(
self._request_webpage(HEADRequest(src), video_id, note='Requesting extension info', fatal=False))
streamer = medium.get('streamer') or base streamer = medium.get('streamer') or base
if proto == 'rtmp' or streamer.startswith('rtmp'): if proto == 'rtmp' or streamer.startswith('rtmp'):

229
yt_dlp/extractor/nbc.py
View File

@ -8,24 +8,26 @@ from .adobepass import AdobePassIE
from ..compat import compat_urllib_parse_unquote from ..compat import compat_urllib_parse_unquote
from ..utils import ( from ..utils import (
ExtractorError, ExtractorError,
HEADRequest,
RegexNotFoundError,
UserNotLive,
clean_html,
int_or_none, int_or_none,
parse_age_limit, parse_age_limit,
parse_duration, parse_duration,
RegexNotFoundError,
smuggle_url, smuggle_url,
str_or_none,
traverse_obj, traverse_obj,
try_get, try_get,
unified_strdate, unescapeHTML,
unified_timestamp, unified_timestamp,
update_url_query, update_url_query,
url_basename, url_basename,
variadic, xpath_attr,
) )
class NBCIE(ThePlatformIE): # XXX: Do not subclass from concrete IE class NBCIE(ThePlatformIE): # XXX: Do not subclass from concrete IE
_VALID_URL = r'https?(?P<permalink>://(?:www\.)?nbc\.com/(?:classic-tv/)?[^/]+/video/[^/]+/(?P<id>n?\d+))' _VALID_URL = r'https?(?P<permalink>://(?:www\.)?nbc\.com/(?:classic-tv/)?[^/]+/video/[^/]+/(?P<id>(?:NBCE|n)?\d+))'
_TESTS = [ _TESTS = [
{ {
@ -38,10 +40,18 @@ class NBCIE(ThePlatformIE): # XXX: Do not subclass from concrete IE
'timestamp': 1424246400, 'timestamp': 1424246400,
'upload_date': '20150218', 'upload_date': '20150218',
'uploader': 'NBCU-COM', 'uploader': 'NBCU-COM',
'episode': 'Jimmy Fallon Surprises Fans at Ben & Jerry\'s',
'episode_number': 86,
'season': 'Season 2',
'season_number': 2,
'series': 'Tonight Show: Jimmy Fallon',
'duration': 237.0,
'chapters': 'count:1',
'tags': 'count:4',
'thumbnail': r're:https?://.+\.jpg',
}, },
'params': { 'params': {
# m3u8 download 'skip_download': 'm3u8',
'skip_download': True,
}, },
}, },
{ {
@ -55,11 +65,7 @@ class NBCIE(ThePlatformIE): # XXX: Do not subclass from concrete IE
'upload_date': '20141206', 'upload_date': '20141206',
'uploader': 'NBCU-COM', 'uploader': 'NBCU-COM',
}, },
'params': { 'skip': 'page not found',
# m3u8 download
'skip_download': True,
},
'skip': 'Only works from US',
}, },
{ {
# HLS streams requires the 'hdnea3' cookie # HLS streams requires the 'hdnea3' cookie
@ -73,10 +79,59 @@ class NBCIE(ThePlatformIE): # XXX: Do not subclass from concrete IE
'upload_date': '20090315', 'upload_date': '20090315',
'uploader': 'NBCU-COM', 'uploader': 'NBCU-COM',
}, },
'params': { 'skip': 'page not found',
'skip_download': True, },
{
# manifest url does not have extension
'url': 'https://www.nbc.com/the-golden-globe-awards/video/oprah-winfrey-receives-cecil-b-de-mille-award-at-the-2018-golden-globes/3646439',
'info_dict': {
'id': '3646439',
'ext': 'mp4',
'title': 'Oprah Winfrey Receives Cecil B. de Mille Award at the 2018 Golden Globes',
'episode': 'Oprah Winfrey Receives Cecil B. de Mille Award at the 2018 Golden Globes',
'episode_number': 1,
'season': 'Season 75',
'season_number': 75,
'series': 'The Golden Globe Awards',
'description': 'Oprah Winfrey receives the Cecil B. de Mille Award at the 75th Annual Golden Globe Awards.',
'uploader': 'NBCU-COM',
'upload_date': '20180107',
'timestamp': 1515312000,
'duration': 570.0,
'tags': 'count:8',
'thumbnail': r're:https?://.+\.jpg',
'chapters': 'count:1',
},
'params': {
'skip_download': 'm3u8',
},
},
{
# new video_id format
'url': 'https://www.nbc.com/quantum-leap/video/bens-first-leap-nbcs-quantum-leap/NBCE125189978',
'info_dict': {
'id': 'NBCE125189978',
'ext': 'mp4',
'title': 'Ben\'s First Leap | NBC\'s Quantum Leap',
'description': 'md5:a82762449b7ec4bb83291a7b355ebf8e',
'uploader': 'NBCU-COM',
'series': 'Quantum Leap',
'season': 'Season 1',
'season_number': 1,
'episode': 'Ben\'s First Leap | NBC\'s Quantum Leap',
'episode_number': 1,
'duration': 170.171,
'chapters': [],
'timestamp': 1663956155,
'upload_date': '20220923',
'tags': 'count:10',
'age_limit': 0,
'thumbnail': r're:https?://.+\.jpg',
},
'expected_warnings': ['Ignoring subtitle tracks'],
'params': {
'skip_download': 'm3u8',
}, },
'skip': 'Only works from US',
}, },
{ {
'url': 'https://www.nbc.com/classic-tv/charles-in-charge/video/charles-in-charge-pilot/n3310', 'url': 'https://www.nbc.com/classic-tv/charles-in-charge/video/charles-in-charge-pilot/n3310',
@ -600,21 +655,22 @@ class NBCStationsIE(InfoExtractor):
_TESTS = [{ _TESTS = [{
'url': 'https://www.nbclosangeles.com/news/local/large-structure-fire-in-downtown-la-prompts-smoke-odor-advisory/2968618/', 'url': 'https://www.nbclosangeles.com/news/local/large-structure-fire-in-downtown-la-prompts-smoke-odor-advisory/2968618/',
'md5': '462041d91bd762ef5a38b7d85d6dc18f',
'info_dict': { 'info_dict': {
'id': '2968618', 'id': '2968618',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Large Structure Fire in Downtown LA Prompts Smoke Odor Advisory', 'title': 'Large Structure Fire in Downtown LA Prompts Smoke Odor Advisory',
'description': None, 'description': 'md5:417ed3c2d91fe9d301e6db7b0942f182',
'timestamp': 1661135892, 'timestamp': 1661135892,
'upload_date': '20220821', 'upload_date': '20220822',
'uploader': 'NBC 4', 'uploader': 'NBC 4',
'uploader_id': 'KNBC', 'channel_id': 'KNBC',
'channel': 'nbclosangeles', 'channel': 'nbclosangeles',
}, },
'params': {
'skip_download': 'm3u8',
},
}, { }, {
'url': 'https://www.telemundoarizona.com/responde/huracan-complica-reembolso-para-televidente-de-tucson/2247002/', 'url': 'https://www.telemundoarizona.com/responde/huracan-complica-reembolso-para-televidente-de-tucson/2247002/',
'md5': '0917dcf7885be1023a9220630d415f67',
'info_dict': { 'info_dict': {
'id': '2247002', 'id': '2247002',
'ext': 'mp4', 'ext': 'mp4',
@ -623,9 +679,12 @@ class NBCStationsIE(InfoExtractor):
'timestamp': 1660886507, 'timestamp': 1660886507,
'upload_date': '20220819', 'upload_date': '20220819',
'uploader': 'Telemundo Arizona', 'uploader': 'Telemundo Arizona',
'uploader_id': 'KTAZ', 'channel_id': 'KTAZ',
'channel': 'telemundoarizona', 'channel': 'telemundoarizona',
}, },
'params': {
'skip_download': 'm3u8',
},
}] }]
_RESOLUTIONS = { _RESOLUTIONS = {
@ -644,48 +703,39 @@ class NBCStationsIE(InfoExtractor):
r'<script>var\s*nbc\s*=', webpage, 'NBC JSON data', video_id) r'<script>var\s*nbc\s*=', webpage, 'NBC JSON data', video_id)
pdk_acct = nbc_data.get('pdkAcct') or 'Yh1nAC' pdk_acct = nbc_data.get('pdkAcct') or 'Yh1nAC'
fw_ssid = traverse_obj(nbc_data, ('video', 'fwSSID')) fw_ssid = traverse_obj(nbc_data, ('video', 'fwSSID'))
fw_network_id = traverse_obj(nbc_data, ('video', 'fwNetworkID'), default='382114')
video_data = self._parse_json(self._html_search_regex( video_data = self._search_json(
r'data-videos="([^"]*)"', webpage, 'video data', default='{}'), video_id) r'data-videos="\[', webpage, 'video data', video_id, default={}, transform_source=unescapeHTML)
video_data = variadic(video_data)[0] video_data.update(self._search_json(
video_data.update(self._parse_json(self._html_search_regex( r'data-meta="', webpage, 'metadata', video_id, default={}, transform_source=unescapeHTML))
r'data-meta="([^"]*)"', webpage, 'metadata', default='{}'), video_id)) if not video_data:
raise ExtractorError('No video metadata found in webpage', expected=True)
formats = [] info, formats, subtitles = {}, [], {}
is_live = int_or_none(video_data.get('mpx_is_livestream')) == 1
if video_data.get('mpx_is_livestream') == '1':
live = True
player_id = traverse_obj(
video_data, 'mpx_m3upid', ('video', 'meta', 'mpx_m3upid'), 'mpx_pid',
('video', 'meta', 'mpx_pid'), 'pid_streaming_web_medium')
query = { query = {
'mbr': 'true', 'formats': 'MPEG-DASH none,M3U none,MPEG-DASH none,MPEG4,MP3',
'assetTypes': 'LegacyRelease', 'format': 'SMIL',
'fwsitesection': fw_ssid, 'fwsitesection': fw_ssid,
'fwNetworkID': fw_network_id, 'fwNetworkID': traverse_obj(nbc_data, ('video', 'fwNetworkID'), default='382114'),
'pprofile': 'ots_desktop_html', 'pprofile': 'ots_desktop_html',
'sensitive': 'false', 'sensitive': 'false',
'w': '1920', 'w': '1920',
'h': '1080', 'h': '1080',
'rnd': '1660303', 'mode': 'LIVE' if is_live else 'on-demand',
'mode': 'LIVE',
'format': 'SMIL',
'tracking': 'true',
'formats': 'M3U+none,MPEG-DASH+none,MPEG4,MP3',
'vpaid': 'script', 'vpaid': 'script',
'schema': '2.0', 'schema': '2.0',
'SDK': 'PDK+6.1.3', 'sdk': 'PDK 6.1.3',
}
info = {
'title': f'{channel} livestream',
} }
if is_live:
player_id = traverse_obj(video_data, ((None, ('video', 'meta')), (
'mpx_m3upid', 'mpx_pid', 'pid_streaming_web_medium')), get_all=False)
info['title'] = f'{channel} livestream'
else: else:
live = False player_id = traverse_obj(video_data, (
player_id = traverse_obj( (None, ('video', 'meta')), ('pid_streaming_web_high', 'mpx_pid')), get_all=False)
video_data, ('video', 'meta', 'pid_streaming_web_high'), 'pid_streaming_web_high',
('video', 'meta', 'mpx_pid'), 'mpx_pid')
date_string = traverse_obj(video_data, 'date_string', 'date_gmt') date_string = traverse_obj(video_data, 'date_string', 'date_gmt')
if date_string: if date_string:
@ -693,63 +743,58 @@ class NBCStationsIE(InfoExtractor):
r'datetime="([^"]+)"', date_string, 'date string', fatal=False) r'datetime="([^"]+)"', date_string, 'date string', fatal=False)
else: else:
date_string = traverse_obj( date_string = traverse_obj(
nbc_data, ('dataLayer', 'adobe', 'prop70'), ('dataLayer', 'adobe', 'eVar70'), nbc_data, ('dataLayer', 'adobe', ('prop70', 'eVar70', 'eVar59')), get_all=False)
('dataLayer', 'adobe', 'eVar59'))
video_url = traverse_obj(video_data, ('video', 'meta', 'mp4_url'), 'mp4_url') video_url = traverse_obj(video_data, ((None, ('video', 'meta')), 'mp4_url'), get_all=False)
if video_url: if video_url:
height = url_basename(video_url).split('-')[1].split('p')[0] height = self._search_regex(r'\d+-(\d+)p', url_basename(video_url), 'height', default=None)
formats.append({ formats.append({
'url': video_url, 'url': video_url,
'ext': 'mp4', 'ext': 'mp4',
'width': int_or_none(self._RESOLUTIONS.get(height)), 'width': int_or_none(self._RESOLUTIONS.get(height)),
'height': int_or_none(height), 'height': int_or_none(height),
'format_id': f'http-{height}', 'format_id': 'http-mp4',
}) })
query = { info.update({
'mbr': 'true', 'title': video_data.get('title') or traverse_obj(nbc_data, (
'assetTypes': 'LegacyRelease', 'dataLayer', (None, 'adobe'), ('contenttitle', 'title', 'prop22')), get_all=False),
'fwsitesection': fw_ssid, 'description':
'fwNetworkID': fw_network_id, traverse_obj(video_data, 'summary', 'excerpt', 'video_hero_text')
'format': 'redirect', or clean_html(traverse_obj(nbc_data, ('dataLayer', 'summary'))),
'manifest': 'm3u', 'timestamp': unified_timestamp(date_string),
'Tracking': 'true', })
'Embedded': 'true',
'formats': 'MPEG4',
}
info = {
'title': video_data.get('title') or traverse_obj(
nbc_data, ('dataLayer', 'contenttitle'), ('dataLayer', 'title'),
('dataLayer', 'adobe', 'prop22'), ('dataLayer', 'id')),
'description': traverse_obj(video_data, 'summary', 'excerpt', 'video_hero_text'),
'upload_date': str_or_none(unified_strdate(date_string)),
'timestamp': int_or_none(unified_timestamp(date_string)),
}
if not player_id: smil = None
raise ExtractorError( if player_id and fw_ssid:
'No video player ID or livestream player ID found in webpage', expected=True) smil = self._download_xml(
headers = {'Origin': f'https://www.{channel}.com'}
manifest, urlh = self._download_webpage_handle(
f'https://link.theplatform.com/s/{pdk_acct}/{player_id}', video_id, f'https://link.theplatform.com/s/{pdk_acct}/{player_id}', video_id,
headers=headers, query=query, note='Downloading manifest') note='Downloading SMIL data', query=query, fatal=is_live)
if live: if smil:
manifest_url = self._search_regex(r'<video src="([^"]*)', manifest, 'manifest URL') manifest_url = xpath_attr(smil, './/{*}video', 'src', fatal=is_live)
else: subtitles = self._parse_smil_subtitles(smil, '*')
manifest_url = urlh.geturl() fmts, subs = self._extract_m3u8_formats_and_subtitles(
manifest_url, video_id, 'mp4', m3u8_id='hls', fatal=is_live,
live=is_live, errnote='No HLS formats found')
formats.extend(fmts)
self._merge_subtitles(subs, target=subtitles)
formats.extend(self._extract_m3u8_formats( if not formats:
manifest_url, video_id, 'mp4', headers=headers, m3u8_id='hls', self.raise_no_formats('No video content found in webpage', expected=True)
fatal=live, live=live, errnote='No HLS formats found')) elif is_live:
try:
self._request_webpage(
HEADRequest(formats[0]['url']), video_id, note='Checking live status')
except ExtractorError:
raise UserNotLive(video_id=channel)
return { return {
'id': str_or_none(video_id), 'id': video_id,
'channel': channel, 'channel': channel,
'uploader': str_or_none(nbc_data.get('on_air_name')), 'channel_id': nbc_data.get('callLetters'),
'uploader_id': str_or_none(nbc_data.get('callLetters')), 'uploader': nbc_data.get('on_air_name'),
'formats': formats, 'formats': formats,
'is_live': live, 'subtitles': subtitles,
'is_live': is_live,
**info, **info,
} }