depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-26 04:02:11 +00:00
Code Issues Releases Wiki Activity

[twitter] Fix extraction for videos with HLS streams

Browse source 
Closes #9623
This commit is contained in:
Yen Chi Hsuan 2016-06-08 21:28:10 +08:00
parent fc0a45fa41
commit c6308b3153
No known key found for this signature in database
GPG key ID: 3FDDD575826C5C30
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
youtube_dl/extractor/twitter.py
View file

@ -5,6 +5,7 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
determine_ext,
float_or_none, float_or_none,
xpath_text, xpath_text,
remove_end, remove_end,
@ -116,13 +117,16 @@ class TwitterCardIE(TwitterBaseIE):
video_url = config.get('video_url') or config.get('playlist', [{}])[0].get('source') video_url = config.get('video_url') or config.get('playlist', [{}])[0].get('source')
if video_url: if video_url:
f = { if determine_ext(video_url) == 'm3u8':
'url': video_url, 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') vmap_url = config.get('vmapUrl') or config.get('vmap_url')
if vmap_url: if vmap_url:
@ -263,7 +267,6 @@ class TwitterIE(InfoExtractor):
'add_ie': ['Vine'], 'add_ie': ['Vine'],
}, { }, {
'url': 'https://twitter.com/captainamerica/status/719944021058060289', 'url': 'https://twitter.com/captainamerica/status/719944021058060289',
# md5 constantly changes
'info_dict': { 'info_dict': {
'id': '719944021058060289', 'id': '719944021058060289',
'ext': 'mp4', 'ext': 'mp4',
@ -272,6 +275,9 @@ class TwitterIE(InfoExtractor):
'uploader_id': 'captainamerica', 'uploader_id': 'captainamerica',
'uploader': 'Captain America', 'uploader': 'Captain America',
}, },
'params': {
'skip_download': True, # requires ffmpeg
},
}] }]
def _real_extract(self, url): def _real_extract(self, url):