diff --git a/youtube_dl/extractor/bandcamp.py b/youtube_dl/extractor/bandcamp.py
index 886b0dfab..929aafdff 100644
--- a/youtube_dl/extractor/bandcamp.py
+++ b/youtube_dl/extractor/bandcamp.py
@@ -12,7 +12,7 @@
class BandcampIE(InfoExtractor):
- _VALID_URL = r'http://.*?\.bandcamp\.com/track/(?P
.*)'
+ _VALID_URL = r'https?://.*?\.bandcamp\.com/track/(?P.*)'
_TESTS = [{
'url': 'http://youtube-dl.bandcamp.com/track/youtube-dl-test-song',
'file': '1812978515.mp3',
@@ -100,7 +100,7 @@ def _real_extract(self, url):
class BandcampAlbumIE(InfoExtractor):
IE_NAME = 'Bandcamp:album'
- _VALID_URL = r'http://.*?\.bandcamp\.com/album/(?P.*)'
+ _VALID_URL = r'https?://(?:(?P[^.]+)\.)?bandcamp\.com(?:/album/(?P[^?#]+))?'
_TEST = {
'url': 'http://blazo.bandcamp.com/album/jazz-format-mixtape-vol-1',
@@ -128,8 +128,10 @@ class BandcampAlbumIE(InfoExtractor):
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
+ playlist_id = mobj.group('subdomain')
title = mobj.group('title')
- webpage = self._download_webpage(url, title)
+ display_id = title or playlist_id
+ webpage = self._download_webpage(url, display_id)
tracks_paths = re.findall(r'', webpage)
if not tracks_paths:
raise ExtractorError('The page doesn\'t contain any tracks')
@@ -139,6 +141,8 @@ def _real_extract(self, url):
title = self._search_regex(r'album_title : "(.*?)"', webpage, 'title')
return {
'_type': 'playlist',
+ 'id': playlist_id,
+ 'display_id': display_id,
'title': title,
'entries': entries,
}