From ea783d01e1bbe56657bff752d062bfb1d8a9bc3e Mon Sep 17 00:00:00 2001 From: Jason Normore Date: Sat, 10 May 2014 23:18:20 -0400 Subject: [PATCH] Added VineUserIE extractor for vine user timeline Added vine user timeline extractor using unofficial vine api user profile and timeline api endpoints. --- test/test_playlists.py | 8 +++++++ youtube_dl/extractor/__init__.py | 5 ++++- youtube_dl/extractor/vine.py | 36 ++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/test/test_playlists.py b/test/test_playlists.py index fe6274e60..cc871698a 100644 --- a/test/test_playlists.py +++ b/test/test_playlists.py @@ -23,6 +23,7 @@ from youtube_dl.extractor import ( VimeoUserIE, VimeoAlbumIE, VimeoGroupsIE, + VineUserIE, UstreamChannelIE, SoundcloudSetIE, SoundcloudUserIE, @@ -102,6 +103,13 @@ class TestPlaylists(unittest.TestCase): self.assertEqual(result['title'], 'Rolex Awards for Enterprise') self.assertTrue(len(result['entries']) > 72) + def test_vine_user(self): + dl = FakeYDL() + ie = VineUserIE(dl) + result = ie.extract('https://vine.co/Visa') + self.assertIsPlaylist(result) + self.assertTrue(len(result['entries']) >= 50) + def test_ustream_channel(self): dl = FakeYDL() ie = UstreamChannelIE(dl) diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 9529077c7..bc5af1d9e 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -305,7 +305,10 @@ from .vimeo import ( VimeoReviewIE, VimeoWatchLaterIE, ) -from .vine import VineIE +from .vine import ( + VineIE, + VineUserIE, +) from .viki import VikiIE from .vk import VKIE from .vube import VubeIE diff --git a/youtube_dl/extractor/vine.py b/youtube_dl/extractor/vine.py index 5136ec466..99e0b6400 100644 --- a/youtube_dl/extractor/vine.py +++ b/youtube_dl/extractor/vine.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals import re import json +import itertools from .common import InfoExtractor from ..utils import unified_strdate @@ -58,3 +59,38 @@ class VineIE(InfoExtractor): 'repost_count': data['reposts']['count'], 'formats': formats, } + +class VineUserIE(InfoExtractor): + IE_NAME = 'vine:user' + _VALID_URL = r'(?:https?://)?vine\.co/(?P[^/]+)/?(\?.*)?$' + _VINE_BASE_URL = "https://vine.co/" + + def _profile_url(self, user): + return "%sapi/users/profiles/vanity/%s"%(self._VINE_BASE_URL, user) + + def _timeline_url(self, user_id, page=1): + return "%sapi/timelines/users/%s?page=%s"%(self._VINE_BASE_URL, user_id, page) + + def _profile_data(self, user): + return self._download_json(self._profile_url(user), user) + + def _timeline_data(self, user): + profile_data = self._profile_data(user) + user_id = profile_data['data']['userId'] + timeline_data = [] + for pagenum in itertools.count(1): + timeline_page = self._download_json(self._timeline_url(user_id, pagenum), user) + timeline_data.extend(timeline_page['data']['records']) + if timeline_page['data']['nextPage'] is None: + break + return timeline_data + + def _extract_videos(self, user): + timeline_data = self._timeline_data(user) + entries = [self.url_result(e['permalinkUrl'], 'Vine') for e in timeline_data] + return self.playlist_result(entries, user) + + def _real_extract(self, url): + mobj = re.match(self._VALID_URL, url) + user = mobj.group('user') + return self._extract_videos(user) -- 2.22.2