X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Faudiomack.py;h=eeeec768fe302a508008e095f138690477594553;hb=b66e699877937b4520db885c82958714304bf74a;hp=bdcc512351dbaa726f148c96e00b7af14ba9cb57;hpb=fdfefa1b9c86ef58d943a26a157dc234c2df14d9;p=youtube-dl

diff --git a/youtube_dl/extractor/audiomack.py b/youtube_dl/extractor/audiomack.py
index bdcc51235..eeeec768f 100644
--- a/youtube_dl/extractor/audiomack.py
+++ b/youtube_dl/extractor/audiomack.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
 from .common import InfoExtractor
 from .soundcloud import SoundcloudIE
 from ..utils import ExtractorError
-import datetime
+
 import time
 
 
@@ -12,17 +12,17 @@ class AudiomackIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?audiomack\.com/song/(?P<id>[\w/-]+)'
     IE_NAME = 'audiomack'
     _TESTS = [
-        #hosted on audiomack
+        # hosted on audiomack
         {
             'url': 'http://www.audiomack.com/song/roosh-williams/extraordinary',
             'info_dict':
             {
-                'id' : 'roosh-williams/extraordinary',
+                'id': 'roosh-williams/extraordinary',
                 'ext': 'mp3',
                 'title': 'Roosh Williams - Extraordinary'
             }
         },
-        #hosted on soundcloud via audiomack
+        # hosted on soundcloud via audiomack
         {
             'url': 'http://www.audiomack.com/song/xclusiveszone/take-kare',
             'file': '172419696.mp3',
@@ -38,31 +38,32 @@ class AudiomackIE(InfoExtractor):
     ]
 
     def _real_extract(self, url):
-        #id is what follows /song/ in url, usually the uploader name + title
-        id = self._match_id(url)
+        video_id = self._match_id(url)
 
-        #Call the api, which gives us a json doc with the real url inside
-        rightnow = int(time.time())
-        apiresponse = self._download_json("http://www.audiomack.com/api/music/url/song/"+id+"?_="+str(rightnow), id)
+        api_response = self._download_json(
+            "http://www.audiomack.com/api/music/url/song/%s?_=%d" % (
+                video_id, time.time()),
+            video_id)
 
-        if "url" not in apiresponse:
+        if "url" not in api_response:
             raise ExtractorError("Unable to deduce api url of song")
-        realurl = apiresponse["url"]
+        realurl = api_response["url"]
 
-        #Audiomack wraps a lot of soundcloud tracks in their branded wrapper
+        # Audiomack wraps a lot of soundcloud tracks in their branded wrapper
         # - if so, pass the work off to the soundcloud extractor
         if SoundcloudIE.suitable(realurl):
-            sc = SoundcloudIE(downloader=self._downloader)
-            return sc._real_extract(realurl)
-        else:
-            #Pull out metadata
-            page = self._download_webpage(url, id)
-            artist = self._html_search_regex(r'<span class="artist">(.*)</span>', page, "artist")
-            songtitle = self._html_search_regex(r'<h1 class="profile-title song-title"><span class="artist">.*</span>(.*)</h1>', page, "title")
-            title = artist+" - "+songtitle
-            return {
-                'id': id,  # ignore id, which is not useful in song name
-                'title': title,
-                'url': realurl,
-                'ext': 'mp3'
-            }
+            return {'_type': 'url', 'url': realurl, 'ie_key': 'Soundcloud'}
+
+        webpage = self._download_webpage(url, video_id)
+        artist = self._html_search_regex(
+            r'<span class="artist">(.*?)</span>', webpage, "artist")
+        songtitle = self._html_search_regex(
+            r'<h1 class="profile-title song-title"><span class="artist">.*?</span>(.*?)</h1>',
+            webpage, "title")
+        title = artist + " - " + songtitle
+
+        return {
+            'id': video_id,
+            'title': title,
+            'url': realurl,
+        }