diff options
author | rupertbaxter2 <rupertbaxter2@yahoo.com> | 2014-08-03 15:23:01 -0700 |
---|---|---|
committer | rupertbaxter2 <rupertbaxter2@yahoo.com> | 2014-08-03 15:23:01 -0700 |
commit | 0aed8df2bf12c9e41f1cae7545f1e8379763cbf9 (patch) | |
tree | 12c2e62d2b3bffc31a7306956b3dd9f7206f127f /youtube_dl | |
parent | 2f61fe4cccc1ef4186943f4eed2e89f8fe2e2c23 (diff) | |
parent | 548f31d99c5439b1d9de849fe78e00341e887447 (diff) | |
download | youtube-dl-0aed8df2bf12c9e41f1cae7545f1e8379763cbf9.tar.xz |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl')
-rw-r--r-- | youtube_dl/extractor/vimeo.py | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py index a3c6e83b0..10844f39e 100644 --- a/youtube_dl/extractor/vimeo.py +++ b/youtube_dl/extractor/vimeo.py @@ -122,6 +122,21 @@ class VimeoIE(VimeoBaseInfoExtractor, SubtitlesInfoExtractor): }, }, { + 'url': 'http://vimeo.com/channels/keypeele/75629013', + 'md5': '2f86a05afe9d7abc0b9126d229bbe15d', + 'note': 'Video is freely available via original URL ' + 'and protected with password when accessed via http://vimeo.com/75629013', + 'info_dict': { + 'id': '75629013', + 'ext': 'mp4', + 'title': 'Key & Peele: Terrorist Interrogation', + 'description': 'md5:8678b246399b070816b12313e8b4eb5c', + 'uploader_id': 'atencio', + 'uploader': 'Peter Atencio', + 'duration': 187, + }, + }, + { 'url': 'http://vimeo.com/76979871', 'md5': '3363dd6ffebe3784d56f4132317fd446', 'note': 'Video with subtitles', @@ -196,8 +211,6 @@ class VimeoIE(VimeoBaseInfoExtractor, SubtitlesInfoExtractor): video_id = mobj.group('id') if mobj.group('pro') or mobj.group('player'): url = 'http://player.vimeo.com/video/' + video_id - else: - url = 'https://vimeo.com/' + video_id # Retrieve video webpage to extract further information request = compat_urllib_request.Request(url, None, headers) |