vimeo: Apparently, all videos in vimeo are served in ISO containers.

[youtube-dl] / youtube-dl

diff --git a/youtube-dl b/youtube-dl
index 240b2bc7b17ecf554122f8a05960362215c730c3..b734c997c8e3678dae2a48bc12c4bbf33db0becf 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -1724,7 +1724,7 @@ class VimeoIE(InfoExtractor):
        """Information extractor for vimeo.com."""
 
        # _VALID_URL matches Vimeo URLs
-       _VALID_URL = r'(?:http://)?(?:(?:www|player).)?vimeo\.com/(?:video/)?([0-9]+)'
+       _VALID_URL = r'(?:https?://)?(?:(?:www|player).)?vimeo\.com/(?:groups/[^/]+/)?(?:videos?/)?([0-9]+)'
 
        def __init__(self, downloader=None):
                InfoExtractor.__init__(self, downloader)
@@ -1735,11 +1735,11 @@ class VimeoIE(InfoExtractor):
 
        def report_download_webpage(self, video_id):
                """Report webpage download."""
-               self._downloader.to_screen(u'[video.vimeo] %s: Downloading webpage' % video_id)
+               self._downloader.to_screen(u'[vimeo] %s: Downloading webpage' % video_id)
 
        def report_extraction(self, video_id):
                """Report information extraction."""
-               self._downloader.to_screen(u'[video.vimeo] %s: Extracting information' % video_id)
+               self._downloader.to_screen(u'[vimeo] %s: Extracting information' % video_id)
 
        def _real_initialize(self):
                return
@@ -1754,7 +1754,6 @@ class VimeoIE(InfoExtractor):
                # At this point we have a new video
                self._downloader.increment_downloads()
                video_id = mobj.group(1)
-               video_extension = 'flv' # FIXME
 
                # Retrieve video webpage to extract further information
                request = urllib2.Request("http://vimeo.com/moogaloop/load/clip:%s" % video_id, None, std_headers)
@@ -1826,7 +1825,7 @@ class VimeoIE(InfoExtractor):
                                'upload_date':  u'NA',
                                'title':        video_title,
                                'stitle':       simple_title,
-                               'ext':          video_extension.decode('utf-8'),
+                               'ext':          u'mp4',
                                'thumbnail':    video_thumbnail.decode('utf-8'),
                                'description':  video_description,
                                'thumbnail':    video_thumbnail,