jcgruenhage/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[vimeo] Fix password protected videos again (#5082)

Browse source 
Since they have changed again to the previous format, I've modified the regex to match both formats.
This commit is contained in:
Jaime Marquínez Ferrándiz 2015-04-28 15:05:41 +02:00
parent 10831b5ec9
commit 2edce52584
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
youtube_dl/extractor/vimeo.py
View file

@ -177,7 +177,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
password = self._downloader.params.get('videopassword', None) password = self._downloader.params.get('videopassword', None)
if password is None: if password is None:
raise ExtractorError('This video is protected by a password, use the --video-password option', expected=True) raise ExtractorError('This video is protected by a password, use the --video-password option', expected=True)
token = self._search_regex(r'xsrft":"(.*?)"', webpage, 'login token') token = self._search_regex(r'xsrft[\s=:"\']+([^"\']+)', webpage, 'login token')
data = urlencode_postdata({ data = urlencode_postdata({
'password': password, 'password': password,
'token': token, 'token': token,
@ -441,7 +441,7 @@ class VimeoChannelIE(InfoExtractor):
name="([^"]+)"\s+ name="([^"]+)"\s+
value="([^"]*)" value="([^"]*)"
''', login_form)) ''', login_form))
token = self._search_regex(r'xsrft":"(.*?)"', webpage, 'login token') token = self._search_regex(r'xsrft[\s=:"\']+([^"\']+)', webpage, 'login token')
fields['token'] = token fields['token'] = token
fields['password'] = password fields['password'] = password
post = urlencode_postdata(fields) post = urlencode_postdata(fields)