diff options
| author | Sergey M․ <dstftw@gmail.com> | 2018-04-28 02:48:20 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2018-04-28 02:51:18 +0700 |
| commit | ae1c585cee3eb183cddf7c30a09b75d887307dee (patch) | |
| tree | 39014376f60f835f2cb838da3828ccfc21009b90 | |
| parent | e7e4a6e0f9166cee82c165ca69a6a3c94ddc5f45 (diff) | |
| download | youtube-dl-ae1c585cee3eb183cddf7c30a09b75d887307dee.tar.xz | |
[vimeo] Extract JSON LD (closes #16295)
| -rw-r--r-- | youtube_dl/extractor/vimeo.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py index 08257147e..a026526b2 100644 --- a/youtube_dl/extractor/vimeo.py +++ b/youtube_dl/extractor/vimeo.py @@ -16,6 +16,7 @@ from ..utils import ( ExtractorError, InAdvancePagedList, int_or_none, + merge_dicts, NO_DEFAULT, RegexNotFoundError, sanitized_Request, @@ -639,16 +640,18 @@ class VimeoIE(VimeoBaseInfoExtractor): 'preference': 1, }) - info_dict = self._parse_config(config, video_id) - formats.extend(info_dict['formats']) + info_dict_config = self._parse_config(config, video_id) + formats.extend(info_dict_config['formats']) self._vimeo_sort_formats(formats) + json_ld = self._search_json_ld(webpage, video_id, default={}) + if not cc_license: cc_license = self._search_regex( r'<link[^>]+rel=["\']license["\'][^>]+href=(["\'])(?P<license>(?:(?!\1).)+)\1', webpage, 'license', default=None, group='license') - info_dict.update({ + info_dict = { 'id': video_id, 'formats': formats, 'timestamp': unified_timestamp(timestamp), @@ -658,7 +661,9 @@ class VimeoIE(VimeoBaseInfoExtractor): 'like_count': like_count, 'comment_count': comment_count, 'license': cc_license, - }) + } + + info_dict = merge_dicts(info_dict, info_dict_config, json_ld) return info_dict |