projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fb778e6
)
Support direct vimeo links (Closes #666)
author
Philipp Hagemeister
<phihag@phihag.de>
Tue, 5 Feb 2013 12:42:08 +0000
(13:42 +0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Tue, 5 Feb 2013 12:42:08 +0000
(13:42 +0100)
youtube_dl/InfoExtractors.py
patch
|
blob
|
history
diff --git
a/youtube_dl/InfoExtractors.py
b/youtube_dl/InfoExtractors.py
index b99a6c505239aeac965e8727c8c106b39eeeaadb..ac3ecea9252d56f9bc751be13cd6ad3ea5324753 100755
(executable)
--- a/
youtube_dl/InfoExtractors.py
+++ b/
youtube_dl/InfoExtractors.py
@@
-978,7
+978,7
@@
class VimeoIE(InfoExtractor):
"""Information extractor for vimeo.com."""
# _VALID_URL matches Vimeo URLs
"""Information extractor for vimeo.com."""
# _VALID_URL matches Vimeo URLs
- _VALID_URL = r'(?
:https?://)?(?:(?:www|player).)?vimeo\.com/(?:(?:groups|album)/[^/]+/)?(?:videos?/)?(
[0-9]+)'
+ _VALID_URL = r'(?
P<proto>https?://)?(?:(?:www|player)\.)?vimeo\.com/(?:(?:groups|album)/[^/]+/)?(?P<direct_link>play_redirect_hls\?clip_id=)?(?:videos?/)?(?P<id>
[0-9]+)'
IE_NAME = u'vimeo'
def __init__(self, downloader=None):
IE_NAME = u'vimeo'
def __init__(self, downloader=None):
@@
-999,7
+999,11
@@
class VimeoIE(InfoExtractor):
self._downloader.trouble(u'ERROR: Invalid URL: %s' % url)
return
self._downloader.trouble(u'ERROR: Invalid URL: %s' % url)
return
- video_id = mobj.group(1)
+ video_id = mobj.group('id')
+ if not mobj.group('proto'):
+ url = 'https://' + url
+ if mobj.group('direct_link'):
+ url = 'https://vimeo.com/' + video_id
# Retrieve video webpage to extract further information
request = compat_urllib_request.Request(url, None, std_headers)
# Retrieve video webpage to extract further information
request = compat_urllib_request.Request(url, None, std_headers)