diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2015-07-19 02:27:59 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2015-07-19 02:27:59 +0800 |
| commit | fb8bc3f81836adff9278b684b29b92d4980818f3 (patch) | |
| tree | aac8ececf70750a62b60cbe612b2fe5bb72b0898 /youtube_dl | |
| parent | b0bff54b08a44966d321e8de0ed08dc1dde6b96e (diff) | |
| parent | 1b541d8d6ee5e3543253501d725af7ce4a55cad8 (diff) | |
Merge branch 'fix-iqiyi-2015-07-17' of https://github.com/sceext2/youtube_dl into sceext2-fix-iqiyi-2015-07-17
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/iqiyi.py | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/youtube_dl/extractor/iqiyi.py b/youtube_dl/extractor/iqiyi.py index 0f6707d7c..ac5416953 100644 --- a/youtube_dl/extractor/iqiyi.py +++ b/youtube_dl/extractor/iqiyi.py @@ -212,20 +212,7 @@ class IqiyiIE(InfoExtractor): return raw_data def get_enc_key(self, swf_url, video_id): - filename, _ = os.path.splitext(url_basename(swf_url)) - enc_key_json = self._downloader.cache.load('iqiyi-enc-key', filename) - if enc_key_json is not None: - return enc_key_json[0] - - req = self._request_webpage( - swf_url, video_id, note='download swf content') - cn = req.read() - cn = zlib.decompress(cn[8:]) - pt = re.compile(b'MixerRemote\x08(?P<enc_key>.+?)\$&vv') - enc_key = self._search_regex(pt, cn, 'enc_key').decode('utf8') - - self._downloader.cache.store('iqiyi-enc-key', filename, [enc_key]) - + enc_key = '8e29ab5666d041c3a1ea76e06dabdffb' return enc_key def _real_extract(self, url): |