kumi/yt-dlp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[extractor/nosnl] Add support for /video (#5590)

Browse source 
Authored by: HobbyistDev
This commit is contained in:
HobbyistDev 2022-12-10 17:34:55 +09:00 committed by GitHub
parent e318b5b87a
commit 3ac5476430
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
yt_dlp/extractor/nosnl.py
View file

@ -3,7 +3,7 @@ from ..utils import parse_duration, parse_iso8601, traverse_obj
class NOSNLArticleIE(InfoExtractor): class NOSNLArticleIE(InfoExtractor):
_VALID_URL = r'https?://nos\.nl/((?!video)(\w+/)?\w+/)\d+-(?P<display_id>[\w-]+)' _VALID_URL = r'https?://nos\.nl/(?P<type>video|(\w+/)?\w+)/?\d+-(?P<display_id>[\w-]+)'
_TESTS = [ _TESTS = [
{ {
# only 1 video # only 1 video
@ -22,13 +22,14 @@ class NOSNLArticleIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': '2440409', 'id': '2440409',
'title': 'Vannacht sliepen weer enkele honderden asielzoekers in Ter Apel buiten', 'title': 'Vannacht sliepen weer enkele honderden asielzoekers in Ter Apel buiten',
'description': 'Er werd wel geprobeerd om kwetsbare migranten onderdak te bieden, zegt het COA.', 'description': 'md5:72b1e1674d798460e79d78fa37e9f56d',
'tags': ['aanmeldcentrum', 'Centraal Orgaan opvang asielzoekers', 'COA', 'asielzoekers', 'Ter Apel'], 'tags': ['aanmeldcentrum', 'Centraal Orgaan opvang asielzoekers', 'COA', 'asielzoekers', 'Ter Apel'],
'modified_timestamp': 1660452773, 'modified_timestamp': 1660452773,
'modified_date': '20220814', 'modified_date': '20220814',
'upload_date': '20220813', 'upload_date': '20220813',
'thumbnail': 'https://cdn.nos.nl/image/2022/07/18/880346/1024x576a.jpg', 'thumbnail': 'https://cdn.nos.nl/image/2022/07/18/880346/1024x576a.jpg',
'timestamp': 1660401384, 'timestamp': 1660401384,
'categories': ['Regionaal nieuws', 'Binnenland'],
}, },
'playlist_count': 2, 'playlist_count': 2,
}, { }, {
@ -37,20 +38,37 @@ class NOSNLArticleIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': '2440789', 'id': '2440789',
'title': 'Wekdienst 16/8: Groningse acties tien jaar na zware aardbeving • Femke Bol in actie op EK atletiek ', 'title': 'Wekdienst 16/8: Groningse acties tien jaar na zware aardbeving • Femke Bol in actie op EK atletiek ',
'description': 'Nieuws, weer, verkeer: met dit overzicht begin je geïnformeerd aan de dag.', 'description': 'md5:0bd277ed7a44fc15cb12a9d27d8f6641',
'tags': ['wekdienst'], 'tags': ['wekdienst'],
'modified_date': '20220816', 'modified_date': '20220816',
'modified_timestamp': 1660625449, 'modified_timestamp': 1660625449,
'timestamp': 1660625449, 'timestamp': 1660625449,
'upload_date': '20220816', 'upload_date': '20220816',
'thumbnail': 'https://cdn.nos.nl/image/2022/08/16/888178/1024x576a.jpg', 'thumbnail': 'https://cdn.nos.nl/image/2022/08/16/888178/1024x576a.jpg',
'categories': ['Binnenland', 'Buitenland'],
}, },
'playlist_count': 2, 'playlist_count': 2,
}, {
# video url
'url': 'https://nos.nl/video/2452718-xi-en-trudeau-botsen-voor-de-camera-op-g20-top-je-hebt-gelekt',
'info_dict': {
'id': '2452718',
'title': 'Xi en Trudeau botsen voor de camera op G20-top: \'Je hebt gelekt\'',
'modified_date': '20221117',
'description': 'md5:61907dac576f75c11bf8ffffd4a3cc0f',
'tags': ['Xi', 'Trudeau', 'G20', 'indonesié'],
'upload_date': '20221117',
'thumbnail': 'https://cdn.nos.nl/image/2022/11/17/916155/1024x576a.jpg',
'modified_timestamp': 1668663388,
'timestamp': 1668663388,
'categories': ['Buitenland'],
},
'playlist_mincount': 1,
} }
] ]
def _entries(self, nextjs_json, display_id): def _entries(self, nextjs_json, display_id):
for item in nextjs_json['items']: for item in nextjs_json:
if item.get('type') == 'video': if item.get('type') == 'video':
formats, subtitle = self._extract_m3u8_formats_and_subtitles( formats, subtitle = self._extract_m3u8_formats_and_subtitles(
traverse_obj(item, ('source', 'url')), display_id, ext='mp4') traverse_obj(item, ('source', 'url')), display_id, ext='mp4')
@ -77,13 +95,14 @@ class NOSNLArticleIE(InfoExtractor):
} }
def _real_extract(self, url): def _real_extract(self, url):
display_id = self._match_valid_url(url).group('display_id') site_type, display_id = self._match_valid_url(url).group('type', 'display_id')
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
nextjs_json = self._search_nextjs_data(webpage, display_id)['props']['pageProps']['data'] nextjs_json = self._search_nextjs_data(webpage, display_id)['props']['pageProps']['data']
return { return {
'_type': 'playlist', '_type': 'playlist',
'entries': self._entries(nextjs_json, display_id), 'entries': self._entries(
[nextjs_json['video']] if site_type == 'video' else nextjs_json['items'], display_id),
'id': str(nextjs_json['id']), 'id': str(nextjs_json['id']),
'title': nextjs_json.get('title') or self._html_search_meta(['title', 'og:title', 'twitter:title'], webpage), 'title': nextjs_json.get('title') or self._html_search_meta(['title', 'og:title', 'twitter:title'], webpage),
'description': (nextjs_json.get('description') 'description': (nextjs_json.get('description')
@ -91,5 +110,6 @@ class NOSNLArticleIE(InfoExtractor):
'tags': nextjs_json.get('keywords'), 'tags': nextjs_json.get('keywords'),
'modified_timestamp': parse_iso8601(nextjs_json.get('modifiedAt')), 'modified_timestamp': parse_iso8601(nextjs_json.get('modifiedAt')),
'thumbnail': nextjs_json.get('shareImageSrc') or self._html_search_meta(['og:image', 'twitter:image'], webpage), 'thumbnail': nextjs_json.get('shareImageSrc') or self._html_search_meta(['og:image', 'twitter:image'], webpage),
'timestamp': parse_iso8601(nextjs_json.get('publishedAt')) 'timestamp': parse_iso8601(nextjs_json.get('publishedAt')),
'categories': traverse_obj(nextjs_json, ('categories', ..., 'label')),
} }