X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/bddc9fc577d16b1428924bf8a5c37ef1d9295f14..11021a3e7a38072a0072edc613930e0a1193196c:/youtube_dl/extractor/vine.py diff --git a/youtube_dl/extractor/vine.py b/youtube_dl/extractor/vine.py index b44b1cb..e14ff91 100644 --- a/youtube_dl/extractor/vine.py +++ b/youtube_dl/extractor/vine.py @@ -1,10 +1,22 @@ +from __future__ import unicode_literals + import re from .common import InfoExtractor class VineIE(InfoExtractor): - _VALID_URL = r'(?:https?://)?(?:www\.)?vine\.co/v/(?P\w+)' + _VALID_URL = r'https?://(?:www\.)?vine\.co/v/(?P\w+)' + _TEST = { + 'url': 'https://vine.co/v/b9KOOWX7HUx', + 'md5': '2f36fed6235b16da96ce9b4dc890940d', + 'info_dict': { + 'id': 'b9KOOWX7HUx', + 'ext': 'mp4', + 'uploader': 'Jack Dorsey', + 'title': 'Chicken.', + }, + } def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) @@ -15,23 +27,17 @@ class VineIE(InfoExtractor): self.report_extraction(video_id) - video_url = self._html_search_regex(r'.*?

(.+?)

', - webpage, u'uploader', fatal=False, flags=re.DOTALL) + uploader = self._html_search_regex(r'

(.*?)

', + webpage, 'uploader', fatal=False, flags=re.DOTALL) - return [{ - 'id': video_id, - 'url': video_url, - 'ext': 'mp4', - 'title': video_title, - 'thumbnail': thumbnail, - 'uploader': uploader, - }] + return { + 'id': video_id, + 'url': video_url, + 'ext': 'mp4', + 'title': self._og_search_title(webpage), + 'thumbnail': self._og_search_thumbnail(webpage), + 'uploader': uploader, + }