projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4a903b9
)
[mixcloud] Capture error message (#9156)
author
Sergey M․
<dstftw@gmail.com>
Mon, 11 Apr 2016 14:45:58 +0000
(20:45 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Mon, 11 Apr 2016 14:45:58 +0000
(20:45 +0600)
youtube_dl/extractor/mixcloud.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/mixcloud.py
b/youtube_dl/extractor/mixcloud.py
index 101497118275b7f1b5bf0564048f1dc9fc4b878b..9638cc9e6d09a62ba6b8de278a6dc8e53dbabd51 100644
(file)
--- a/
youtube_dl/extractor/mixcloud.py
+++ b/
youtube_dl/extractor/mixcloud.py
@@
-7,6
+7,7
@@
from ..compat import compat_urllib_parse_unquote
from ..utils import (
ExtractorError,
HEADRequest,
from ..utils import (
ExtractorError,
HEADRequest,
+ NO_DEFAULT,
parse_count,
str_to_int,
)
parse_count,
str_to_int,
)
@@
-63,8
+64,17
@@
class MixcloudIE(InfoExtractor):
webpage = self._download_webpage(url, track_id)
webpage = self._download_webpage(url, track_id)
+ message = self._html_search_regex(
+ r'(?s)<div[^>]+class="global-message cloudcast-disabled-notice-light"[^>]*>(.+?)<(?:a|/div)',
+ webpage, 'error message', default=None)
+
preview_url = self._search_regex(
preview_url = self._search_regex(
- r'\s(?:data-preview-url|m-preview)="([^"]+)"', webpage, 'preview url')
+ r'\s(?:data-preview-url|m-preview)="([^"]+)"',
+ webpage, 'preview url', default=None if message else NO_DEFAULT)
+
+ if message:
+ raise ExtractorError('%s said: %s' % (self.IE_NAME, message), expected=True)
+
song_url = re.sub(r'audiocdn(\d+)', r'stream\1', preview_url)
song_url = song_url.replace('/previews/', '/c/originals/')
if not self._check_url(song_url, track_id, 'mp3'):
song_url = re.sub(r'audiocdn(\d+)', r'stream\1', preview_url)
song_url = song_url.replace('/previews/', '/c/originals/')
if not self._check_url(song_url, track_id, 'mp3'):