projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9776bc7
)
[vine:user] Add support for another URL format (Closes #4365)
author
Sergey M․
<dstftw@gmail.com>
Thu, 4 Dec 2014 14:12:06 +0000
(20:12 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 4 Dec 2014 14:12:06 +0000
(20:12 +0600)
youtube_dl/extractor/vine.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/vine.py
b/youtube_dl/extractor/vine.py
index 42995226e584b0ce4e0d207b6b702157ec6f4030..4970b2f23f6e1685da116cf48e85ba6ca2ede423 100644
(file)
--- 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'
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<u
ser>[^/]+)/?(\?.*)?$'
_VINE_BASE_URL = "https://vine.co/"
_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')
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):
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)
self._VINE_BASE_URL, user_id, pagenum)
timeline_page = self._download_json(
timeline_url, user, note='Downloading page %d' % pagenum)