debian/watch: Add back pgpsigurlmangle.

[youtubedl] / youtube_dl / extractor / bandcamp.py

diff --git a/youtube_dl/extractor/bandcamp.py b/youtube_dl/extractor/bandcamp.py
index 505877b773d45b36be31d8dea8a6a1766d72d4ca..991ab0676e6b93a1c64d04f48b3728551bc4ccf0 100644 (file)
--- a/youtube_dl/extractor/bandcamp.py
+++ b/youtube_dl/extractor/bandcamp.py
@@ -10,6 +10,8 @@ from ..compat import (
 )
 from ..utils import (
     ExtractorError,
 )
 from ..utils import (
     ExtractorError,

+    float_or_none,
+    int_or_none,

 )
 
 
 )
 
 


@@ -27,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',
         '_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',
         'info_dict': {
             'id': '2650410135',
             'ext': 'mp3',


@@ -46,26 +48,30 @@ class BandcampIE(InfoExtractor):
             if m_trackinfo:
                 json_code = m_trackinfo.group(1)
                 data = json.loads(json_code)[0]
             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():
                     ext, abr_str = format_id.split('-', 1)
                     formats.append({
                         'format_id': format_id,
 
                 formats = []
                 for format_id, format_url in data['file'].items():
                     ext, abr_str = format_id.split('-', 1)
                     formats.append({
                         'format_id': format_id,

-                        'url': format_url,
+                        'url': self._proto_relative_url(format_url, 'http:'),

                         'ext': ext,
                         'vcodec': 'none',
                         'acodec': ext,
                         'ext': ext,
                         'vcodec': 'none',
                         'acodec': ext,

-                        'abr': int(abr_str),
+                        'abr': int_or_none(abr_str),

                     })
 
                 self._sort_formats(formats)
 
                 return {
                     })
 
                 self._sort_formats(formats)
 
                 return {

-                    'id': compat_str(data['id']),
+                    'id': track_id,

                     'title': data['title'],
                     'formats': formats,
                     'title': data['title'],
                     'formats': formats,

-                    'duration': float(data['duration']),
+                    'duration': float_or_none(data.get('duration')),

                 }
             else:
                 raise ExtractorError('No free songs found')
                 }
             else:
                 raise ExtractorError('No free songs found')


@@ -93,8 +99,8 @@ class BandcampIE(InfoExtractor):
         final_url_webpage = self._download_webpage(request_url, video_id, 'Requesting download url')
         # If we could correctly generate the .rand field the url would be
         # in the "download_url" key
         final_url_webpage = self._download_webpage(request_url, video_id, 'Requesting download url')
         # If we could correctly generate the .rand field the url would be
         # in the "download_url" key

-        final_url = self._search_regex(
-            r'"retry_url":"(.*?)"', final_url_webpage, 'final video URL')
+        final_url = self._proto_relative_url(self._search_regex(
+            r'"retry_url":"(.+?)"', final_url_webpage, 'final video URL'), 'http:')

 
         return {
             'id': video_id,
 
         return {
             'id': video_id,