X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fqqmusic.py;h=174c8e0ae751fa9d1a875c666faa906d9729330f;hb=511565282861e26913caddc1bcc0c865a9eec786;hp=1c22943a5ae8520274a579065867f755db9075a5;hpb=8afff9f849e43c9c4194e302c06b5bec38edd83f;p=youtube-dl
diff --git a/youtube_dl/extractor/qqmusic.py b/youtube_dl/extractor/qqmusic.py
index 1c22943a5..174c8e0ae 100644
--- a/youtube_dl/extractor/qqmusic.py
+++ b/youtube_dl/extractor/qqmusic.py
@@ -6,7 +6,10 @@ import time
import re
from .common import InfoExtractor
-from ..utils import strip_jsonp
+from ..utils import (
+ strip_jsonp,
+ unescapeHTML,
+)
from ..compat import compat_urllib_request
@@ -21,6 +24,7 @@ class QQMusicIE(InfoExtractor):
'title': 'å¯æ没å¦æ',
'upload_date': '20141227',
'creator': 'æä¿æ°',
+ 'description': 'md5:4348ff1dd24036906baa7b6f973f8d30',
}
}]
@@ -37,17 +41,23 @@ class QQMusicIE(InfoExtractor):
detail_info_page = self._download_webpage(
'http://s.plcloud.music.qq.com/fcgi-bin/fcg_yqq_song_detail_info.fcg?songmid=%s&play=0' % mid,
mid, note='Download song detail info',
- errnote='Unable to get song detail info')
+ errnote='Unable to get song detail info', encoding='gbk')
song_name = self._html_search_regex(
r"songname:\s*'([^']+)'", detail_info_page, 'song name')
publish_time = self._html_search_regex(
r'åè¡æ¶é´ï¼(\d{4}-\d{2}-\d{2})', detail_info_page,
- 'publish time').replace('-', '')
+ 'publish time', default=None)
+ if publish_time:
+ publish_time = publish_time.replace('-', '')
singer = self._html_search_regex(
- r"singer:\s*'([^']+)", detail_info_page, 'singer')
+ r"singer:\s*'([^']+)", detail_info_page, 'singer', default=None)
+
+ lrc_content = self._html_search_regex(
+ r'
]*>([^<>]+)
',
+ detail_info_page, 'LRC lyrics', default=None)
guid = self.m_r_get_ruin()
@@ -63,10 +73,29 @@ class QQMusicIE(InfoExtractor):
'title': song_name,
'upload_date': publish_time,
'creator': singer,
+ 'description': lrc_content,
}
-class QQMusicSingerIE(InfoExtractor):
+class QQPlaylistBaseIE(InfoExtractor):
+ @staticmethod
+ def qq_static_url(category, mid):
+ return 'http://y.qq.com/y/static/%s/%s/%s/%s.html' % (category, mid[-2], mid[-1], mid)
+
+ @classmethod
+ def get_entries_from_page(cls, page):
+ entries = []
+
+ for item in re.findall(r'class="data"[^<>]*>([^<>]+)', page):
+ song_mid = unescapeHTML(item).split('|')[-5]
+ entries.append(cls.url_result(
+ 'http://y.qq.com/#type=song&mid=' + song_mid, 'QQMusic',
+ song_mid))
+
+ return entries
+
+
+class QQMusicSingerIE(QQPlaylistBaseIE):
_VALID_URL = r'http://y.qq.com/#type=singer&mid=(?P[0-9A-Za-z]+)'
_TEST = {
'url': 'http://y.qq.com/#type=singer&mid=001BLpXF2DyJe2',
@@ -82,15 +111,9 @@ class QQMusicSingerIE(InfoExtractor):
mid = self._match_id(url)
singer_page = self._download_webpage(
- 'http://y.qq.com/y/static/singer/%s/%s/%s.html' % (mid[-2], mid[-1], mid),
- 'Download singer page')
-
- entries = []
+ self.qq_static_url('singer', mid), mid, 'Download singer page')
- for item in re.findall(r'([^<>]+)', singer_page):
- song_mid = item.split('|')[-5]
- entries.append(self.url_result(
- 'http://y.qq.com/#type=song&mid=' + song_mid, 'QQMusic', song_mid))
+ entries = self.get_entries_from_page(singer_page)
singer_name = self._html_search_regex(
r"singername\s*:\s*'([^']+)'", singer_page, 'singer name',
@@ -108,8 +131,40 @@ class QQMusicSingerIE(InfoExtractor):
req.add_header(
'Referer', 'http://s.plcloud.music.qq.com/xhr_proxy_utf8.html')
singer_desc_page = self._download_xml(
- req, 'Donwload singer description XML')
+ req, mid, 'Donwload singer description XML')
singer_desc = singer_desc_page.find('./data/info/desc').text
return self.playlist_result(entries, mid, singer_name, singer_desc)
+
+
+class QQMusicAlbumIE(QQPlaylistBaseIE):
+ _VALID_URL = r'http://y.qq.com/#type=album&mid=(?P[0-9A-Za-z]+)'
+
+ _TEST = {
+ 'url': 'http://y.qq.com/#type=album&mid=000gXCTb2AhRR1&play=0',
+ 'info_dict': {
+ 'id': '000gXCTb2AhRR1',
+ 'title': 'æ们é½æ¯è¿æ ·é¿å¤§ç',
+ 'description': 'md5:d216c55a2d4b3537fe4415b8767d74d6',
+ },
+ 'playlist_count': 4,
+ }
+
+ def _real_extract(self, url):
+ mid = self._match_id(url)
+
+ album_page = self._download_webpage(
+ self.qq_static_url('album', mid), mid, 'Download album page')
+
+ entries = self.get_entries_from_page(album_page)
+
+ album_name = self._html_search_regex(
+ r"albumname\s*:\s*'([^']+)',", album_page, 'album name',
+ default=None)
+
+ album_detail = self._html_search_regex(
+ r'\s*
((?:[^<>]+(?:
)?)+)
',
+ album_page, 'album details', default=None)
+
+ return self.playlist_result(entries, mid, album_name, album_detail)