From a172b258ac1f9a328b9302eaf3b0205b70fdc3f4 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 13 May 2014 09:50:03 +0200
Subject: [PATCH] [vine:user] Simplify
---
youtube_dl/extractor/vine.py | 47 ++++++++++++++++--------------------
1 file changed, 21 insertions(+), 26 deletions(-)
diff --git a/youtube_dl/extractor/vine.py b/youtube_dl/extractor/vine.py
index 99e0b6400..076c87119 100644
--- a/youtube_dl/extractor/vine.py
+++ b/youtube_dl/extractor/vine.py
@@ -60,37 +60,32 @@ class VineIE(InfoExtractor):
'formats': formats,
}
+
class VineUserIE(InfoExtractor):
IE_NAME = 'vine:user'
_VALID_URL = r'(?:https?://)?vine\.co/(?P<user>[^/]+)/?(\?.*)?$'
_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)
+
+ profile_url = "%sapi/users/profiles/vanity/%s" % (
+ self._VINE_BASE_URL, user)
+ profile_data = self._download_json(
+ profile_url, user, note='Downloading user profile data')
+
+ 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
+
+ entries = [
+ self.url_result(e['permalinkUrl'], 'Vine') for e in timeline_data]
+ return self.playlist_result(entries, user)