RegexNotFoundError,
std_headers,
unsmuggle_url,
+ urlencode_postdata,
)
},
]
+ @classmethod
+ def suitable(cls, url):
+ if VimeoChannelIE.suitable(url):
+ # Otherwise channel urls like http://vimeo.com/channels/31259 would
+ # match
+ return False
+ else:
+ return super(VimeoIE, cls).suitable(url)
+
def _login(self):
(username, password) = self._get_login_info()
if username is None:
login_url = 'https://vimeo.com/log_in'
webpage = self._download_webpage(login_url, None, False)
token = self._search_regex(r'xsrft: \'(.*?)\'', webpage, 'login token')
- data = compat_urllib_parse.urlencode({'email': username,
- 'password': password,
- 'action': 'login',
- 'service': 'vimeo',
- 'token': token,
- })
+ data = urlencode_postdata({
+ 'email': username,
+ 'password': password,
+ 'action': 'login',
+ 'service': 'vimeo',
+ 'token': token,
+ })
login_request = compat_urllib_request.Request(login_url, data)
login_request.add_header('Content-Type', 'application/x-www-form-urlencoded')
login_request.add_header('Cookie', 'xsrft=%s' % token)
class VimeoChannelIE(InfoExtractor):
IE_NAME = 'vimeo:channel'
- _VALID_URL = r'(?:https?://)?vimeo\.com/channels/(?P<id>[^/]+)'
+ _VALID_URL = r'(?:https?://)?vimeo\.com/channels/(?P<id>[^/]+)/?(\?.*)?$'
_MORE_PAGES_INDICATOR = r'<a.+?rel="next"'
_TITLE_RE = r'<link rel="alternate"[^>]+?title="(.*?)"'