projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[pluralsight] Improve login detection
[youtube-dl]
/
youtube_dl
/
extractor
/
bandcamp.py
diff --git
a/youtube_dl/extractor/bandcamp.py
b/youtube_dl/extractor/bandcamp.py
index a27f3e7488add9836ee7724b67195d1a4541de4b..c1ef8051d3074a6551941bf140f88eee4ed8a124 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,
)
)
@@
-52,11
+54,11
@@
class BandcampIE(InfoExtractor):
ext, abr_str = format_id.split('-', 1)
formats.append({
'format_id': format_id,
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)
})
self._sort_formats(formats)
@@
-65,7
+67,7
@@
class BandcampIE(InfoExtractor):
'id': compat_str(data['id']),
'title': data['title'],
'formats': formats,
'id': compat_str(data['id']),
'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')