projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5d98908
)
[QQMusic] Implement the guid algorithm
author
Yen Chi Hsuan
<yan12125@gmail.com>
Wed, 18 Mar 2015 05:56:02 +0000
(13:56 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Thu, 16 Apr 2015 09:34:54 +0000
(17:34 +0800)
youtube_dl/extractor/qqmusic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/qqmusic.py
b/youtube_dl/extractor/qqmusic.py
index 3dc6373924290d9d4abea7570295041b2e912afd..93440b9545763b0661c5245a8e60474fe8493058 100644
(file)
--- a/
youtube_dl/extractor/qqmusic.py
+++ b/
youtube_dl/extractor/qqmusic.py
@@
-1,13
+1,12
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
+import random
+import time
+
from .common import InfoExtractor
from ..utils import strip_jsonp
from .common import InfoExtractor
from ..utils import strip_jsonp
-# guid is a random number generated in javascript, but seems a fixed number
-# also works
-guid = '1'
-
class QQMusicIE(InfoExtractor):
_VALID_URL = r'http://y.qq.com/#type=song&mid=(?P<id>[0-9A-Za-z]+)'
class QQMusicIE(InfoExtractor):
_VALID_URL = r'http://y.qq.com/#type=song&mid=(?P<id>[0-9A-Za-z]+)'
@@
-23,6
+22,13
@@
class QQMusicIE(InfoExtractor):
}
}]
}
}]
+ # Reference: m_r_GetRUin() in top_player.js
+ # http://imgcache.gtimg.cn/music/portal_v3/y/top_player.js
+ @staticmethod
+ def m_r_get_ruin():
+ curMs = int(time.time() * 1000) % 1000
+ return int(round(random.random() * 2147483647) * curMs % 1E10)
+
def _real_extract(self, url):
mid = self._match_id(url)
def _real_extract(self, url):
mid = self._match_id(url)
@@
-41,6
+47,8
@@
class QQMusicIE(InfoExtractor):
singer = self._html_search_regex(
r"singer:\s*'([^']+)", detail_info_page, 'singer')
singer = self._html_search_regex(
r"singer:\s*'([^']+)", detail_info_page, 'singer')
+ guid = self.m_r_get_ruin()
+
vkey = self._download_json(
'http://base.music.qq.com/fcgi-bin/fcg_musicexpress.fcg?json=3&guid=%s' % guid,
mid, note='Retrieve vkey', errnote='Unable to get vkey',
vkey = self._download_json(
'http://base.music.qq.com/fcgi-bin/fcg_musicexpress.fcg?json=3&guid=%s' % guid,
mid, note='Retrieve vkey', errnote='Unable to get vkey',