Merge remote-tracking branch 'azeem/soundcloud_likes'
This commit is contained in:
commit
ebf361ce18
2 changed files with 19 additions and 4 deletions
|
@ -137,6 +137,14 @@ class TestPlaylists(unittest.TestCase):
|
||||||
self.assertEqual(result['id'], '9615865')
|
self.assertEqual(result['id'], '9615865')
|
||||||
self.assertTrue(len(result['entries']) >= 12)
|
self.assertTrue(len(result['entries']) >= 12)
|
||||||
|
|
||||||
|
def test_soundcloud_likes(self):
|
||||||
|
dl = FakeYDL()
|
||||||
|
ie = SoundcloudUserIE(dl)
|
||||||
|
result = ie.extract('https://soundcloud.com/the-concept-band/likes')
|
||||||
|
self.assertIsPlaylist(result)
|
||||||
|
self.assertEqual(result['id'], '9615865')
|
||||||
|
self.assertTrue(len(result['entries']) >= 1)
|
||||||
|
|
||||||
def test_soundcloud_playlist(self):
|
def test_soundcloud_playlist(self):
|
||||||
dl = FakeYDL()
|
dl = FakeYDL()
|
||||||
ie = SoundcloudPlaylistIE(dl)
|
ie = SoundcloudPlaylistIE(dl)
|
||||||
|
|
|
@ -255,7 +255,7 @@ class SoundcloudSetIE(SoundcloudIE):
|
||||||
|
|
||||||
|
|
||||||
class SoundcloudUserIE(SoundcloudIE):
|
class SoundcloudUserIE(SoundcloudIE):
|
||||||
_VALID_URL = r'https?://(www\.)?soundcloud\.com/(?P<user>[^/]+)(/?(tracks/)?)?(\?.*)?$'
|
_VALID_URL = r'https?://(www\.)?soundcloud\.com/(?P<user>[^/]+)/?((?P<rsrc>tracks|likes)/?)?(\?.*)?$'
|
||||||
IE_NAME = 'soundcloud:user'
|
IE_NAME = 'soundcloud:user'
|
||||||
|
|
||||||
# it's in tests/test_playlists.py
|
# it's in tests/test_playlists.py
|
||||||
|
@ -264,24 +264,31 @@ class SoundcloudUserIE(SoundcloudIE):
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
uploader = mobj.group('user')
|
uploader = mobj.group('user')
|
||||||
|
resource = mobj.group('rsrc')
|
||||||
|
if resource is None:
|
||||||
|
resource = 'tracks'
|
||||||
|
elif resource == 'likes':
|
||||||
|
resource = 'favorites'
|
||||||
|
|
||||||
url = 'http://soundcloud.com/%s/' % uploader
|
url = 'http://soundcloud.com/%s/' % uploader
|
||||||
resolv_url = self._resolv_url(url)
|
resolv_url = self._resolv_url(url)
|
||||||
user = self._download_json(
|
user = self._download_json(
|
||||||
resolv_url, uploader, 'Downloading user info')
|
resolv_url, uploader, 'Downloading user info')
|
||||||
base_url = 'http://api.soundcloud.com/users/%s/tracks.json?' % uploader
|
base_url = 'http://api.soundcloud.com/users/%s/%s.json?' % (uploader, resource)
|
||||||
|
|
||||||
entries = []
|
entries = []
|
||||||
for i in itertools.count():
|
for i in itertools.count():
|
||||||
data = compat_urllib_parse.urlencode({
|
data = compat_urllib_parse.urlencode({
|
||||||
'offset': i * 50,
|
'offset': i * 50,
|
||||||
|
'limit': 50,
|
||||||
'client_id': self._CLIENT_ID,
|
'client_id': self._CLIENT_ID,
|
||||||
})
|
})
|
||||||
new_entries = self._download_json(
|
new_entries = self._download_json(
|
||||||
base_url + data, uploader, 'Downloading track page %s' % (i + 1))
|
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) == 0:
|
||||||
if len(new_entries) < 50:
|
self.to_screen('%s: End page received' % uploader)
|
||||||
break
|
break
|
||||||
|
entries.extend(self._extract_info_dict(e, quiet=True) for e in new_entries)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'_type': 'playlist',
|
'_type': 'playlist',
|
||||||
|
|
Loading…
Reference in a new issue