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

[downloader/mhtml] Fix fragments with absolute urls (#3044)

Browse source 
Authored-by: coletdjnz
This commit is contained in:
coletdev 2022-03-14 11:03:40 +13:00 committed by GitHub
parent 17322130a9
commit b3edc8068e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
yt_dlp/downloader/mhtml.py
View file

@ -166,7 +166,11 @@ body > figure > img {
if (i + 1) <= ctx['fragment_index']: if (i + 1) <= ctx['fragment_index']:
continue continue
fragment_url = urljoin(fragment_base_url, fragment['path']) fragment_url = fragment.get('url')
if not fragment_url:
assert fragment_base_url
fragment_url = urljoin(fragment_base_url, fragment['path'])
success, frag_content = self._download_fragment(ctx, fragment_url, info_dict) success, frag_content = self._download_fragment(ctx, fragment_url, info_dict)
if not success: if not success:
continue continue

2
yt_dlp/extractor/francetv.py
View file

@ -187,7 +187,7 @@ class FranceTVIE(InfoExtractor):
'protocol': 'mhtml', 'protocol': 'mhtml',
'url': 'about:invalid', 'url': 'about:invalid',
'fragments': [{ 'fragments': [{
'path': sheet, 'url': sheet,
# XXX: not entirely accurate; each spritesheet seems to be # XXX: not entirely accurate; each spritesheet seems to be
# a 10×10 grid of thumbnails corresponding to approximately # a 10×10 grid of thumbnails corresponding to approximately
# 2 seconds of the video; the last spritesheet may be shorter # 2 seconds of the video; the last spritesheet may be shorter

2
yt_dlp/extractor/youtube.py
View file

@ -3208,7 +3208,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
'width': width, 'width': width,
'height': height, 'height': height,
'fragments': [{ 'fragments': [{
'path': url.replace('$M', str(j)), 'url': url.replace('$M', str(j)),
'duration': min(fragment_duration, duration - (j * fragment_duration)), 'duration': min(fragment_duration, duration - (j * fragment_duration)),
} for j in range(math.ceil(fragment_count))], } for j in range(math.ceil(fragment_count))],
} }