[soundcloud:search] Remove no track results message

[youtube-dl] / youtube_dl / extractor / soundcloud.py

diff --git a/youtube_dl/extractor/soundcloud.py b/youtube_dl/extractor/soundcloud.py
index ed5dcc0d39a0bf014d8650f3df4110749ae4d649..e880872aed147e6b8bd58a1500f7d3a610d64f62 100644 (file)
--- a/youtube_dl/extractor/soundcloud.py
+++ b/youtube_dl/extractor/soundcloud.py
@@ -4,13 +4,17 @@ from __future__ import unicode_literals
 import re
 import itertools
 
-from .common import InfoExtractor
+from .common import (
+    InfoExtractor,
+    SearchInfoExtractor
+)
 from ..compat import (
     compat_str,
     compat_urlparse,
     compat_urllib_parse,
 )
 from ..utils import (
+    encode_dict,
     ExtractorError,
     int_or_none,
     unified_strdate,
@@ -113,7 +117,7 @@ class SoundcloudIE(InfoExtractor):
         },
     ]
 
-    _CLIENT_ID = 'b45b1aa10f1ac2941910a7f0d10f8e28'
+    _CLIENT_ID = '02gUJC0hH2ct1EGOcYXQIzRFU91c72Ea'
     _IPHONE_CLIENT_ID = '376f225bf427445fc4bfb6b99b72e0bf'
 
     def report_resolve(self, video_id):
@@ -469,3 +473,66 @@ class SoundcloudPlaylistIE(SoundcloudIE):
             'description': data.get('description'),
             'entries': entries,
         }
+
+
+class SoundcloudSearchIE(SearchInfoExtractor, SoundcloudIE):
+    IE_NAME = 'soundcloud:search'
+    IE_DESC = 'Soundcloud search'
+    _MAX_RESULTS = float('inf')
+    _TESTS = [{
+        'url': 'scsearch15:post-avant jazzcore',
+        'info_dict': {
+            'title': 'post-avant jazzcore',
+        },
+        'playlist_count': 15,
+    }]
+
+    _SEARCH_KEY = 'scsearch'
+    _MAX_RESULTS_PER_PAGE = 200
+    _DEFAULT_RESULTS_PER_PAGE = 50
+    _API_V2_BASE = 'https://api-v2.soundcloud.com'
+
+    def _get_collection(self, endpoint, collection_id, **query):
+        query['limit'] = results_per_page = min(
+            query.get('limit', self._DEFAULT_RESULTS_PER_PAGE),
+            self._MAX_RESULTS_PER_PAGE)
+        query['client_id'] = self._CLIENT_ID
+        query['linked_partitioning'] = '1'
+
+        total_results = None
+        collected_results = 0
+
+        next_url = None
+
+        for i in itertools.count():
+            if not next_url:
+                query['offset'] = i * results_per_page
+                data = compat_urllib_parse.urlencode(encode_dict(query))
+                next_url = '{0}{1}?{2}'.format(
+                    self._API_V2_BASE, endpoint, data)
+
+            response = self._download_json(
+                next_url, collection_id, 'Downloading page {0}'.format(i + 1),
+                'Unable to download API page')
+
+            total_results = int(response.get(
+                'total_results', total_results))
+
+            collection = response['collection']
+            collected_results += len(collection)
+
+            for item in filter(bool, collection):
+                yield item
+
+            if (total_results is not None and collected_results >= total_results) or not collection:
+                break
+
+            next_url = response.get('next_href')
+
+    def _get_n_results(self, query, n):
+        tracks = self._get_collection(
+            '/search/tracks', collection_id='Query "{0}"'.format(query), limit=n, q=query)
+
+        results = [self.url_result(track['uri']) for track in itertools.islice(tracks, n)]
+
+        return self.playlist_result(results, playlist_title=query)