logo

youtube-dl

[mirror] Download/Watch videos from video hosters
commit: dbd82a1d4fff1655920e111cc25a7fd526d7bf9a
parent 76f0c50d3d3e2eb5903b61da08829699e902916d
Author: Sergey M․ <dstftw@gmail.com>
Date:   Sun,  1 Nov 2015 00:01:34 +0600

[extractor/common] Fix m3u8 extraction on failure

Diffstat:

Myoutube_dl/extractor/common.py7++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py @@ -943,13 +943,14 @@ class InfoExtractor(object): if re.match(r'^https?://', u) else compat_urlparse.urljoin(m3u8_url, u)) - m3u8_doc, urlh = self._download_webpage_handle( + res = self._download_webpage_handle( m3u8_url, video_id, note=note or 'Downloading m3u8 information', errnote=errnote or 'Failed to download m3u8 information', fatal=fatal) - if m3u8_doc is False: - return m3u8_doc + if res is False: + return res + m3u8_doc, urlh = res m3u8_url = urlh.geturl() last_info = None last_media = None