about summary refs log tree commit diff
path: root/youtube_dl/extractor/twitter.py
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-06-08 21:28:10 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-06-08 21:28:10 +0800
commitc6308b3153acc57300f750f0061c63ffcba4d150 (patch)
treedf3b4541278a7b9752b41c7015ea26123264980d /youtube_dl/extractor/twitter.py
parentfc0a45fa416ad3e3ecf5936061efbb0328afa6b5 (diff)
downloadyoutube-dl-c6308b3153acc57300f750f0061c63ffcba4d150.tar.gz
youtube-dl-c6308b3153acc57300f750f0061c63ffcba4d150.tar.xz
youtube-dl-c6308b3153acc57300f750f0061c63ffcba4d150.zip
[twitter] Fix extraction for videos with HLS streams
Closes #9623
Diffstat (limited to 'youtube_dl/extractor/twitter.py')
-rw-r--r--youtube_dl/extractor/twitter.py18
1 files changed, 12 insertions, 6 deletions
diff --git a/youtube_dl/extractor/twitter.py b/youtube_dl/extractor/twitter.py
index 129103c64..76421e533 100644
--- a/youtube_dl/extractor/twitter.py
+++ b/youtube_dl/extractor/twitter.py
@@ -5,6 +5,7 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
+    determine_ext,
     float_or_none,
     xpath_text,
     remove_end,
@@ -116,13 +117,16 @@ class TwitterCardIE(TwitterBaseIE):
         video_url = config.get('video_url') or config.get('playlist', [{}])[0].get('source')
 
         if video_url:
-            f = {
-                'url': video_url,
-            }
+            if determine_ext(video_url) == 'm3u8':
+                formats.extend(self._extract_m3u8_formats(video_url, video_id, ext='mp4', m3u8_id='hls'))
+            else:
+                f = {
+                    'url': video_url,
+                }
 
-            _search_dimensions_in_video_url(f, video_url)
+                _search_dimensions_in_video_url(f, video_url)
 
-            formats.append(f)
+                formats.append(f)
 
         vmap_url = config.get('vmapUrl') or config.get('vmap_url')
         if vmap_url:
@@ -263,7 +267,6 @@ class TwitterIE(InfoExtractor):
         'add_ie': ['Vine'],
     }, {
         'url': 'https://twitter.com/captainamerica/status/719944021058060289',
-        # md5 constantly changes
         'info_dict': {
             'id': '719944021058060289',
             'ext': 'mp4',
@@ -272,6 +275,9 @@ class TwitterIE(InfoExtractor):
             'uploader_id': 'captainamerica',
             'uploader': 'Captain America',
         },
+        'params': {
+            'skip_download': True,  # requires ffmpeg
+        },
     }]
 
     def _real_extract(self, url):