fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[soundcloud] Extract license metadata

This commit is contained in:
coolsa 2016-09-18 03:53:05 -06:00 committed by Sergey M․
parent e33a7253b2
commit 4bfd294e2f
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/soundcloud.py
View File

@ -53,6 +53,7 @@ class SoundcloudIE(InfoExtractor):
'uploader': 'E.T. ExTerrestrial Music', 'uploader': 'E.T. ExTerrestrial Music',
'title': 'Lostin Powers - She so Heavy (SneakPreview) Adrian Ackers Blueprint 1', 'title': 'Lostin Powers - She so Heavy (SneakPreview) Adrian Ackers Blueprint 1',
'duration': 143, 'duration': 143,
'license': 'all-rights-reserved',
} }
}, },
# not streamable song # not streamable song
@ -66,6 +67,7 @@ class SoundcloudIE(InfoExtractor):
'uploader': 'The Royal Concept', 'uploader': 'The Royal Concept',
'upload_date': '20120521', 'upload_date': '20120521',
'duration': 227, 'duration': 227,
'license': 'all-rights-reserved',
}, },
'params': { 'params': {
# rtmp # rtmp
@ -84,6 +86,7 @@ class SoundcloudIE(InfoExtractor):
'description': 'test chars: \"\'/\\ä↭', 'description': 'test chars: \"\'/\\ä↭',
'upload_date': '20131209', 'upload_date': '20131209',
'duration': 9, 'duration': 9,
'license': 'all-rights-reserved',
}, },
}, },
# private link (alt format) # private link (alt format)
@ -98,6 +101,7 @@ class SoundcloudIE(InfoExtractor):
'description': 'test chars: \"\'/\\ä↭', 'description': 'test chars: \"\'/\\ä↭',
'upload_date': '20131209', 'upload_date': '20131209',
'duration': 9, 'duration': 9,
'license': 'all-rights-reserved',
}, },
}, },
# downloadable song # downloadable song
@ -112,6 +116,7 @@ class SoundcloudIE(InfoExtractor):
'uploader': 'oddsamples', 'uploader': 'oddsamples',
'upload_date': '20140109', 'upload_date': '20140109',
'duration': 17, 'duration': 17,
'license': 'cc-by-sa',
}, },
}, },
] ]
@ -138,8 +143,8 @@ class SoundcloudIE(InfoExtractor):
name = full_title or track_id name = full_title or track_id
if quiet: if quiet:
self.report_extraction(name) self.report_extraction(name)
thumbnail = info['artwork_url'] thumbnail = info['artwork_url']
track_license = info['license']
if thumbnail is not None: if thumbnail is not None:
thumbnail = thumbnail.replace('-large', '-t500x500') thumbnail = thumbnail.replace('-large', '-t500x500')
ext = 'mp3' ext = 'mp3'
@ -152,6 +157,7 @@ class SoundcloudIE(InfoExtractor):
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'duration': int_or_none(info.get('duration'), 1000), 'duration': int_or_none(info.get('duration'), 1000),
'webpage_url': info.get('permalink_url'), 'webpage_url': info.get('permalink_url'),
'license': track_license,
} }
formats = [] formats = []
if info.get('downloadable', False): if info.get('downloadable', False):
@ -222,6 +228,7 @@ class SoundcloudIE(InfoExtractor):
track_id = mobj.group('track_id') track_id = mobj.group('track_id')
token = None token = None
if track_id is not None: if track_id is not None:
info_json_url = 'http://api.soundcloud.com/tracks/' + track_id + '.json?client_id=' + self._CLIENT_ID info_json_url = 'http://api.soundcloud.com/tracks/' + track_id + '.json?client_id=' + self._CLIENT_ID
full_title = track_id full_title = track_id