aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/kuwo.py
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-03-15 02:20:37 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-03-16 02:41:18 +0800
commit3ff8279e80b4c057f12998dcca5164209bb71078 (patch)
tree81da1b7ecddeea466224f4d1861e052412319f1e /youtube_dl/extractor/kuwo.py
parentcb6e477dfe09b68a810e587269958b1e56077b00 (diff)
[kuwo:mv] Fix the test and extraction of georestricted MVs
Diffstat (limited to 'youtube_dl/extractor/kuwo.py')
-rw-r--r--youtube_dl/extractor/kuwo.py33
1 files changed, 27 insertions, 6 deletions
diff --git a/youtube_dl/extractor/kuwo.py b/youtube_dl/extractor/kuwo.py
index 700e44b63..f94804d06 100644
--- a/youtube_dl/extractor/kuwo.py
+++ b/youtube_dl/extractor/kuwo.py
@@ -23,7 +23,7 @@ class KuwoBaseIE(InfoExtractor):
{'format': 'aac', 'ext': 'aac', 'abr': 48, 'preference': 10}
]
- def _get_formats(self, song_id):
+ def _get_formats(self, song_id, tolerate_ip_deny=False):
formats = []
for file_format in self._FORMATS:
song_url = self._download_webpage(
@@ -32,7 +32,7 @@ class KuwoBaseIE(InfoExtractor):
song_id, note='Download %s url info' % file_format['format'],
)
- if song_url == 'IPDeny':
+ if song_url == 'IPDeny' and not tolerate_ip_deny:
raise ExtractorError('This song is blocked in this region', expected=True)
if song_url.startswith('http://') or song_url.startswith('https://'):
@@ -43,7 +43,12 @@ class KuwoBaseIE(InfoExtractor):
'preference': file_format['preference'],
'abr': file_format.get('abr'),
})
- self._sort_formats(formats)
+
+ # XXX _sort_formats fails if there are not formats, while it's not the
+ # desired behavior if 'IPDeny' is ignored
+ # This check can be removed if https://github.com/rg3/youtube-dl/pull/8051 is merged
+ if not tolerate_ip_deny:
+ self._sort_formats(formats)
return formats
@@ -288,10 +293,16 @@ class KuwoMvIE(KuwoBaseIE):
'url': 'http://www.kuwo.cn/mv/6480076/',
'info_dict': {
'id': '6480076',
- 'ext': 'mkv',
- 'title': '我们家MV',
+ 'ext': 'mp4',
+ 'title': 'My HouseMV',
'creator': '2PM',
},
+ # In this video, music URLs (anti.s) are blocked outside China and
+ # USA, while the MV URL (mvurl) is available globally, so force the MV
+ # URL for consistent results in different countries
+ 'params': {
+ 'format': 'mv',
+ },
}
_FORMATS = KuwoBaseIE._FORMATS + [
{'format': 'mkv', 'ext': 'mkv', 'preference': 250},
@@ -313,7 +324,17 @@ class KuwoMvIE(KuwoBaseIE):
else:
raise ExtractorError('Unable to find song or singer names')
- formats = self._get_formats(song_id)
+ formats = self._get_formats(song_id, tolerate_ip_deny=True)
+
+ mv_url = self._download_webpage(
+ 'http://www.kuwo.cn/yy/st/mvurl?rid=MUSIC_%s' % song_id,
+ song_id, note='Download %s MV URL' % song_id)
+ formats.append({
+ 'url': mv_url,
+ 'format_id': 'mv',
+ })
+
+ self._sort_formats(formats)
return {
'id': song_id,