X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fsoundcloud.py;h=d6f453fb969f53d89cf1207999fa4fcbea4ffe5f;hb=9e8753911cf37a4f8e26ce442e8938a7a52f3dad;hp=8893699aaef241eaef7bfaea8b5a65cc6f74277f;hpb=72546c831e460307570ae292053c8395e2bbf0ef;p=youtube-dl.git diff --git a/youtube_dl/extractor/soundcloud.py b/youtube_dl/extractor/soundcloud.py index 8893699aa..d6f453fb9 100644 --- a/youtube_dl/extractor/soundcloud.py +++ b/youtube_dl/extractor/soundcloud.py @@ -25,7 +25,7 @@ class SoundcloudIE(InfoExtractor): of the stream token and uid """ - _VALID_URL = r'''^(?:https?://)? + _VALID_URL = r'''(?x)^(?:https?://)? (?:(?:(?:www\.|m\.)?soundcloud\.com/ (?P[\w\d-]+)/ (?!sets/)(?P[\w\d-]+)/? @@ -94,10 +94,6 @@ class SoundcloudIE(InfoExtractor): _CLIENT_ID = 'b45b1aa10f1ac2941910a7f0d10f8e28' _IPHONE_CLIENT_ID = '376f225bf427445fc4bfb6b99b72e0bf' - @classmethod - def suitable(cls, url): - return re.match(cls._VALID_URL, url, flags=re.VERBOSE) is not None - def report_resolve(self, video_id): """Report information extraction.""" self.to_screen('%s: Resolving id' % video_id) @@ -141,11 +137,10 @@ 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)) - stream_json = self._download_webpage( + format_dict = self._download_json( streams_url, track_id, 'Downloading track url') - format_dict = json.loads(stream_json) for key, stream_url in format_dict.items(): if key.startswith('http'): formats.append({ @@ -198,7 +193,7 @@ class SoundcloudIE(InfoExtractor): full_title = track_id elif mobj.group('player'): query = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query) - return self.url_result(query['url'][0], ie='Soundcloud') + return self.url_result(query['url'][0]) else: # extract uploader (which is in the url) uploader = mobj.group('uploader') @@ -213,11 +208,11 @@ class SoundcloudIE(InfoExtractor): url = 'http://soundcloud.com/%s' % resolve_title info_json_url = self._resolv_url(url) - info_json = self._download_webpage(info_json_url, full_title, 'Downloading info JSON') + info = self._download_json(info_json_url, full_title, 'Downloading info JSON') - info = json.loads(info_json) return self._extract_info_dict(info, full_title, secret_token=token) + class SoundcloudSetIE(SoundcloudIE): _VALID_URL = r'https?://(?:www\.)?soundcloud\.com/([\w\d-]+)/sets/([\w\d-]+)' IE_NAME = 'soundcloud:set' @@ -232,16 +227,15 @@ class SoundcloudSetIE(SoundcloudIE): # extract uploader (which is in the url) uploader = mobj.group(1) # extract simple title (uploader + slug of song title) - slug_title = mobj.group(2) + slug_title = mobj.group(2) full_title = '%s/sets/%s' % (uploader, slug_title) self.report_resolve(full_title) url = 'http://soundcloud.com/%s/sets/%s' % (uploader, slug_title) resolv_url = self._resolv_url(url) - info_json = self._download_webpage(resolv_url, full_title) + info = self._download_json(resolv_url, full_title) - info = json.loads(info_json) if 'errors' in info: for err in info['errors']: self._downloader.report_error('unable to download video webpage: %s' % compat_str(err['error_message'])) @@ -268,26 +262,55 @@ class SoundcloudUserIE(SoundcloudIE): url = 'http://soundcloud.com/%s/' % uploader resolv_url = self._resolv_url(url) - user_json = self._download_webpage(resolv_url, uploader, - 'Downloading user info') - user = json.loads(user_json) + user = self._download_json( + resolv_url, uploader, 'Downloading user info') + base_url = 'http://api.soundcloud.com/users/%s/tracks.json?' % uploader - tracks = [] + entries = [] for i in itertools.count(): - data = compat_urllib_parse.urlencode({'offset': i*50, - 'client_id': self._CLIENT_ID, - }) - tracks_url = 'http://api.soundcloud.com/users/%s/tracks.json?' % user['id'] + data - response = self._download_webpage(tracks_url, uploader, - 'Downloading tracks page %s' % (i+1)) - new_tracks = json.loads(response) - tracks.extend(self._extract_info_dict(track, quiet=True) for track in new_tracks) - if len(new_tracks) < 50: + data = compat_urllib_parse.urlencode({ + 'offset': i * 50, + 'client_id': self._CLIENT_ID, + }) + new_entries = self._download_json( + base_url + data, uploader, 'Downloading track page %s' % (i + 1)) + entries.extend(self._extract_info_dict(e, quiet=True) for e in new_entries) + if len(new_entries) < 50: break return { '_type': 'playlist', 'id': compat_str(user['id']), 'title': user['username'], - 'entries': tracks, + 'entries': entries, + } + + +class SoundcloudPlaylistIE(SoundcloudIE): + _VALID_URL = r'https?://api\.soundcloud\.com/playlists/(?P<id>[0-9]+)' + IE_NAME = 'soundcloud:playlist' + + # it's in tests/test_playlists.py + _TESTS = [] + + def _real_extract(self, url): + mobj = re.match(self._VALID_URL, url) + playlist_id = mobj.group('id') + base_url = '%s//api.soundcloud.com/playlists/%s.json?' % (self.http_scheme(), playlist_id) + + data = compat_urllib_parse.urlencode({ + 'client_id': self._CLIENT_ID, + }) + data = self._download_json( + base_url + data, playlist_id, 'Downloading playlist') + + entries = [ + self._extract_info_dict(t, quiet=True) for t in data['tracks']] + + return { + '_type': 'playlist', + 'id': playlist_id, + 'title': data.get('title'), + 'description': data.get('description'), + 'entries': entries, }