Update upstream source from tag 'upstream/2018.09.10'

[youtubedl] / youtube_dl / extractor / toggle.py

diff --git a/youtube_dl/extractor/toggle.py b/youtube_dl/extractor/toggle.py
index 348d6ecdf19ecde7787cbb12331561c8bb2a0284..5e5efda0f0780fb98b7c37b788ad2734a837e90d 100644 (file)
--- a/youtube_dl/extractor/toggle.py
+++ b/youtube_dl/extractor/toggle.py
@@ -132,7 +132,7 @@ class ToggleIE(InfoExtractor):
         formats = []
         for video_file in info.get('Files', []):
             video_url, vid_format = video_file.get('URL'), video_file.get('Format')
         formats = []
         for video_file in info.get('Files', []):
             video_url, vid_format = video_file.get('URL'), video_file.get('Format')

-            if not video_url or not vid_format:
+            if not video_url or video_url == 'NA' or not vid_format:

                 continue
             ext = determine_ext(video_url)
             vid_format = vid_format.replace(' ', '')
                 continue
             ext = determine_ext(video_url)
             vid_format = vid_format.replace(' ', '')


@@ -143,6 +143,18 @@ class ToggleIE(InfoExtractor):
                     note='Downloading %s m3u8 information' % vid_format,
                     errnote='Failed to download %s m3u8 information' % vid_format,
                     fatal=False))
                     note='Downloading %s m3u8 information' % vid_format,
                     errnote='Failed to download %s m3u8 information' % vid_format,
                     fatal=False))

+            elif ext == 'mpd':
+                formats.extend(self._extract_mpd_formats(
+                    video_url, video_id, mpd_id=vid_format,
+                    note='Downloading %s MPD manifest' % vid_format,
+                    errnote='Failed to download %s MPD manifest' % vid_format,
+                    fatal=False))
+            elif ext == 'ism':
+                formats.extend(self._extract_ism_formats(
+                    video_url, video_id, ism_id=vid_format,
+                    note='Downloading %s ISM manifest' % vid_format,
+                    errnote='Failed to download %s ISM manifest' % vid_format,
+                    fatal=False))

             elif ext in ('mp4', 'wvm'):
                 # wvm are drm-protected files
                 formats.append({
             elif ext in ('mp4', 'wvm'):
                 # wvm are drm-protected files
                 formats.append({