projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c5864a8
)
[vimeo] Fix login (Closes #6488)
author
Sergey M․
<dstftw@gmail.com>
Mon, 10 Aug 2015 17:35:08 +0000
(23:35 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Mon, 10 Aug 2015 17:35:08 +0000
(23:35 +0600)
youtube_dl/extractor/vimeo.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/vimeo.py
b/youtube_dl/extractor/vimeo.py
index 4c4e3c72ab7c9cec1105103dfbf912affa33420f..5bce78ac01ceca1471bf228bacf9c46a900c7f27 100644
(file)
--- a/
youtube_dl/extractor/vimeo.py
+++ b/
youtube_dl/extractor/vimeo.py
@@
-29,6
+29,7
@@
from ..utils import (
class VimeoBaseInfoExtractor(InfoExtractor):
_NETRC_MACHINE = 'vimeo'
_LOGIN_REQUIRED = False
class VimeoBaseInfoExtractor(InfoExtractor):
_NETRC_MACHINE = 'vimeo'
_LOGIN_REQUIRED = False
+ _LOGIN_URL = 'https://vimeo.com/log_in'
def _login(self):
(username, password) = self._get_login_info()
def _login(self):
(username, password) = self._get_login_info()
@@
-37,21
+38,25
@@
class VimeoBaseInfoExtractor(InfoExtractor):
raise ExtractorError('No login info available, needed for using %s.' % self.IE_NAME, expected=True)
return
self.report_login()
raise ExtractorError('No login info available, needed for using %s.' % self.IE_NAME, expected=True)
return
self.report_login()
- login_url = 'https://vimeo.com/log_in'
- webpage = self._download_webpage(login_url, None, False)
- token = self._search_regex(r'xsrft":"(.*?)"', webpage, 'login token')
+ webpage = self._download_webpage(self._LOGIN_URL, None, False)
+ token = self._extract_xsrft(webpage)
data = urlencode_postdata({
data = urlencode_postdata({
+ 'action': 'login',
'email': username,
'password': password,
'email': username,
'password': password,
- 'action': 'login',
'service': 'vimeo',
'token': token,
})
'service': 'vimeo',
'token': token,
})
- login_request = compat_urllib_request.Request(
login_url
, data)
+ login_request = compat_urllib_request.Request(
self._LOGIN_URL
, data)
login_request.add_header('Content-Type', 'application/x-www-form-urlencoded')
login_request.add_header('Content-Type', 'application/x-www-form-urlencoded')
- login_request.add_header('
Cookie', 'xsrft=%s' % token
)
+ login_request.add_header('
Referer', self._LOGIN_URL
)
self._download_webpage(login_request, None, False, 'Wrong login info')
self._download_webpage(login_request, None, False, 'Wrong login info')
+ def _extract_xsrft(self, webpage):
+ return self._search_regex(
+ r'xsrft\s*[=:]\s*(?P<q>["\'])(?P<xsrft>.+?)(?P=q)',
+ webpage, 'login token', group='xsrft')
+
class VimeoIE(VimeoBaseInfoExtractor):
"""Information extractor for vimeo.com."""
class VimeoIE(VimeoBaseInfoExtractor):
"""Information extractor for vimeo.com."""
@@
-193,7
+198,7
@@
class VimeoIE(VimeoBaseInfoExtractor):
password = self._downloader.params.get('videopassword', None)
if password is None:
raise ExtractorError('This video is protected by a password, use the --video-password option', expected=True)
password = self._downloader.params.get('videopassword', None)
if password is None:
raise ExtractorError('This video is protected by a password, use the --video-password option', expected=True)
- token = self._
search_regex(r'xsrft[\s=:"\']+([^"\']+)', webpage, 'login token'
)
+ token = self._
extract_xsrft(webpage
)
data = urlencode_postdata({
'password': password,
'token': token,
data = urlencode_postdata({
'password': password,
'token': token,
@@
-422,7
+427,7
@@
class VimeoIE(VimeoBaseInfoExtractor):
}
}
-class VimeoChannelIE(InfoExtractor):
+class VimeoChannelIE(
VimeoBase
InfoExtractor):
IE_NAME = 'vimeo:channel'
_VALID_URL = r'https://vimeo\.com/channels/(?P<id>[^/?#]+)/?(?:$|[?#])'
_MORE_PAGES_INDICATOR = r'<a.+?rel="next"'
IE_NAME = 'vimeo:channel'
_VALID_URL = r'https://vimeo\.com/channels/(?P<id>[^/?#]+)/?(?:$|[?#])'
_MORE_PAGES_INDICATOR = r'<a.+?rel="next"'
@@
-453,7
+458,7
@@
class VimeoChannelIE(InfoExtractor):
if password is None:
raise ExtractorError('This album is protected by a password, use the --video-password option', expected=True)
fields = self._hidden_inputs(login_form)
if password is None:
raise ExtractorError('This album is protected by a password, use the --video-password option', expected=True)
fields = self._hidden_inputs(login_form)
- token = self._
search_regex(r'xsrft[\s=:"\']+([^"\']+)', webpage, 'login token'
)
+ token = self._
extract_xsrft(webpage
)
fields['token'] = token
fields['password'] = password
post = urlencode_postdata(fields)
fields['token'] = token
fields['password'] = password
post = urlencode_postdata(fields)
@@
-603,7
+608,7
@@
class VimeoReviewIE(InfoExtractor):
return self.url_result(player_url, 'Vimeo', video_id)
return self.url_result(player_url, 'Vimeo', video_id)
-class VimeoWatchLaterIE(Vimeo
BaseInfoExtractor, Vimeo
ChannelIE):
+class VimeoWatchLaterIE(VimeoChannelIE):
IE_NAME = 'vimeo:watchlater'
IE_DESC = 'Vimeo watch later list, "vimeowatchlater" keyword (requires authentication)'
_VALID_URL = r'https://vimeo\.com/home/watchlater|:vimeowatchlater'
IE_NAME = 'vimeo:watchlater'
IE_DESC = 'Vimeo watch later list, "vimeowatchlater" keyword (requires authentication)'
_VALID_URL = r'https://vimeo\.com/home/watchlater|:vimeowatchlater'