mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-10 00:58:17 +02:00
Fix Soundcloud IE (+ Python3 support)
This commit is contained in:
parent
e91d2338d8
commit
15c8d83358
@ -2818,16 +2818,17 @@ def _real_extract(self, url):
|
||||
return
|
||||
|
||||
# extract uploader (which is in the url)
|
||||
uploader = mobj.group(1).decode('utf-8')
|
||||
uploader = mobj.group(1)
|
||||
# extract simple title (uploader + slug of song title)
|
||||
slug_title = mobj.group(2).decode('utf-8')
|
||||
slug_title = mobj.group(2)
|
||||
simple_title = uploader + u'-' + slug_title
|
||||
|
||||
self.report_webpage('%s/%s' % (uploader, slug_title))
|
||||
|
||||
request = compat_urllib_request.Request('http://soundcloud.com/%s/%s' % (uploader, slug_title))
|
||||
try:
|
||||
webpage = compat_urllib_request.urlopen(request).read()
|
||||
webpage_bytes = compat_urllib_request.urlopen(request).read()
|
||||
webpage = webpage_bytes.decode('utf-8')
|
||||
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
|
||||
self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))
|
||||
return
|
||||
@ -2843,7 +2844,7 @@ def _real_extract(self, url):
|
||||
# extract unsimplified title
|
||||
mobj = re.search('"title":"(.*?)",', webpage)
|
||||
if mobj:
|
||||
title = mobj.group(1).decode('utf-8')
|
||||
title = mobj.group(1)
|
||||
else:
|
||||
title = simple_title
|
||||
|
||||
@ -2870,13 +2871,13 @@ def _real_extract(self, url):
|
||||
request = compat_urllib_request.Request('http://media.soundcloud.com/crossdomain.xml', std_headers)
|
||||
|
||||
return [{
|
||||
'id': video_id.decode('utf-8'),
|
||||
'id': video_id,
|
||||
'url': mediaURL,
|
||||
'uploader': uploader.decode('utf-8'),
|
||||
'uploader': uploader,
|
||||
'upload_date': upload_date,
|
||||
'title': title,
|
||||
'ext': u'mp3',
|
||||
'description': description.decode('utf-8')
|
||||
'description': description
|
||||
}]
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user