Merge tag 'upstream/2014.11.21'

[youtubedl] / youtube_dl / extractor / mixcloud.py

diff --git a/youtube_dl/extractor/mixcloud.py b/youtube_dl/extractor/mixcloud.py
index 5f64e7bd0d98b74aea2a4350a51f057b4d0280ba..bb8937c4d53d33df6b560aff7d56df80740bf1cc 100644 (file)
--- a/youtube_dl/extractor/mixcloud.py
+++ b/youtube_dl/extractor/mixcloud.py
@@ -6,6 +6,7 @@ from .common import InfoExtractor
 from ..utils import (
     compat_urllib_parse,
     ExtractorError,
 from ..utils import (
     compat_urllib_parse,
     ExtractorError,

+    HEADRequest,

     int_or_none,
     parse_iso8601,
 )
     int_or_none,
     parse_iso8601,
 )


@@ -32,22 +33,22 @@ class MixcloudIE(InfoExtractor):
         },
     }
 
         },
     }
 

-    def check_urls(self, url_list):
-        """Returns 1st active url from list"""
-        for url in url_list:
+    def _get_url(self, track_id, template_url):
+        server_count = 30
+        for i in range(server_count):
+            url = template_url % i

             try:
                 # We only want to know if the request succeed
                 # don't download the whole file
             try:
                 # We only want to know if the request succeed
                 # don't download the whole file

-                self._request_webpage(url, None, False)
+                self._request_webpage(
+                    HEADRequest(url), track_id,
+                    'Checking URL %d/%d ...' % (i + 1, server_count + 1))

                 return url
             except ExtractorError:
                 return url
             except ExtractorError:

-                url = None
+                pass

 
         return None
 
 
         return None
 

-    def _get_url(self, template_url):
-        return self.check_urls(template_url % i for i in range(30))
-

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


@@ -60,16 +61,16 @@ class MixcloudIE(InfoExtractor):
             r'\s(?:data-preview-url|m-preview)="(.+?)"', webpage, 'preview url')
         song_url = preview_url.replace('/previews/', '/c/originals/')
         template_url = re.sub(r'(stream\d*)', 'stream%d', song_url)
             r'\s(?:data-preview-url|m-preview)="(.+?)"', webpage, 'preview url')
         song_url = preview_url.replace('/previews/', '/c/originals/')
         template_url = re.sub(r'(stream\d*)', 'stream%d', song_url)

-        final_song_url = self._get_url(template_url)
+        final_song_url = self._get_url(track_id, template_url)

         if final_song_url is None:
             self.to_screen('Trying with m4a extension')
             template_url = template_url.replace('.mp3', '.m4a').replace('originals/', 'm4a/64/')
         if final_song_url is None:
             self.to_screen('Trying with m4a extension')
             template_url = template_url.replace('.mp3', '.m4a').replace('originals/', 'm4a/64/')

-            final_song_url = self._get_url(template_url)
+            final_song_url = self._get_url(track_id, template_url)

         if final_song_url is None:
             raise ExtractorError('Unable to extract track url')
 
         PREFIX = (
         if final_song_url is None:
             raise ExtractorError('Unable to extract track url')
 
         PREFIX = (

-            r'<div class="cloudcast-play-button-container"'
+            r'<div class="cloudcast-play-button-container[^"]*?"'

             r'(?:\s+[a-zA-Z0-9-]+(?:="[^"]+")?)*?\s+')
         title = self._html_search_regex(
             PREFIX + r'm-title="([^"]+)"', webpage, 'title')
             r'(?:\s+[a-zA-Z0-9-]+(?:="[^"]+")?)*?\s+')
         title = self._html_search_regex(
             PREFIX + r'm-title="([^"]+)"', webpage, 'title')