projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'jaimeMF/yt-toplists'
[youtube-dl]
/
youtube_dl
/
extractor
/
mixcloud.py
diff --git
a/youtube_dl/extractor/mixcloud.py
b/youtube_dl/extractor/mixcloud.py
index a200dcd74a5a7af220cedea02a60c01cfd643e79..04fa3ac7ac7a3bc5ffa570d201ddfbb54762fc2b 100644
(file)
--- a/
youtube_dl/extractor/mixcloud.py
+++ b/
youtube_dl/extractor/mixcloud.py
@@
-1,13
+1,10
@@
import json
import re
import json
import re
-import socket
from .common import InfoExtractor
from ..utils import (
from .common import InfoExtractor
from ..utils import (
- compat_http_client,
- compat_urllib_error,
- compat_urllib_request,
unified_strdate,
unified_strdate,
+ ExtractorError,
)
)
@@
-31,9
+28,11
@@
class MixcloudIE(InfoExtractor):
"""Returns 1st active url from list"""
for url in url_list:
try:
"""Returns 1st active url from list"""
for url in url_list:
try:
- compat_urllib_request.urlopen(url)
+ # We only want to know if the request succeed
+ # don't download the whole file
+ self._request_webpage(url, None, False)
return url
return url
- except
(compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error)
:
+ except
ExtractorError
:
url = None
return None
url = None
return None
@@
-60,7
+59,7
@@
class MixcloudIE(InfoExtractor):
'title': info['name'],
'url': final_song_url,
'ext': 'mp3',
'title': info['name'],
'url': final_song_url,
'ext': 'mp3',
- 'description': info
['description']
,
+ 'description': info
.get('description')
,
'thumbnail': info['pictures'].get('extra_large'),
'uploader': info['user']['name'],
'uploader_id': info['user']['username'],
'thumbnail': info['pictures'].get('extra_large'),
'uploader': info['user']['name'],
'uploader_id': info['user']['username'],