w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[soundcloud] fix client id extraction for non fatal requests

Browse source
This commit is contained in:
Remita Amine 2019-12-31 21:31:22 +01:00
parent 2d30b92e11
commit de7aade2f8
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
youtube_dl/extractor/soundcloud.py
View file

@ -15,6 +15,7 @@ from ..compat import (
compat_urlparse, compat_urlparse,
) )
from ..utils import ( from ..utils import (
error_to_compat_str,
ExtractorError, ExtractorError,
float_or_none, float_or_none,
HEADRequest, HEADRequest,
@ -272,6 +273,9 @@ class SoundcloudIE(InfoExtractor):
'original': 0, 'original': 0,
} }
def _store_client_id(self, client_id):
self._downloader.cache.store('soundcloud', 'client_id', client_id)
def _update_client_id(self): def _update_client_id(self):
webpage = self._download_webpage('https://soundcloud.com/', None) webpage = self._download_webpage('https://soundcloud.com/', None)
for src in reversed(re.findall(r'<script[^>]+src="([^"]+)"', webpage)): for src in reversed(re.findall(r'<script[^>]+src="([^"]+)"', webpage)):
@ -282,11 +286,14 @@ class SoundcloudIE(InfoExtractor):
script, 'client id', default=None) script, 'client id', default=None)
if client_id: if client_id:
self._CLIENT_ID = client_id self._CLIENT_ID = client_id
self._downloader.cache.store('soundcloud', 'client_id', client_id) self._store_client_id(client_id)
return return
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
if non_fatal:
del kwargs['fatal']
query = kwargs.get('query', {}).copy() query = kwargs.get('query', {}).copy()
for _ in range(2): for _ in range(2):
query['client_id'] = self._CLIENT_ID query['client_id'] = self._CLIENT_ID
@ -295,8 +302,12 @@ class SoundcloudIE(InfoExtractor):
return super(SoundcloudIE, self)._download_json(*args, **compat_kwargs(kwargs)) return super(SoundcloudIE, self)._download_json(*args, **compat_kwargs(kwargs))
except ExtractorError as e: except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401: if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401:
self._store_client_id(None)
self._update_client_id() self._update_client_id()
continue continue
elif non_fatal:
self._downloader.report_warning(error_to_compat_str(e))
return False
raise raise
def _real_initialize(self): def _real_initialize(self):