[iqiyi] SWF URLs are not used anymore

Since automatic detection of enc_key failed

Closes #8705
This commit is contained in:
Yen Chi Hsuan 2016-03-01 08:42:33 +08:00
parent e781ab63db
commit 9fb556eef0

View File

@ -498,7 +498,7 @@ def get_raw_data(self, tvid, video_id, enc_key, _uuid):
raw_data = self._download_json(api_url, video_id) raw_data = self._download_json(api_url, video_id)
return raw_data return raw_data
def get_enc_key(self, swf_url, video_id): def get_enc_key(self, video_id):
# TODO: automatic key extraction # TODO: automatic key extraction
# last update at 2016-01-22 for Zombie::bite # last update at 2016-01-22 for Zombie::bite
enc_key = '6ab6d0280511493ba85594779759d4ed' enc_key = '6ab6d0280511493ba85594779759d4ed'
@ -551,11 +551,9 @@ def _real_extract(self, url):
r'data-player-tvid\s*=\s*[\'"](\d+)', webpage, 'tvid') r'data-player-tvid\s*=\s*[\'"](\d+)', webpage, 'tvid')
video_id = self._search_regex( video_id = self._search_regex(
r'data-player-videoid\s*=\s*[\'"]([a-f\d]+)', webpage, 'video_id') r'data-player-videoid\s*=\s*[\'"]([a-f\d]+)', webpage, 'video_id')
swf_url = self._search_regex(
r'(http://[^\'"]+MainPlayer[^.]+\.swf)', webpage, 'swf player URL')
_uuid = uuid.uuid4().hex _uuid = uuid.uuid4().hex
enc_key = self.get_enc_key(swf_url, video_id) enc_key = self.get_enc_key(video_id)
raw_data = self.get_raw_data(tvid, video_id, enc_key, _uuid) raw_data = self.get_raw_data(tvid, video_id, enc_key, _uuid)