Merge tag 'upstream/2013.08.08'

[youtubedl] / youtube_dl / extractor / vevo.py

diff --git a/youtube_dl/extractor/vevo.py b/youtube_dl/extractor/vevo.py
index aa88e1a92e587a9d68075ac6a5196e35ce7857af..67537eae5afecc158c13864c4dc494fd366076c3 100644 (file)
--- a/youtube_dl/extractor/vevo.py
+++ b/youtube_dl/extractor/vevo.py
@@ -3,7 +3,6 @@ import json
 
 from .common import InfoExtractor
 from ..utils import (
 
 from .common import InfoExtractor
 from ..utils import (

-    unified_strdate,

     ExtractorError,
 )
 
     ExtractorError,
 )
 


@@ -13,6 +12,16 @@ class VevoIE(InfoExtractor):
     (currently used by MTVIE)
     """
     _VALID_URL = r'((http://www.vevo.com/watch/.*?/.*?/)|(vevo:))(?P<id>.*)$'
     (currently used by MTVIE)
     """
     _VALID_URL = r'((http://www.vevo.com/watch/.*?/.*?/)|(vevo:))(?P<id>.*)$'

+    _TEST = {
+        u'url': u'http://www.vevo.com/watch/hurts/somebody-to-die-for/GB1101300280',
+        u'file': u'GB1101300280.mp4',
+        u'md5': u'06bea460acb744eab74a9d7dcb4bfd61',
+        u'info_dict': {
+            u"upload_date": u"20130624", 
+            u"uploader": u"Hurts", 
+            u"title": u"Somebody To Die For"
+        }
+    }

 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)


@@ -26,12 +35,12 @@ class VevoIE(InfoExtractor):
 
         self.report_extraction(video_id)
         video_info = json.loads(info_json)
 
         self.report_extraction(video_id)
         video_info = json.loads(info_json)

-        m_urls = list(re.finditer(r'<video src="(?P<ext>.*?):(?P<url>.*?)"', links_webpage))
+        m_urls = list(re.finditer(r'<video src="(?P<ext>.*?):/?(?P<url>.*?)"', links_webpage))

         if m_urls is None or len(m_urls) == 0:
             raise ExtractorError(u'Unable to extract video url')
         # They are sorted from worst to best quality
         m_url = m_urls[-1]
         if m_urls is None or len(m_urls) == 0:
             raise ExtractorError(u'Unable to extract video url')
         # They are sorted from worst to best quality
         m_url = m_urls[-1]

-        video_url = base_url + m_url.group('url')
+        video_url = base_url + '/' + m_url.group('url')

         ext = m_url.group('ext')
 
         return {'url': video_url,
         ext = m_url.group('ext')
 
         return {'url': video_url,