projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2d30b92
)
[soundcloud] fix client id extraction for non fatal requests
author
Remita Amine
<remitamine@gmail.com>
Tue, 31 Dec 2019 20:31:22 +0000
(21:31 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Tue, 31 Dec 2019 20:31:22 +0000
(21:31 +0100)
youtube_dl/extractor/soundcloud.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/soundcloud.py
b/youtube_dl/extractor/soundcloud.py
index b3ffef8df9450eb2f66ef5f4fba8197e2f9f72af..62e9d8643e5507933dbd1f50a1e648eb55a215d8 100644
(file)
--- a/
youtube_dl/extractor/soundcloud.py
+++ b/
youtube_dl/extractor/soundcloud.py
@@
-15,6
+15,7
@@
from ..compat import (
compat_urlparse,
)
from ..utils import (
compat_urlparse,
)
from ..utils import (
+ error_to_compat_str,
ExtractorError,
float_or_none,
HEADRequest,
ExtractorError,
float_or_none,
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):
webpage = self._download_webpage('https://soundcloud.com/', None)
for src in reversed(re.findall(r'<script[^>]+src="([^"]+)"', webpage)):
def _update_client_id(self):
webpage = self._download_webpage('https://soundcloud.com/', None)
for src in reversed(re.findall(r'<script[^>]+src="([^"]+)"', webpage)):
@@
-282,11
+286,14
@@
class SoundcloudIE(InfoExtractor):
script, 'client id', default=None)
if client_id:
self._CLIENT_ID = client_id
script, 'client id', default=None)
if client_id:
self._CLIENT_ID = client_id
- self._
downloader.cache.store('soundcloud', 'client_id',
client_id)
+ self._
store_client_id(
client_id)
return
raise ExtractorError('Unable to extract client id')
def _download_json(self, *args, **kwargs):
return
raise ExtractorError('Unable to extract client id')
def _download_json(self, *args, **kwargs):
+ non_fatal = kwargs.get('fatal') is False
+ if non_fatal:
+ del kwargs['fatal']
query = kwargs.get('query', {}).copy()
for _ in range(2):
query['client_id'] = self._CLIENT_ID
query = kwargs.get('query', {}).copy()
for _ in range(2):
query['client_id'] = self._CLIENT_ID
@@
-295,8
+302,12
@@
class SoundcloudIE(InfoExtractor):
return super(SoundcloudIE, self)._download_json(*args, **compat_kwargs(kwargs))
except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401:
return super(SoundcloudIE, self)._download_json(*args, **compat_kwargs(kwargs))
except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401:
+ self._store_client_id(None)
self._update_client_id()
continue
self._update_client_id()
continue
+ elif non_fatal:
+ self._downloader.report_warning(error_to_compat_str(e))
+ return False
raise
def _real_initialize(self):
raise
def _real_initialize(self):