diff options
| author | Thor77 <xXThor77Xx@gmail.com> | 2016-05-22 08:15:39 +0200 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-05-22 14:15:39 +0800 |
| commit | 70346165fe9348b54e8d71fb40654d135af945f8 (patch) | |
| tree | 9b6374cfa52e3c89ddd3b48e13bdce50baa4fbcf | |
| parent | c776b99691e5fdec75cc7d5c268c260f23bd2ac7 (diff) | |
| download | youtube-dl-70346165fe9348b54e8d71fb40654d135af945f8.tar.gz youtube-dl-70346165fe9348b54e8d71fb40654d135af945f8.tar.xz youtube-dl-70346165fe9348b54e8d71fb40654d135af945f8.zip | |
[bandcamp] raise ExtractorError when track not streamable (#9465)
* [bandcamp] raise ExtractorError when track not streamable * [bandcamp] update md5 for second test * don't rely on json-data, but just check for 'file' * don't rely on presence of 'file'
| -rw-r--r-- | youtube_dl/extractor/bandcamp.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/youtube_dl/extractor/bandcamp.py b/youtube_dl/extractor/bandcamp.py index c1ef8051d..991ab0676 100644 --- a/youtube_dl/extractor/bandcamp.py +++ b/youtube_dl/extractor/bandcamp.py @@ -29,7 +29,7 @@ class BandcampIE(InfoExtractor): '_skip': 'There is a limit of 200 free downloads / month for the test song' }, { 'url': 'http://benprunty.bandcamp.com/track/lanius-battle', - 'md5': '2b68e5851514c20efdff2afc5603b8b4', + 'md5': '73d0b3171568232574e45652f8720b5c', 'info_dict': { 'id': '2650410135', 'ext': 'mp3', @@ -48,6 +48,10 @@ class BandcampIE(InfoExtractor): if m_trackinfo: json_code = m_trackinfo.group(1) data = json.loads(json_code)[0] + track_id = compat_str(data['id']) + + if not data.get('file'): + raise ExtractorError('Not streamable', video_id=track_id, expected=True) formats = [] for format_id, format_url in data['file'].items(): @@ -64,7 +68,7 @@ class BandcampIE(InfoExtractor): self._sort_formats(formats) return { - 'id': compat_str(data['id']), + 'id': track_id, 'title': data['title'], 'formats': formats, 'duration': float_or_none(data.get('duration')), |