gitlab-com-dstftw/youtube-dl
1
0
Fork 0
mirror of https://gitlab.com/dstftw/youtube-dl.git synced 2020-11-16 09:42:26 +00:00
Code Issues Releases Wiki Activity

Made changes per phihag

Browse source
This commit is contained in:
xavier 2014-10-24 21:07:01 -05:00
parent 9e9bc793f3
commit fdfefa1b9c
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
youtube_dl/__init__.py
View file

@ -79,6 +79,7 @@ __authors__ = (
'Carlos Ramos', 'Carlos Ramos',
'5moufl', '5moufl',
'lenaten', 'lenaten',
'Xavier Beynon'
) )
__license__ = 'Public Domain' __license__ = 'Public Domain'

17
youtube_dl/extractor/audiomack.py
View file

@ -1,9 +1,9 @@
# Xavier Beynon 2014
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from .soundcloud import SoundcloudIE from .soundcloud import SoundcloudIE
from ..utils import ExtractorError
import datetime import datetime
import time import time
@ -15,9 +15,9 @@ class AudiomackIE(InfoExtractor):
#hosted on audiomack #hosted on audiomack
{ {
'url': 'http://www.audiomack.com/song/roosh-williams/extraordinary', 'url': 'http://www.audiomack.com/song/roosh-williams/extraordinary',
'file': 'Roosh Williams - Extraordinary.mp3',
'info_dict': 'info_dict':
{ {
'id' : 'roosh-williams/extraordinary',
'ext': 'mp3', 'ext': 'mp3',
'title': 'Roosh Williams - Extraordinary' 'title': 'Roosh Williams - Extraordinary'
} }
@ -39,13 +39,14 @@ class AudiomackIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
#id is what follows /song/ in url, usually the uploader name + title #id is what follows /song/ in url, usually the uploader name + title
id = url[url.index("/song/")+5:] id = self._match_id(url)
#Call the api, which gives us a json doc with the real url inside #Call the api, which gives us a json doc with the real url inside
rightnow = int(time.mktime(datetime.datetime.now().timetuple())) rightnow = int(time.time())
apiresponse = self._download_json("http://www.audiomack.com/api/music/url/song"+id+"?_="+str(rightnow), id) 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") if "url" not in apiresponse:
raise ExtractorError("Unable to deduce api url of song")
realurl = apiresponse["url"] realurl = apiresponse["url"]
#Audiomack wraps a lot of soundcloud tracks in their branded wrapper #Audiomack wraps a lot of soundcloud tracks in their branded wrapper
@ -60,7 +61,7 @@ class AudiomackIE(InfoExtractor):
songtitle = self._html_search_regex(r'<h1 class="profile-title song-title"><span class="artist">.*</span>(.*)</h1>', page, "title") songtitle = self._html_search_regex(r'<h1 class="profile-title song-title"><span class="artist">.*</span>(.*)</h1>', page, "title")
title = artist+" - "+songtitle title = artist+" - "+songtitle
return { return {
'id': title, # ignore id, which is not useful in song name 'id': id, # ignore id, which is not useful in song name
'title': title, 'title': title,
'url': realurl, 'url': realurl,
'ext': 'mp3' 'ext': 'mp3'