[iqiyi] Reorder imports

[youtube-dl.git] / youtube_dl / extractor / iqiyi.py

diff --git a/youtube_dl/extractor/iqiyi.py b/youtube_dl/extractor/iqiyi.py
index 5645fb6eee1ea05fcd7d823e097e8d47a5e350fe..36029361a87d11fc52869662ae42ca5da57700dc 100644 (file)
--- a/youtube_dl/extractor/iqiyi.py
+++ b/youtube_dl/extractor/iqiyi.py
@@ -1,20 +1,17 @@
 # coding: utf-8
-
 from __future__ import unicode_literals
 
-from .common import InfoExtractor
-
-from ..compat import compat_urllib_parse
-
-from ..utils import ExtractorError
-
+import hashlib
+import math
+import random
 import re
 import time
 import uuid
-import math
-import random
 import zlib
-import hashlib
+
+from .common import InfoExtractor
+from ..compat import compat_urllib_parse
+from ..utils import ExtractorError
 
 
 class IqiyiIE(InfoExtractor):
@@ -161,18 +158,20 @@ class IqiyiIE(InfoExtractor):
         webpage = self._download_webpage(
             url, 'temp_id', note='download video page')
         tvid = self._search_regex(
-            r'tvId ?= ?(\'|\")(?P<tvid>\d+)', webpage, 'tvid', flags=re.I, group='tvid')
+            r'data-player-tvid\s*=\s*[\'"](\d+)', webpage, 'tvid')
         video_id = self._search_regex(
-            r'videoId ?= ?(\'|\")(?P<video_id>[a-z\d]+)',
-            webpage, 'video_id', flags=re.I, group='video_id')
+            r'data-player-videoid\s*=\s*[\'"]([a-f\d]+)', webpage, 'video_id')
         swf_url = self._search_regex(
-            r'(?P<swf>http://.+?MainPlayer.+?\.swf)', webpage, 'swf')
+            r'(http://.+?MainPlayer.+?\.swf)', webpage, 'swf player URL')
         _uuid = uuid.uuid4().hex
 
         enc_key = self.get_enc_key(swf_url, video_id)
 
         raw_data = self.get_raw_data(tvid, video_id, enc_key, _uuid)
-        assert raw_data['code'] == 'A000000'
+
+        if raw_data['code'] != 'A000000':
+            raise ExtractorError('Unable to load data. Error code: ' + raw_data['code'])
+
         if not raw_data['data']['vp']['tkl']:
             raise ExtractorError('No support iQiqy VIP video')