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

[generic] Allow further processing of json_ld URL 

Closes #2578
This commit is contained in:
pukkandan 2022-02-02 07:28:01 +05:30
parent d16df59db5
commit 85553414ae
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yt_dlp/extractor/common.py
View File

@ -1447,7 +1447,7 @@ class InfoExtractor(object):
'title': part.get('name'), 'title': part.get('name'),
'start_time': part.get('startOffset'), 'start_time': part.get('startOffset'),
'end_time': part.get('endOffset'), 'end_time': part.get('endOffset'),
} for part in e.get('hasPart', []) if part.get('@type') == 'Clip'] } for part in variadic(e.get('hasPart') or []) if part.get('@type') == 'Clip']
for idx, (last_c, current_c, next_c) in enumerate(zip( for idx, (last_c, current_c, next_c) in enumerate(zip(
[{'end_time': 0}] + chapters, chapters, chapters[1:])): [{'end_time': 0}] + chapters, chapters, chapters[1:])):
current_c['end_time'] = current_c['end_time'] or next_c['start_time'] current_c['end_time'] = current_c['end_time'] or next_c['start_time']

7
yt_dlp/extractor/generic.py
View File

@ -3815,13 +3815,16 @@ class GenericIE(InfoExtractor):
# Looking for http://schema.org/VideoObject # Looking for http://schema.org/VideoObject
json_ld = self._search_json_ld(webpage, video_id, default={}) json_ld = self._search_json_ld(webpage, video_id, default={})
if json_ld.get('url'): if json_ld.get('url') not in (url, None):
self.report_detected('JSON LD') self.report_detected('JSON LD')
if determine_ext(json_ld.get('url')) == 'm3u8': if determine_ext(json_ld['url']) == 'm3u8':
json_ld['formats'], json_ld['subtitles'] = self._extract_m3u8_formats_and_subtitles( json_ld['formats'], json_ld['subtitles'] = self._extract_m3u8_formats_and_subtitles(
json_ld['url'], video_id, 'mp4') json_ld['url'], video_id, 'mp4')
json_ld.pop('url') json_ld.pop('url')
self._sort_formats(json_ld['formats']) self._sort_formats(json_ld['formats'])
else:
json_ld['_type'] = 'url_transparent'
json_ld['url'] = smuggle_url(json_ld['url'], {'force_videoid': video_id, 'to_generic': True})
return merge_dicts(json_ld, info_dict) return merge_dicts(json_ld, info_dict)
def check_video(vurl): def check_video(vurl):