X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftoggle.py;h=c54b876d39678837bad4f7e5715fc02ddec747c1;hb=32f2627aed68ed2981f438067252b9921c4a39fe;hp=c9d6e52e18823a55037860865c39ab134a85fc96;hpb=cc0f378d5429225caf0477f5d10b342b1ef136d5;p=youtube-dl diff --git a/youtube_dl/extractor/toggle.py b/youtube_dl/extractor/toggle.py index c9d6e52e1..c54b876d3 100644 --- a/youtube_dl/extractor/toggle.py +++ b/youtube_dl/extractor/toggle.py @@ -16,7 +16,7 @@ from ..utils import ( class ToggleIE(InfoExtractor): - IE_NAME = 'togglesg' + IE_NAME = 'toggle' _VALID_URL = r'https?://video\.toggle\.sg/(?:en|zh)/(?:series|clips|movies)/(?:[^/]+/)+(?P[0-9]+)' _TESTS = [{ 'url': 'http://video.toggle.sg/en/series/lion-moms-tif/trailers/lion-moms-premier/343115', @@ -132,13 +132,11 @@ class ToggleIE(InfoExtractor): vid_format = vid_format.replace(' ', '') # if geo-restricted, m3u8 is inaccessible, but mp4 is okay if ext == 'm3u8': - m3u8_formats = self._extract_m3u8_formats( + formats.extend(self._extract_m3u8_formats( video_url, video_id, ext='mp4', m3u8_id=vid_format, note='Downloading %s m3u8 information' % vid_format, errnote='Failed to download %s m3u8 information' % vid_format, - fatal=False) - if m3u8_formats: - formats.extend(m3u8_formats) + fatal=False)) elif ext in ('mp4', 'wvm'): # wvm are drm-protected files formats.append({