X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=youtube_dl%2Fextractor%2Faudiomack.py;h=6232d2cd041b7db63b4880f5d983980af65f8a65;hb=baa708036c64e2dce419b5f0648ee6b84ce2132e;hp=2ececa998437b90f6f47725f1527d4f028d6f848;hpb=9e9bc793f3abddc4824cfcb13f569163fb0a4ba7;p=youtube-dl diff --git a/youtube_dl/extractor/audiomack.py b/youtube_dl/extractor/audiomack.py index 2ececa998..6232d2cd0 100644 --- a/youtube_dl/extractor/audiomack.py +++ b/youtube_dl/extractor/audiomack.py @@ -1,10 +1,10 @@ -# Xavier Beynon 2014 # coding: utf-8 from __future__ import unicode_literals from .common import InfoExtractor from .soundcloud import SoundcloudIE -import datetime +from ..utils import ExtractorError + import time @@ -15,9 +15,9 @@ class AudiomackIE(InfoExtractor): #hosted on audiomack { 'url': 'http://www.audiomack.com/song/roosh-williams/extraordinary', - 'file': 'Roosh Williams - Extraordinary.mp3', 'info_dict': { + 'id' : 'roosh-williams/extraordinary', 'ext': 'mp3', 'title': 'Roosh Williams - Extraordinary' } @@ -38,30 +38,32 @@ class AudiomackIE(InfoExtractor): ] def _real_extract(self, url): - #id is what follows /song/ in url, usually the uploader name + title - id = url[url.index("/song/")+5:] + video_id = self._match_id(url) + + api_response = self._download_json( + "http://www.audiomack.com/api/music/url/song/%s?_=%d" % ( + video_id, time.time()), + video_id) - #Call the api, which gives us a json doc with the real url inside - rightnow = int(time.mktime(datetime.datetime.now().timetuple())) - apiresponse = self._download_json("http://www.audiomack.com/api/music/url/song"+id+"?_="+str(rightnow), id) - if not url in apiresponse: - raise Exception("Unable to deduce api url of song") - realurl = apiresponse["url"] + if "url" not in api_response: + raise ExtractorError("Unable to deduce api url of song") + realurl = api_response["url"] #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'(.*)', page, "artist") - songtitle = self._html_search_regex(r'