Merge branch 'vimeo' of https://github.com/rbrito/youtube-dl

[youtube-dl.git] / youtube-dl

diff --git a/youtube-dl b/youtube-dl
index f8e9095..831ec56 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -2059,6 +2059,18 @@ class VimeoIE(InfoExtractor):
                        return
                sig = mobj.group(1).decode('utf-8')
 
+               # Vimeo specific: extract video quality information
+               mobj = re.search(r'<isHD>(\d+)</isHD>', webpage)
+               if mobj is None:
+                       self._downloader.trouble(u'ERROR: unable to extract video quality information')
+                       return
+               quality = mobj.group(1).decode('utf-8')
+
+               if int(quality) == 1:
+                       quality = 'hd'
+               else:
+                       quality = 'sd'
+
                # Vimeo specific: Extract request signature expiration
                mobj = re.search(r'<request_signature_expires>(.*?)</request_signature_expires>', webpage)
                if mobj is None:
@@ -2066,7 +2078,7 @@ class VimeoIE(InfoExtractor):
                        return
                sig_exp = mobj.group(1).decode('utf-8')
 
-               video_url = "http://vimeo.com/moogaloop/play/clip:%s/%s/%s" % (video_id, sig, sig_exp)
+               video_url = "http://vimeo.com/moogaloop/play/clip:%s/%s/%s/?q=%s" % (video_id, sig, sig_exp, quality)
 
                try:
                        # Process video information
@@ -3426,13 +3438,13 @@ class XVideosIE(InfoExtractor):
                # Extract video URL
                mobj = re.search(r'flv_url=(.+?)&', webpage)
                if mobj is None:
-                       self._downloader.trouble(u'ERROR: unable to extract video title')
+                       self._downloader.trouble(u'ERROR: unable to extract video url')
                        return
                video_url = urllib2.unquote(mobj.group(1).decode('utf-8'))
 
 
                # Extract title
-               mobj = re.search(r'<title>(.*?)</title>', webpage)
+               mobj = re.search(r'<title>(.*?)\s+-\s+XVID', webpage)
                if mobj is None:
                        self._downloader.trouble(u'ERROR: unable to extract video title')
                        return