diff options
author | Sergey M․ <[email protected]> | 2014-12-04 20:12:06 +0600 |
---|---|---|
committer | Sergey M․ <[email protected]> | 2014-12-04 20:12:06 +0600 |
commit | b128c9ed68394c5c6dd1c46f81d21314ed03ac18 (patch) | |
tree | be184e3d4d4aa7e7e502d2b55ed58b51b39a75d0 | |
parent | 9776bc7f57f061d133b204c056b1cebee775ddad (diff) | |
download | youtube-dl-b128c9ed68394c5c6dd1c46f81d21314ed03ac18.tar.gz youtube-dl-b128c9ed68394c5c6dd1c46f81d21314ed03ac18.zip |
[vine:user] Add support for another URL format (Closes #4365)
-rw-r--r-- | youtube_dl/extractor/vine.py | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/youtube_dl/extractor/vine.py b/youtube_dl/extractor/vine.py index 42995226e..4970b2f23 100644 --- a/youtube_dl/extractor/vine.py +++ b/youtube_dl/extractor/vine.py @@ -63,29 +63,36 @@ class VineIE(InfoExtractor): class VineUserIE(InfoExtractor): IE_NAME = 'vine:user' - _VALID_URL = r'(?:https?://)?vine\.co/(?P<user>[^/]+)/?(\?.*)?$' + _VALID_URL = r'(?:https?://)?vine\.co/(?P<u>u/)?(?P<user>[^/]+)/?(\?.*)?$' _VINE_BASE_URL = "https://vine.co/" - _TEST = { - 'url': 'https://vine.co/Visa', - 'info_dict': { - 'id': 'Visa', + _TESTS = [ + { + 'url': 'https://vine.co/Visa', + 'info_dict': { + 'id': 'Visa', + }, + 'playlist_mincount': 46, }, - 'playlist_mincount': 46, - } + { + 'url': 'https://vine.co/u/941705360593584128', + 'only_matching': True, + }, + ] def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) user = mobj.group('user') + u = mobj.group('u') - profile_url = "%sapi/users/profiles/vanity/%s" % ( - self._VINE_BASE_URL, user) + profile_url = "%sapi/users/profiles/%s%s" % ( + self._VINE_BASE_URL, 'vanity/' if not u else '', 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" % ( + timeline_url = "%sapi/timelines/users/%s?page=%s&size=100" % ( self._VINE_BASE_URL, user_id, pagenum) timeline_page = self._download_json( timeline_url, user, note='Downloading page %d' % pagenum) |