pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-14 14:28:00 +09:00
Code Issues Projects Releases Wiki Activity

[CBSLocal] Handle rehosted legacy Anvato video, add/fix tests

Browse Source 
Update regex for Anvato player JSON
This commit is contained in:
dirkf 2022-02-23 02:55:38 +00:00
parent 015954f21a
commit 108737d600
2 changed files with 67 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/extractor/anvato.py
View File

@ -207,7 +207,9 @@ class AnvatoIE(InfoExtractor):
_API_PREFIX = 'https://tkx.mp.lura.live/rest/v2/'
_API_KEY = '3hwbSuqqT690uxjNYBktSQpa5ZrpYYR0Iofx7NcJHyA'
_ANVP_RE = r'<script[^>]+\bdata-anvp\s*=\s*(["\'])(?P<anvp>(?:(?!\1).)+)\1'
_ANVP_RE = (
r'<script[^>]*>[^<]*?\bAnvatoPlayer\s*\(\s*["\w]+\s*\)\s*\.\s*init\s*\(\s*(?P<anvp>{[^<]+?})\s*\);',
r'<script[^>]+\bdata-anvp\s*=\s*(["\'])(?P<anvp>(?:(?!\1).)+)\1')
_AUTH_KEY = b'\x31\xc2\x42\x84\x9e\x73\xa0\xce'
_TESTS = [{
@ -381,7 +383,9 @@ class AnvatoIE(InfoExtractor):
@staticmethod
def _extract_urls(ie, webpage, video_id):
entries = []
for mobj in re.finditer(AnvatoIE._ANVP_RE, webpage):
anvp_res = AnvatoIE._ANVP_RE
for anvp_re in anvp_res if isinstance(anvp_res, (list, tuple, )) else (anvp_res, ):
for mobj in re.finditer(anvp_re, webpage):
anvplayer_data = ie._parse_json(
mobj.group('anvp'), video_id, transform_source=unescapeHTML,
fatal=False)

68
youtube_dl/extractor/cbslocal.py
View File

@ -5,6 +5,7 @@ from .anvato import AnvatoIE
from .sendtonews import SendtoNewsIE
from ..compat import compat_urlparse
from ..utils import (
merge_dicts,
parse_iso8601,
unified_timestamp,
)
@ -14,6 +15,8 @@ class CBSLocalIE(AnvatoIE):
_VALID_URL_BASE = r'https?://[a-z]+\.cbslocal\.com/'
_VALID_URL = _VALID_URL_BASE + r'video/(?P<id>\d+)'
_OLD_ANVATO_KEY = 'anvato_cbslocal_app_web_prod_547f3e49241ef0e5d30c79b2efbca5d92c698f67'
_TESTS = [{
'url': 'http://newyork.cbslocal.com/video/3580809-a-very-blue-anniversary/',
'info_dict': {
@ -30,10 +33,6 @@ class CBSLocalIE(AnvatoIE):
},
'categories': [
'Stations\\Spoken Word\\WCBSTV',
'Syndication\\AOL',
'Syndication\\MSN',
'Syndication\\NDN',
'Syndication\\Yahoo',
'Content\\News',
'Content\\News\\Local News',
],
@ -42,12 +41,21 @@ class CBSLocalIE(AnvatoIE):
'params': {
'skip_download': True,
},
'expected_warnings': ('Failed to download m3u8 information', ),
}]
def _real_extract(self, url):
mcp_id = self._match_id(url)
return self.url_result(
'anvato:anvato_cbslocal_app_web_prod_547f3e49241ef0e5d30c79b2efbca5d92c698f67:' + mcp_id, 'Anvato', mcp_id)
webpage = self._download_webpage(url, mcp_id)
json_ld = self._search_json_ld(webpage, mcp_id, fatal=False) or {}
json_ld.pop('url', None)
return merge_dicts(
self._extract_anvato_videos(webpage, mcp_id)
or self.url_result(self._OLD_ANVATO_KEY + ':' + mcp_id, 'Anvato', mcp_id),
json_ld)
class CBSLocalArticleIE(AnvatoIE):
@ -56,30 +64,25 @@ class CBSLocalArticleIE(AnvatoIE):
_TESTS = [{
# Anvato backend
'url': 'http://losangeles.cbslocal.com/2016/05/16/safety-advocates-say-fatal-car-seat-failures-are-public-health-crisis',
'md5': 'f0ee3081e3843f575fccef901199b212',
'only_matching': True
}, {
'url': 'https://losangeles.cbslocal.com/2022/02/16/rams-super-bowl-parade-to-take-place-wednesday/',
'md5': '36bdac3fb24ec8a6d7790218a0357b08',
'info_dict': {
'id': '3401037',
'id': '6201053',
'ext': 'mp4',
'title': 'Safety Advocates Say Fatal Car Seat Failures Are \'Public Health Crisis\'',
'description': 'Collapsing seats have been the focus of scrutiny for decades, though experts say remarkably little has been done to address the issue. Randy Paige reports.',
'thumbnail': 're:^https?://.*',
'timestamp': 1463440500,
'upload_date': '20160516',
'display_id': 'rams-super-bowl-parade-to-take-place-wednesday',
'upload_date': '20220216',
'uploader': 'CBS',
'subtitles': {
'en': 'mincount:5',
},
'description': 'Jeff Nguyen is live from outside the L.A. Memorial Coliseum where fans cheered on the Los Angeles Rams.',
'timestamp': 1645044990,
'title': 'Rams Fans Gather Outside The LA Memorial Coliseum',
'categories': [
'Stations\\Spoken Word\\KCBSTV',
'Syndication\\MSN',
'Syndication\\NDN',
'Syndication\\AOL',
'Syndication\\Yahoo',
'Syndication\\Tribune',
'Syndication\\Curb.tv',
'Content\\News'
'Stations\\Spoken Word\\KCALTV',
'Content\\News',
'Content\\Top Story',
],
'tags': ['CBS 2 News Evening'],
'tags': ['KCAL 9 News Afternoon'],
},
}, {
# SendtoNews embed
@ -92,18 +95,24 @@ class CBSLocalArticleIE(AnvatoIE):
# m3u8 download
'skip_download': True,
},
'skip': 'Redirects to CBS News home page',
}]
def _real_extract(self, url):
display_id = self._match_id(url)
webpage = self._download_webpage(url, display_id)
json_ld = self._search_json_ld(webpage, display_id, fatal=False) or {}
json_ld.pop('url', None)
sendtonews_url = SendtoNewsIE._extract_url(webpage)
if sendtonews_url:
return self.url_result(
result = self.url_result(
compat_urlparse.urljoin(url, sendtonews_url),
ie=SendtoNewsIE.ie_key())
return merge_dicts(result, json_ld)
# returns a dict, or raises
info_dict = self._extract_anvato_videos(webpage, display_id)
timestamp = unified_timestamp(self._html_search_regex(
@ -111,9 +120,10 @@ class CBSLocalArticleIE(AnvatoIE):
'released date', default=None)) or parse_iso8601(
self._html_search_meta('uploadDate', webpage))
info_dict.update({
return merge_dicts(
info_dict,
json_ld,
{
'display_id': display_id,
'timestamp': timestamp,
})
return info_dict