projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fc0a45f
)
[twitter] Fix extraction for videos with HLS streams
author
Yen Chi Hsuan
<yan12125@gmail.com>
Wed, 8 Jun 2016 13:28:10 +0000
(21:28 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Wed, 8 Jun 2016 13:28:10 +0000
(21:28 +0800)
Closes #9623
youtube_dl/extractor/twitter.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/twitter.py
b/youtube_dl/extractor/twitter.py
index 129103c645372d45ccfb15917b30beaccc518185..76421e533477b0b504b9f87ff36e5924155943f7 100644
(file)
--- 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 (
from .common import InfoExtractor
from ..utils import (
+ determine_ext,
float_or_none,
xpath_text,
remove_end,
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:
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:
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',
'add_ie': ['Vine'],
}, {
'url': 'https://twitter.com/captainamerica/status/719944021058060289',
- # md5 constantly changes
'info_dict': {
'id': '719944021058060289',
'ext': 'mp4',
'info_dict': {
'id': '719944021058060289',
'ext': 'mp4',
@@
-272,6
+275,9
@@
class TwitterIE(InfoExtractor):
'uploader_id': 'captainamerica',
'uploader': 'Captain America',
},
'uploader_id': 'captainamerica',
'uploader': 'Captain America',
},
+ 'params': {
+ 'skip_download': True, # requires ffmpeg
+ },
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):