diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-08-27 03:27:20 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-08-27 03:31:40 +0700 |
| commit | ff17be3ac921910e5cab6f54a579f379dacae068 (patch) | |
| tree | ae1b5fd4bfe4ee5712b56c6207e95e6a39da1da7 | |
| parent | 1ed4549942c34cce52b9c641cf9f532c38866149 (diff) | |
| download | youtube-dl-ff17be3ac921910e5cab6f54a579f379dacae068.tar.xz | |
[extractor/generic] Extract from LD-JSON last of all
Previous sources may contain several formats, e.g. http://tamasha.com/v/PgGZ
| -rw-r--r-- | youtube_dl/extractor/generic.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 49b00b87e..c81efdc00 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -2871,12 +2871,6 @@ class GenericIE(InfoExtractor): merged[k] = v return merged - # Looking for http://schema.org/VideoObject - json_ld = self._search_json_ld( - webpage, video_id, default={}, expected_type='VideoObject') - if json_ld.get('url'): - return merge_dicts(json_ld, info_dict) - # Look for HTML5 media entries = self._parse_html5_media_entries(url, webpage, video_id, m3u8_id='hls') if entries: @@ -2895,6 +2889,12 @@ class GenericIE(InfoExtractor): jwplayer_data, video_id, require_title=False, base_url=url) return merge_dicts(info, info_dict) + # Looking for http://schema.org/VideoObject + json_ld = self._search_json_ld( + webpage, video_id, default={}, expected_type='VideoObject') + if json_ld.get('url'): + return merge_dicts(json_ld, info_dict) + def check_video(vurl): if YoutubeIE.suitable(vurl): return True |