diff options
| -rw-r--r-- | youtube_dl/extractor/vine.py | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/youtube_dl/extractor/vine.py b/youtube_dl/extractor/vine.py index 651ba317d..e14ff91d4 100644 --- a/youtube_dl/extractor/vine.py +++ b/youtube_dl/extractor/vine.py @@ -1,18 +1,21 @@ +from __future__ import unicode_literals + import re from .common import InfoExtractor class VineIE(InfoExtractor): - _VALID_URL = r'(?:https?://)?(?:www\.)?vine\.co/v/(?P<id>\w+)' + _VALID_URL = r'https?://(?:www\.)?vine\.co/v/(?P<id>\w+)' _TEST = { - u'url': u'https://vine.co/v/b9KOOWX7HUx', - u'file': u'b9KOOWX7HUx.mp4', - u'md5': u'2f36fed6235b16da96ce9b4dc890940d', - u'info_dict': { - u"uploader": u"Jack Dorsey", - u"title": u"Chicken." - } + 'url': 'https://vine.co/v/b9KOOWX7HUx', + 'md5': '2f36fed6235b16da96ce9b4dc890940d', + 'info_dict': { + 'id': 'b9KOOWX7HUx', + 'ext': 'mp4', + 'uploader': 'Jack Dorsey', + 'title': 'Chicken.', + }, } def _real_extract(self, url): @@ -24,17 +27,17 @@ class VineIE(InfoExtractor): self.report_extraction(video_id) - video_url = self._html_search_regex(r'<meta property="twitter:player:stream" content="(.+?)"', - webpage, u'video URL') + video_url = self._html_search_meta('twitter:player:stream', webpage, + 'video URL') uploader = self._html_search_regex(r'<p class="username">(.*?)</p>', - webpage, u'uploader', fatal=False, flags=re.DOTALL) + webpage, 'uploader', fatal=False, flags=re.DOTALL) - return [{ - 'id': video_id, - 'url': video_url, - 'ext': 'mp4', - 'title': self._og_search_title(webpage), + return { + 'id': video_id, + 'url': video_url, + 'ext': 'mp4', + 'title': self._og_search_title(webpage), 'thumbnail': self._og_search_thumbnail(webpage), - 'uploader': uploader, - }] + 'uploader': uploader, + } |