projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[soundcloud] Modernize
[youtube-dl]
/
youtube_dl
/
extractor
/
soundcloud.py
diff --git
a/youtube_dl/extractor/soundcloud.py
b/youtube_dl/extractor/soundcloud.py
index 47b84809f1b53bb2c020bd94d1cbd23b23292948..513c548290cec6952252f0c71387567ceb306fae 100644
(file)
--- a/
youtube_dl/extractor/soundcloud.py
+++ b/
youtube_dl/extractor/soundcloud.py
@@
-143,21
+143,20
@@
class SoundcloudIE(InfoExtractor):
name = full_title or track_id
if quiet:
self.report_extraction(name)
name = full_title or track_id
if quiet:
self.report_extraction(name)
- thumbnail = info['artwork_url']
- track_license = info['license']
- if thumbnail is not None:
+ thumbnail = info.get('artwork_url')
+ if isinstance(thumbnail, compat_str):
thumbnail = thumbnail.replace('-large', '-t500x500')
ext = 'mp3'
result = {
'id': track_id,
thumbnail = thumbnail.replace('-large', '-t500x500')
ext = 'mp3'
result = {
'id': track_id,
- 'uploader': info
['user']['username']
,
- 'upload_date': unified_strdate(info
['created_at']
),
+ 'uploader': info
.get('user', {}).get('username')
,
+ 'upload_date': unified_strdate(info
.get('created_at')
),
'title': info['title'],
'title': info['title'],
- 'description': info
['description']
,
+ 'description': info
.get('description')
,
'thumbnail': thumbnail,
'duration': int_or_none(info.get('duration'), 1000),
'webpage_url': info.get('permalink_url'),
'thumbnail': thumbnail,
'duration': int_or_none(info.get('duration'), 1000),
'webpage_url': info.get('permalink_url'),
- 'license':
track_license
,
+ 'license':
info.get('license')
,
}
formats = []
if info.get('downloadable', False):
}
formats = []
if info.get('downloadable', False):
@@
-227,7
+226,6
@@
class SoundcloudIE(InfoExtractor):
raise ExtractorError('Invalid URL: %s' % url)
track_id = mobj.group('track_id')
raise ExtractorError('Invalid URL: %s' % url)
track_id = mobj.group('track_id')
- token = None
if track_id is not None:
info_json_url = 'http://api.soundcloud.com/tracks/' + track_id + '.json?client_id=' + self._CLIENT_ID
if track_id is not None:
info_json_url = 'http://api.soundcloud.com/tracks/' + track_id + '.json?client_id=' + self._CLIENT_ID