mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-01-07 17:16:08 +00:00
[vimeo] Fix password protected videos again (#5082)
Since they have changed again to the previous format, I've modified the regex to match both formats.
This commit is contained in:
parent
10831b5ec9
commit
2edce52584
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue