aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/soundcloud.py
diff options
context:
space:
mode:
authorreiv <metareiv@gmail.com>2015-10-17 21:18:42 +0200
committerSergey M․ <dstftw@gmail.com>2015-11-21 19:41:15 +0600
commitc30943b1c06d0f8d927031fc3a7f3cda30c4dae1 (patch)
treefd31f9ace67c1a340ec4ae941e0dba837478c896 /youtube_dl/extractor/soundcloud.py
parent2abf7cab80a2d12a3157afef05d61f8404bce45d (diff)
Fix some compatibility issues, cleanup.
Diffstat (limited to 'youtube_dl/extractor/soundcloud.py')
-rw-r--r--youtube_dl/extractor/soundcloud.py24
1 files changed, 8 insertions, 16 deletions
diff --git a/youtube_dl/extractor/soundcloud.py b/youtube_dl/extractor/soundcloud.py
index 7395a9848..3fe991849 100644
--- a/youtube_dl/extractor/soundcloud.py
+++ b/youtube_dl/extractor/soundcloud.py
@@ -488,27 +488,23 @@ class SoundcloudSearchIE(SearchInfoExtractor, SoundcloudIE):
_SEARCH_KEY = 'scsearch'
_RESULTS_PER_PAGE = 50
+ _API_V2_BASE = 'https://api-v2.soundcloud.com'
def _get_collection(self, endpoint, collection_id, **query):
- import itertools
-
query['limit'] = self._RESULTS_PER_PAGE
query['client_id'] = self._CLIENT_ID
query['linked_partitioning'] = '1'
- api_base_url = '{0}//api-v2.soundcloud.com'.format(self.http_scheme())
-
total_results = self._MAX_RESULTS
collected_results = 0
next_url = None
for i in itertools.count():
-
if not next_url:
query['offset'] = i * self._RESULTS_PER_PAGE
data = compat_urllib_parse.urlencode(query)
- next_url = '{0}{1}?{2}'.format(api_base_url, endpoint, data)
+ next_url = '{0}{1}?{2}'.format(self._API_V2_BASE, endpoint, data)
response = self._download_json(next_url,
video_id=collection_id,
@@ -516,7 +512,7 @@ class SoundcloudSearchIE(SearchInfoExtractor, SoundcloudIE):
errnote='Unable to download API page')
total_results = int(response.get(
- u'total_results', total_results))
+ 'total_results', total_results))
collection = response['collection']
collected_results += len(collection)
@@ -527,14 +523,13 @@ class SoundcloudSearchIE(SearchInfoExtractor, SoundcloudIE):
if collected_results >= total_results or not collection:
break
- next_url = response.get(u'next_href', None)
+ next_url = response.get('next_href', None)
def _get_n_results(self, query, n):
-
results = []
tracks = self._get_collection('/search/tracks',
- collection_id='Query "{}"'.format(query),
+ collection_id='Query "{0}"'.format(query),
q=query.encode('utf-8'))
for _ in range(n):
@@ -542,12 +537,9 @@ class SoundcloudSearchIE(SearchInfoExtractor, SoundcloudIE):
track = next(tracks)
except StopIteration:
break
- uri = track[u'uri']
- title = track[u'title']
- username = track[u'user'][u'username']
- results.append(self.url_result(
- url=uri,
- video_title='{0} - {1}'.format(username, title)))
+ uri = track['uri']
+ title = track['title']
+ results.append(self.url_result(url=uri))
if not results:
raise ExtractorError(