midgard/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[twitter] Now Twitter serves the same file for Firefox and Chrome

Browse source
This commit is contained in:
Yen Chi Hsuan 2016-03-03 14:27:27 +08:00
parent b8972bd69d
commit c8398a9b87
1 changed files with 47 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
youtube_dl/extractor/twitter.py
View file

@ -10,7 +10,6 @@ from ..utils import (
remove_end,
int_or_none,
ExtractorError,
sanitized_Request,
)
@ -87,20 +86,11 @@ class TwitterCardIE(TwitterBaseIE):
def _real_extract(self, url):
video_id = self._match_id(url)
# Different formats served for different User-Agents
USER_AGENTS = [
'Mozilla/5.0 (X11; Linux x86_64; rv:10.0) Gecko/20150101 Firefox/20.0 (Chrome)', # mp4
'Mozilla/5.0 (Windows NT 5.2; WOW64; rv:38.0) Gecko/20100101 Firefox/38.0', # webm
]
config = None
formats = []
duration = None
for user_agent in USER_AGENTS:
request = sanitized_Request(url)
request.add_header('User-Agent', user_agent)
webpage = self._download_webpage(request, video_id)
webpage = self._download_webpage(url, video_id)
iframe_url = self._html_search_regex(
r'<iframe[^>]+src="((?:https?:)?//(?:www.youtube.com/embed/[^"]+|(?:www\.)?vine\.co/v/\w+/card))"',
@ -127,14 +117,12 @@ class TwitterCardIE(TwitterBaseIE):
'height': int(m.group('height')),
})
formats.append(f)
continue
vmap_url = config.get('vmapUrl') or config.get('vmap_url')
if vmap_url:
formats.append({
'url': self._get_vmap_video_url(vmap_url, video_id),
})
break # same video regardless of UA
media_info = config.get('status', {}).get('entities', [{}])[0].get('mediaInfo', {})
if media_info:
@ -158,7 +146,6 @@ class TwitterCardIE(TwitterBaseIE):
formats.append(a_format)
duration = float_or_none(media_info.get('duration', {}).get('nanos'), scale=1e9)
break # same video regardless of UA
self._sort_formats(formats)