X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/9a117f94b4bfe84cfe1d904d5132aefcf41511c9..c9774cf13273185f8f8075590dce493a18ead418:/youtube_dl/extractor/vine.py diff --git a/youtube_dl/extractor/vine.py b/youtube_dl/extractor/vine.py index bdd3522..076c871 100644 --- a/youtube_dl/extractor/vine.py +++ b/youtube_dl/extractor/vine.py @@ -1,46 +1,91 @@ +from __future__ import unicode_literals + import re +import json +import itertools from .common import InfoExtractor +from ..utils import unified_strdate class VineIE(InfoExtractor): - _VALID_URL = r'(?:https?://)?(?:www\.)?vine\.co/v/(?P\w+)' + _VALID_URL = r'https?://(?:www\.)?vine\.co/v/(?P\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', + 'title': 'Chicken.', + 'description': 'Chicken.', + 'upload_date': '20130519', + 'uploader': 'Jack Dorsey', + 'uploader_id': '76', + }, } def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') - webpage_url = 'https://vine.co/v/' + video_id - webpage = self._download_webpage(webpage_url, video_id) - self.report_extraction(video_id) + webpage = self._download_webpage('https://vine.co/v/' + video_id, video_id) + + data = json.loads(self._html_search_regex( + r'window\.POST_DATA = { %s: ({.+?}) }' % video_id, webpage, 'vine data')) + + formats = [ + { + 'url': data['videoLowURL'], + 'ext': 'mp4', + 'format_id': 'low', + }, + { + 'url': data['videoUrl'], + 'ext': 'mp4', + 'format_id': 'standard', + } + ] - video_url = self._html_search_regex(r'[^/]+)/?(\?.*)?$' + _VINE_BASE_URL = "https://vine.co/" - video_title = self._html_search_regex(r'.*?

(.+?)

', - webpage, u'uploader', fatal=False, flags=re.DOTALL) + user_id = profile_data['data']['userId'] + timeline_data = [] + for pagenum in itertools.count(1): + timeline_url = "%sapi/timelines/users/%s?page=%s" % ( + self._VINE_BASE_URL, user_id, pagenum) + timeline_page = self._download_json( + timeline_url, user, note='Downloading page %d' % pagenum) + timeline_data.extend(timeline_page['data']['records']) + if timeline_page['data']['nextPage'] is None: + break - return [{ - 'id': video_id, - 'url': video_url, - 'ext': 'mp4', - 'title': video_title, - 'thumbnail': thumbnail, - 'uploader': uploader, - }] + entries = [ + self.url_result(e['permalinkUrl'], 'Vine') for e in timeline_data] + return self.playlist_result(entries, user)