From bc465fb6614d94840a86168c531bbb3cf2997efc Mon Sep 17 00:00:00 2001 From: Thor77 Date: Thu, 12 May 2016 15:56:25 +0200 Subject: [PATCH 1/4] [bandcamp] raise ExtractorError when track not streamable --- youtube_dl/extractor/bandcamp.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/bandcamp.py b/youtube_dl/extractor/bandcamp.py index c1ef8051d..ce3a9be48 100644 --- a/youtube_dl/extractor/bandcamp.py +++ b/youtube_dl/extractor/bandcamp.py @@ -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['streaming']: + 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')), From 803385278a3febd8be151f7800dbaec30522fa50 Mon Sep 17 00:00:00 2001 From: Thor77 Date: Thu, 12 May 2016 16:03:10 +0200 Subject: [PATCH 2/4] [bandcamp] update md5 for second test --- youtube_dl/extractor/bandcamp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/bandcamp.py b/youtube_dl/extractor/bandcamp.py index ce3a9be48..44e05df9c 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', From 85a696cc8864ad23ccd4a0bc80445e5ea3c3ea27 Mon Sep 17 00:00:00 2001 From: Thor77 Date: Thu, 12 May 2016 21:21:45 +0200 Subject: [PATCH 3/4] don't rely on json-data, but just check for 'file' --- youtube_dl/extractor/bandcamp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/bandcamp.py b/youtube_dl/extractor/bandcamp.py index 44e05df9c..39b100e53 100644 --- a/youtube_dl/extractor/bandcamp.py +++ b/youtube_dl/extractor/bandcamp.py @@ -50,7 +50,7 @@ class BandcampIE(InfoExtractor): data = json.loads(json_code)[0] track_id = compat_str(data['id']) - if not data['streaming']: + if not data['file']: raise ExtractorError('Not streamable', video_id=track_id, expected=True) formats = [] From c8601003d5b451c7a58f1d143f8a120dc4da82b6 Mon Sep 17 00:00:00 2001 From: Thor77 Date: Mon, 16 May 2016 19:42:50 +0200 Subject: [PATCH 4/4] don't rely on presence of 'file' --- youtube_dl/extractor/bandcamp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/bandcamp.py b/youtube_dl/extractor/bandcamp.py index 39b100e53..991ab0676 100644 --- a/youtube_dl/extractor/bandcamp.py +++ b/youtube_dl/extractor/bandcamp.py @@ -50,7 +50,7 @@ class BandcampIE(InfoExtractor): data = json.loads(json_code)[0] track_id = compat_str(data['id']) - if not data['file']: + if not data.get('file'): raise ExtractorError('Not streamable', video_id=track_id, expected=True) formats = []