X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fsoundcloud.py;h=ab9483d2dc0136258084a794fd6945680d2aae47;hb=158731f83e2af39b3ecd8af3eaf4ce5b26ff6908;hp=c830d9da727c70192619a0d95fdafa1fcfa923c0;hpb=5f6a1245ffa9276c1af59b0835afeef67e2fb5b1;p=youtube-dl
diff --git a/youtube_dl/extractor/soundcloud.py b/youtube_dl/extractor/soundcloud.py
index c830d9da7..ab9483d2d 100644
--- a/youtube_dl/extractor/soundcloud.py
+++ b/youtube_dl/extractor/soundcloud.py
@@ -32,7 +32,7 @@ class SoundcloudIE(InfoExtractor):
(?P
[\w\d-]+)/?
(?P[^?]+?)?(?:[?].*)?$)
|(?:api\.soundcloud\.com/tracks/(?P\d+)
- (?:/?\?secret_token=(?P[^&]+?))?$)
+ (?:/?\?secret_token=(?P[^&]+))?)
|(?P(?:w|player|p.)\.soundcloud\.com/player/?.*?url=.*)
)
'''
@@ -159,7 +159,7 @@ class SoundcloudIE(InfoExtractor):
# We have to retrieve the url
streams_url = ('http://api.soundcloud.com/i1/tracks/{0}/streams?'
- 'client_id={1}&secret_token={2}'.format(track_id, self._IPHONE_CLIENT_ID, secret_token))
+ 'client_id={1}&secret_token={2}'.format(track_id, self._IPHONE_CLIENT_ID, secret_token))
format_dict = self._download_json(
streams_url,
track_id, 'Downloading track url')
@@ -224,7 +224,7 @@ class SoundcloudIE(InfoExtractor):
# extract uploader (which is in the url)
uploader = mobj.group('uploader')
# extract simple title (uploader + slug of song title)
- slug_title = mobj.group('title')
+ slug_title = mobj.group('title')
token = mobj.group('token')
full_title = resolve_title = '%s/%s' % (uploader, slug_title)
if token:
@@ -371,7 +371,7 @@ class SoundcloudPlaylistIE(SoundcloudIE):
entries = [
self._extract_info_dict(t, quiet=True, secret_token=token)
- for t in data['tracks']]
+ for t in data['tracks']]
return {
'_type': 'playlist',