desastre
/
youtube-dl
forked from minhngoc25a/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[vimeo:album] Fix password protected videos 

Since it only uses https now, don't recognize http urls.
This commit is contained in:
Jaime Marquínez Ferrándiz 2015-03-06 22:16:26 +01:00
parent 9c85b5376d
commit d1508cd68d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/vimeo.py
View File

@ -429,10 +429,10 @@ 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 = \'(.*?)\'', webpage, 'login token')
fields['token'] = token fields['token'] = token
fields['password'] = password fields['password'] = password
post = compat_urllib_parse.urlencode(fields) post = urlencode_postdata(fields)
password_path = self._search_regex( password_path = self._search_regex(
r'action="([^"]+)"', login_form, 'password URL') r'action="([^"]+)"', login_form, 'password URL')
password_url = compat_urlparse.urljoin(page_url, password_path) password_url = compat_urlparse.urljoin(page_url, password_path)
@ -494,10 +494,10 @@ class VimeoUserIE(VimeoChannelIE):
class VimeoAlbumIE(VimeoChannelIE): class VimeoAlbumIE(VimeoChannelIE):
IE_NAME = 'vimeo:album' IE_NAME = 'vimeo:album'
_VALID_URL = r'https?://vimeo\.com/album/(?P<id>\d+)' _VALID_URL = r'https://vimeo\.com/album/(?P<id>\d+)'
_TITLE_RE = r'<header id="page_header">\n\s*<h1>(.*?)</h1>' _TITLE_RE = r'<header id="page_header">\n\s*<h1>(.*?)</h1>'
_TESTS = [{ _TESTS = [{
'url': 'http://vimeo.com/album/2632481', 'url': 'https://vimeo.com/album/2632481',
'info_dict': { 'info_dict': {
'id': '2632481', 'id': '2632481',
'title': 'Staff Favorites: November 2013', 'title': 'Staff Favorites: November 2013',
@ -521,7 +521,7 @@ class VimeoAlbumIE(VimeoChannelIE):
def _real_extract(self, url): def _real_extract(self, url):
album_id = self._match_id(url) album_id = self._match_id(url)
return self._extract_videos(album_id, 'http://vimeo.com/album/%s' % album_id) return self._extract_videos(album_id, 'https://vimeo.com/album/%s' % album_id)
class VimeoGroupsIE(VimeoAlbumIE): class VimeoGroupsIE(VimeoAlbumIE):