pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2025-05-11 16:24:50 +09:00
Code Issues Projects Releases Wiki Activity

Merge e944ee88955b61d2761b2926b5ecf08605963e00 into 3eb8d22ddb8982ca4fb56bb7a8d6517538bf14c6

Browse Source
This commit is contained in:
unkernet 2025-04-01 08:09:42 +02:00 committed by GitHub
commit 1bb6da669d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
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',
@ -289,10 +289,13 @@ class SoundcloudIE(InfoExtractor):
raise ExtractorError('Unable to extract client id') raise ExtractorError('Unable to extract client id')
def _download_json(self, *args, **kwargs): def _download_json(self, *args, **kwargs):
non_fatal = kwargs.get('fatal') is False non_fatal = not kwargs.get('fatal', True)
if non_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 +322,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 +339,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': int_or_none(filesize, invscale=8, scale=duration),
}) })
def invalid_url(url): def invalid_url(url):
@ -456,7 +462,7 @@ class SoundcloudIE(InfoExtractor):
'title': title, 'title': title,
'description': info.get('description'), 'description': info.get('description'),
'thumbnails': thumbnails, 'thumbnails': thumbnails,
'duration': float_or_none(info.get('duration'), 1000), 'duration': float_or_none(duration, 1000),
'webpage_url': info.get('permalink_url'), 'webpage_url': info.get('permalink_url'),
'license': info.get('license'), 'license': info.get('license'),
'view_count': extract_count('playback'), 'view_count': extract_count('playback'),