X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fjukebox.py;h=c7bb234fe9eec9bd848f2a19c4307722cc4bbca0;hb=1cf64ee4685e0f26b2d4dc28d9635351a36007b6;hp=95b9fd06db1c8d2d38a65a18723beaaf0334eac1;hpb=28ef06f7c28fa214841be6339bf3801b4834769a;p=youtube-dl

diff --git a/youtube_dl/extractor/jukebox.py b/youtube_dl/extractor/jukebox.py
index 95b9fd06d..c7bb234fe 100644
--- a/youtube_dl/extractor/jukebox.py
+++ b/youtube_dl/extractor/jukebox.py
@@ -1,3 +1,4 @@
+# coding: utf-8
 import re
 
 from .common import InfoExtractor
@@ -7,18 +8,14 @@ from ..utils import (
 )
 
 class JukeboxIE(InfoExtractor):
-    _VALID_URL = r'^http://www\.jukebox\.es\/.+[,](?P<video_id>[a-z0-9]+).html'
+    _VALID_URL = r'^http://www\.jukebox?\..+?\/.+[,](?P<video_id>[a-z0-9\-]+).html'
     _IFRAME = r'<iframe .*src="(?P<iframe>[^"]*)".*>'
     _VIDEO_URL = r'"config":{"file":"(?P<video_url>http:[^"]+[.](?P<video_ext>[^.?]+)[?]mdtk=[0-9]+)"'
     _TITLE = r'<h1 class="inline">(?P<title>[^<]+)</h1>.*<span id="infos_article_artist">(?P<artist>[^<]+)</span>'
-    _NOT_AVAILABLE = r'<span>Este video no está disponible por el momento [!]</span>'
     _IS_YOUTUBE = r'config":{"file":"(?P<youtube_url>http:[\\][/][\\][/]www[.]youtube[.]com[\\][/]watch[?]v=[^"]+)"'
-    IE_NAME = u'jukebox'
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
-        if mobj is None:
-            raise ExtractorError(u'Invalid URL: %s' % url)
         video_id = mobj.group('video_id')
 
         html = self._download_webpage(url, video_id)
@@ -29,7 +26,7 @@ class JukeboxIE(InfoExtractor):
         iframe_url = unescapeHTML(mobj.group('iframe'))
 
         iframe_html = self._download_webpage(iframe_url, video_id, 'Downloading iframe')
-        mobj = re.search(self._NOT_AVAILABLE, iframe_html)
+        mobj = re.search(r'class="jkb_waiting"', iframe_html)
         if mobj is not None:
             raise ExtractorError(u'Video is not available(in your country?)!')
 
@@ -41,8 +38,8 @@ class JukeboxIE(InfoExtractor):
             if mobj is None:
                 raise ExtractorError(u'Cannot extract video url')
             youtube_url = unescapeHTML(mobj.group('youtube_url')).replace('\/','/')
-            #TODO: call YoutubeIE !?
-            raise ExtractorError(u'found YT video. Please run youtube-dl again and use the following link: '+youtube_url+' ')
+            self.to_screen(u'Youtube video detected')
+            return self.url_result(youtube_url,ie='Youtube')
         video_url = unescapeHTML(mobj.group('video_url')).replace('\/','/')
         video_ext = unescapeHTML(mobj.group('video_ext'))