projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2abf7ca
)
Fix some compatibility issues, cleanup.
author
reiv
<metareiv@gmail.com>
Sat, 17 Oct 2015 19:18:42 +0000
(21:18 +0200)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 21 Nov 2015 13:41:15 +0000
(19:41 +0600)
youtube_dl/extractor/soundcloud.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/soundcloud.py
b/youtube_dl/extractor/soundcloud.py
index 7395a984829d9734b5ad77d04a9393f262acb710..3fe991849b67fb7ebf447715c7c34301ebc190ca 100644
(file)
--- 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
_SEARCH_KEY = 'scsearch'
_RESULTS_PER_PAGE = 50
+ _API_V2_BASE = 'https://api-v2.soundcloud.com'
def _get_collection(self, endpoint, collection_id, **query):
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'
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():
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)
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,
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(
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)
collection = response['collection']
collected_results += len(collection)
@@
-527,14
+523,13
@@
class SoundcloudSearchIE(SearchInfoExtractor, SoundcloudIE):
if collected_results >= total_results or not collection:
break
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):
def _get_n_results(self, query, n):
-
results = []
tracks = self._get_collection('/search/tracks',
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):
q=query.encode('utf-8'))
for _ in range(n):
@@
-542,12
+537,9
@@
class SoundcloudSearchIE(SearchInfoExtractor, SoundcloudIE):
track = next(tracks)
except StopIteration:
break
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(
if not results:
raise ExtractorError(