|
@ -34,7 +34,7 @@ class SoundcloudIE(InfoExtractor): |
|
|
(?:(?:(?:www\.|m\.)?soundcloud\.com/ |
|
|
(?:(?:(?:www\.|m\.)?soundcloud\.com/ |
|
|
(?!stations/track) |
|
|
(?!stations/track) |
|
|
(?P<uploader>[\w\d-]+)/ |
|
|
(?P<uploader>[\w\d-]+)/ |
|
|
(?!(?:tracks|sets(?:/.+?)?|reposts|likes|spotlight)/?(?:$|[?#])) |
|
|
|
|
|
|
|
|
(?!(?:tracks|albums|sets(?:/.+?)?|reposts|likes|spotlight)/?(?:$|[?#])) |
|
|
(?P<title>[\w\d-]+)/? |
|
|
(?P<title>[\w\d-]+)/? |
|
|
(?P<token>[^?]+?)?(?:[?].*)?$) |
|
|
(?P<token>[^?]+?)?(?:[?].*)?$) |
|
|
|(?:api\.soundcloud\.com/tracks/(?P<track_id>\d+) |
|
|
|(?:api\.soundcloud\.com/tracks/(?P<track_id>\d+) |
|
@ -157,7 +157,7 @@ class SoundcloudIE(InfoExtractor): |
|
|
}, |
|
|
}, |
|
|
] |
|
|
] |
|
|
|
|
|
|
|
|
_CLIENT_ID = 'LvWovRaJZlWCHql0bISuum8Bd2KX79mb' |
|
|
|
|
|
|
|
|
_CLIENT_ID = 'NmW1FlPaiL94ueEu7oziOWjYEzZzQDcK' |
|
|
|
|
|
|
|
|
@staticmethod |
|
|
@staticmethod |
|
|
def _extract_urls(webpage): |
|
|
def _extract_urls(webpage): |
|
@ -368,7 +368,6 @@ class SoundcloudSetIE(SoundcloudPlaylistBaseIE): |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class SoundcloudPagedPlaylistBaseIE(SoundcloudPlaylistBaseIE): |
|
|
class SoundcloudPagedPlaylistBaseIE(SoundcloudPlaylistBaseIE): |
|
|
_API_BASE = 'https://api.soundcloud.com' |
|
|
|
|
|
_API_V2_BASE = 'https://api-v2.soundcloud.com' |
|
|
_API_V2_BASE = 'https://api-v2.soundcloud.com' |
|
|
|
|
|
|
|
|
def _extract_playlist(self, base_url, playlist_id, playlist_title): |
|
|
def _extract_playlist(self, base_url, playlist_id, playlist_title): |
|
@ -389,8 +388,12 @@ class SoundcloudPagedPlaylistBaseIE(SoundcloudPlaylistBaseIE): |
|
|
next_href, playlist_id, 'Downloading track page %s' % (i + 1)) |
|
|
next_href, playlist_id, 'Downloading track page %s' % (i + 1)) |
|
|
|
|
|
|
|
|
collection = response['collection'] |
|
|
collection = response['collection'] |
|
|
if not collection: |
|
|
|
|
|
break |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if not isinstance(collection, list): |
|
|
|
|
|
collection = [] |
|
|
|
|
|
|
|
|
|
|
|
# Empty collection may be returned, in this case we proceed |
|
|
|
|
|
# straight to next_href |
|
|
|
|
|
|
|
|
def resolve_permalink_url(candidates): |
|
|
def resolve_permalink_url(candidates): |
|
|
for cand in candidates: |
|
|
for cand in candidates: |
|
@ -429,7 +432,7 @@ class SoundcloudUserIE(SoundcloudPagedPlaylistBaseIE): |
|
|
(?:(?:www|m)\.)?soundcloud\.com/ |
|
|
(?:(?:www|m)\.)?soundcloud\.com/ |
|
|
(?P<user>[^/]+) |
|
|
(?P<user>[^/]+) |
|
|
(?:/ |
|
|
(?:/ |
|
|
(?P<rsrc>tracks|sets|reposts|likes|spotlight) |
|
|
|
|
|
|
|
|
(?P<rsrc>tracks|albums|sets|reposts|likes|spotlight) |
|
|
)? |
|
|
)? |
|
|
/?(?:[?#].*)?$ |
|
|
/?(?:[?#].*)?$ |
|
|
''' |
|
|
''' |
|
@ -476,13 +479,17 @@ class SoundcloudUserIE(SoundcloudPagedPlaylistBaseIE): |
|
|
'title': 'Grynpyret (Spotlight)', |
|
|
'title': 'Grynpyret (Spotlight)', |
|
|
}, |
|
|
}, |
|
|
'playlist_mincount': 1, |
|
|
'playlist_mincount': 1, |
|
|
|
|
|
}, { |
|
|
|
|
|
'url': 'https://soundcloud.com/soft-cell-official/albums', |
|
|
|
|
|
'only_matching': True, |
|
|
}] |
|
|
}] |
|
|
|
|
|
|
|
|
_BASE_URL_MAP = { |
|
|
_BASE_URL_MAP = { |
|
|
'all': '%s/profile/soundcloud:users:%%s' % SoundcloudPagedPlaylistBaseIE._API_V2_BASE, |
|
|
|
|
|
'tracks': '%s/users/%%s/tracks' % SoundcloudPagedPlaylistBaseIE._API_BASE, |
|
|
|
|
|
|
|
|
'all': '%s/stream/users/%%s' % SoundcloudPagedPlaylistBaseIE._API_V2_BASE, |
|
|
|
|
|
'tracks': '%s/users/%%s/tracks' % SoundcloudPagedPlaylistBaseIE._API_V2_BASE, |
|
|
|
|
|
'albums': '%s/users/%%s/albums' % SoundcloudPagedPlaylistBaseIE._API_V2_BASE, |
|
|
'sets': '%s/users/%%s/playlists' % SoundcloudPagedPlaylistBaseIE._API_V2_BASE, |
|
|
'sets': '%s/users/%%s/playlists' % SoundcloudPagedPlaylistBaseIE._API_V2_BASE, |
|
|
'reposts': '%s/profile/soundcloud:users:%%s/reposts' % SoundcloudPagedPlaylistBaseIE._API_V2_BASE, |
|
|
|
|
|
|
|
|
'reposts': '%s/stream/users/%%s/reposts' % SoundcloudPagedPlaylistBaseIE._API_V2_BASE, |
|
|
'likes': '%s/users/%%s/likes' % SoundcloudPagedPlaylistBaseIE._API_V2_BASE, |
|
|
'likes': '%s/users/%%s/likes' % SoundcloudPagedPlaylistBaseIE._API_V2_BASE, |
|
|
'spotlight': '%s/users/%%s/spotlight' % SoundcloudPagedPlaylistBaseIE._API_V2_BASE, |
|
|
'spotlight': '%s/users/%%s/spotlight' % SoundcloudPagedPlaylistBaseIE._API_V2_BASE, |
|
|
} |
|
|
} |
|
@ -490,6 +497,7 @@ class SoundcloudUserIE(SoundcloudPagedPlaylistBaseIE): |
|
|
_TITLE_MAP = { |
|
|
_TITLE_MAP = { |
|
|
'all': 'All', |
|
|
'all': 'All', |
|
|
'tracks': 'Tracks', |
|
|
'tracks': 'Tracks', |
|
|
|
|
|
'albums': 'Albums', |
|
|
'sets': 'Playlists', |
|
|
'sets': 'Playlists', |
|
|
'reposts': 'Reposts', |
|
|
'reposts': 'Reposts', |
|
|
'likes': 'Likes', |
|
|
'likes': 'Likes', |
|
|