aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-09-18 18:57:04 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-09-18 18:57:04 +0200
commit46f74bcf5c5fc876e3a966408cb8bde6d6ef15e0 (patch)
treea0d4b5302a02f7ef2898457e74970f48b30eb26c
parent37bfe8ace4dcd1b476a54aedb7f39b88e7bb527e (diff)
downloadyoutube-dl-46f74bcf5c5fc876e3a966408cb8bde6d6ef15e0.tar.xz
[soundcloud] Fix non-secret playlists
-rw-r--r--youtube_dl/extractor/soundcloud.py23
1 files changed, 10 insertions, 13 deletions
diff --git a/youtube_dl/extractor/soundcloud.py b/youtube_dl/extractor/soundcloud.py
index 2bed3c350..4719ba45c 100644
--- a/youtube_dl/extractor/soundcloud.py
+++ b/youtube_dl/extractor/soundcloud.py
@@ -338,20 +338,17 @@ class SoundcloudUserIE(SoundcloudIE):
class SoundcloudPlaylistIE(SoundcloudIE):
- _VALID_URL = r'https?://api\.soundcloud\.com/playlists/(?P<id>[0-9]+)(?:/?\?secret_token=(?P<token>[^&]+?))$'
+ _VALID_URL = r'https?://api\.soundcloud\.com/playlists/(?P<id>[0-9]+)(?:/?\?secret_token=(?P<token>[^&]+?))?$'
IE_NAME = 'soundcloud:playlist'
- _TESTS = [
-
- {
- 'url': 'http://api.soundcloud.com/playlists/4110309',
- 'info_dict': {
- 'id': '4110309',
- 'title': 'TILT Brass - Bowery Poetry Club, August \'03 [Non-Site SCR 02]',
- 'description': 're:.*?TILT Brass - Bowery Poetry Club',
- },
- 'playlist_count': 6,
- }
- ]
+ _TESTS = [{
+ 'url': 'http://api.soundcloud.com/playlists/4110309',
+ 'info_dict': {
+ 'id': '4110309',
+ 'title': 'TILT Brass - Bowery Poetry Club, August \'03 [Non-Site SCR 02]',
+ 'description': 're:.*?TILT Brass - Bowery Poetry Club',
+ },
+ 'playlist_count': 6,
+ }]
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)