paradizelost/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge 48a7b5d39d into 4d05f84325

Browse Source
This commit is contained in:
unkernet 2024-07-02 14:02:35 +00:00 committed by GitHub
commit bbe13eb960
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
youtube_dl/extractor/soundcloud.py
View File

@ -233,8 +233,8 @@ class SoundcloudIE(InfoExtractor):
'id': '583011102', 'id': '583011102',
'ext': 'mp3', 'ext': 'mp3',
'title': 'Mezzo Valzer', 'title': 'Mezzo Valzer',
'description': 'md5:4138d582f81866a530317bae316e8b61', 'description': 'md5:8de664f12895716c8ac6f1da6348eb8e',
'uploader': 'Micronie', 'uploader': 'Giovanni Sarani',
'uploader_id': '3352531', 'uploader_id': '3352531',
'timestamp': 1551394171, 'timestamp': 1551394171,
'upload_date': '20190228', 'upload_date': '20190228',
@ -293,6 +293,11 @@ class SoundcloudIE(InfoExtractor):
if non_fatal: if non_fatal:
del kwargs['fatal'] del kwargs['fatal']
query = kwargs.get('query', {}).copy() query = kwargs.get('query', {}).copy()
oauth_token = self._get_cookies(self._BASE_URL).get('oauth_token')
if oauth_token:
if not kwargs.get('headers'):
kwargs['headers'] = {}
kwargs['headers']['authorization'] = 'OAuth ' + oauth_token.value
for _ in range(2): for _ in range(2):
query['client_id'] = self._CLIENT_ID query['client_id'] = self._CLIENT_ID
kwargs['query'] = query kwargs['query'] = query
@ -319,6 +324,7 @@ class SoundcloudIE(InfoExtractor):
track_id = compat_str(info['id']) track_id = compat_str(info['id'])
title = info['title'] title = info['title']
duration = info.get('duration')
format_urls = set() format_urls = set()
formats = [] formats = []
query = {'client_id': self._CLIENT_ID} query = {'client_id': self._CLIENT_ID}
@ -335,12 +341,14 @@ class SoundcloudIE(InfoExtractor):
if urlh: if urlh:
format_url = urlh.geturl() format_url = urlh.geturl()
format_urls.add(format_url) format_urls.add(format_url)
filesize = int_or_none(urlh.headers.get('Content-Length'))
formats.append({ formats.append({
'format_id': 'download', 'format_id': 'download',
'ext': urlhandle_detect_ext(urlh) or 'mp3', 'ext': urlhandle_detect_ext(urlh) or 'mp3',
'filesize': int_or_none(urlh.headers.get('Content-Length')), 'filesize': filesize,
'url': format_url, 'url': format_url,
'preference': 10, 'preference': 10,
'abr': (filesize and duration) and (filesize / duration * 8),
}) })
def invalid_url(url): def invalid_url(url):