diff options
| author | coletdev <coletdjnz@protonmail.com> | 2022-03-14 11:03:40 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-13 22:03:40 +0000 |
| commit | b3edc8068e00d558d5fecf79ac36a1c8c7365e3a (patch) | |
| tree | 706d1e8a25fa299b75f6763d8c807b4ffc129ed1 | |
| parent | 17322130a954577bb03b833d5c435638e51e19f2 (diff) | |
| download | hypervideo-pre-b3edc8068e00d558d5fecf79ac36a1c8c7365e3a.tar.lz hypervideo-pre-b3edc8068e00d558d5fecf79ac36a1c8c7365e3a.tar.xz hypervideo-pre-b3edc8068e00d558d5fecf79ac36a1c8c7365e3a.zip | |
[downloader/mhtml] Fix fragments with absolute urls (#3044)
Authored-by: coletdjnz
| -rw-r--r-- | yt_dlp/downloader/mhtml.py | 6 | ||||
| -rw-r--r-- | yt_dlp/extractor/francetv.py | 2 | ||||
| -rw-r--r-- | yt_dlp/extractor/youtube.py | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/yt_dlp/downloader/mhtml.py b/yt_dlp/downloader/mhtml.py index 1477f65a6..bc86fd1bf 100644 --- a/yt_dlp/downloader/mhtml.py +++ b/yt_dlp/downloader/mhtml.py @@ -166,7 +166,11 @@ body > figure > img { if (i + 1) <= ctx['fragment_index']: 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) if not success: continue diff --git a/yt_dlp/extractor/francetv.py b/yt_dlp/extractor/francetv.py index 877c5c055..347a766d8 100644 --- a/yt_dlp/extractor/francetv.py +++ b/yt_dlp/extractor/francetv.py @@ -187,7 +187,7 @@ class FranceTVIE(InfoExtractor): 'protocol': 'mhtml', 'url': 'about:invalid', 'fragments': [{ - 'path': sheet, + 'url': sheet, # XXX: not entirely accurate; each spritesheet seems to be # a 10×10 grid of thumbnails corresponding to approximately # 2 seconds of the video; the last spritesheet may be shorter diff --git a/yt_dlp/extractor/youtube.py b/yt_dlp/extractor/youtube.py index 7e3f142c7..4fe9cec5b 100644 --- a/yt_dlp/extractor/youtube.py +++ b/yt_dlp/extractor/youtube.py @@ -3208,7 +3208,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor): 'width': width, 'height': height, 'fragments': [{ - 'path': url.replace('$M', str(j)), + 'url': url.replace('$M', str(j)), 'duration': min(fragment_duration, duration - (j * fragment_duration)), } for j in range(math.ceil(fragment_count))], } |