X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fiqiyi.py;h=18a7587a257ae1f4fb2dfcb48978afec06ad113a;hb=29e7e0781b1b8e276c28a079bc5b18e1b0db2d5e;hp=747f3f90281caf81fcbfcbb1eacace97715e8e34;hpb=670861bd206ab4063baeb6b80d06a054ce4e1d62;p=youtube-dl.git

diff --git a/youtube_dl/extractor/iqiyi.py b/youtube_dl/extractor/iqiyi.py
index 747f3f902..18a7587a2 100644
--- a/youtube_dl/extractor/iqiyi.py
+++ b/youtube_dl/extractor/iqiyi.py
@@ -16,22 +16,23 @@ import random
 import zlib
 import hashlib
 
+
 class IqiyiIE(InfoExtractor):
     IE_NAME = 'iqiyi'
 
     _VALID_URL = r'http://(?:www\.)iqiyi.com/.+?\.html'
 
     _TEST = {
-            'url': 'http://www.iqiyi.com/v_19rrojlavg.html',
-            'md5': '2cb594dc2781e6c941a110d8f358118b',
-            'info_dict': {
-                'id': '9c1fb1b99d192b21c559e5a1a2cb3c73',
-                'title': '美国德州空中惊现奇异云团 酷似UFO',
-                'ext': 'f4v',
-            }
+        'url': 'http://www.iqiyi.com/v_19rrojlavg.html',
+        'md5': '2cb594dc2781e6c941a110d8f358118b',
+        'info_dict': {
+            'id': '9c1fb1b99d192b21c559e5a1a2cb3c73',
+            'title': '美国德州空中惊现奇异云团 酷似UFO',
+            'ext': 'f4v',
+        }
     }
 
-    def construct_video_urls(self, data, video_id, _uuid, bid):
+    def construct_video_urls(self, data, video_id, _uuid):
         def do_xor(x, y):
             a = y % 3
             if a == 1:
@@ -46,7 +47,7 @@ class IqiyiIE(InfoExtractor):
             c = len(b)
             s = ''
             for i in range(c - 1, -1, -1):
-                a = do_xor(int(b[c-i-1], 16), i)
+                a = do_xor(int(b[c - i - 1], 16), i)
                 s += chr(a)
             return s[::-1]
 
@@ -54,16 +55,8 @@ class IqiyiIE(InfoExtractor):
             mg = ')(*&^flash@#$%a'
             tm = self._download_json(
                 'http://data.video.qiyi.com/t?tn=' + str(random.random()), video_id)['t']
-            t = str(int(math.floor(int(tm)/(600.0))))
-            return hashlib.md5(
-                 (t+mg+x).encode('utf8')).hexdigest()
-
-        # get accept format
-        # getting all format will spend minutes for a big video.
-        if bid == 'best':
-            bids = [int(i['bid']) for i in data['vp']['tkl'][0]['vs'] \
-                   if 0 < int(i['bid']) <= 10]
-            bid = str(max(bids))
+            t = str(int(math.floor(int(tm) / (600.0))))
+            return hashlib.md5((t + mg + x).encode('utf8')).hexdigest()
 
         video_urls_dict = {}
         for i in data['vp']['tkl'][0]['vs']:
@@ -80,12 +73,6 @@ class IqiyiIE(InfoExtractor):
                 if t.endswith('mp4'):
                     video_urls_info = i['flvs']
 
-            if int(i['bid']) != int(bid):  # ignore missing match format
-                video_urls.extend(
-                    [('http://example.com/v.flv', ii['b']) for ii in video_urls_info])
-                video_urls_dict[format_id] = video_urls
-                continue
-
             for ii in video_urls_info:
                 vl = ii['l']
                 if not vl.startswith('/'):
@@ -117,24 +104,24 @@ class IqiyiIE(InfoExtractor):
 
     def get_format(self, bid):
         _dict = {
-            '1'  : 'h6',
-            '2'  : 'h5',
-            '3'  : 'h4',
-            '4'  : 'h3',
-            '5'  : 'h2',
-            '10' : 'h1'
+            '1': 'h6',
+            '2': 'h5',
+            '3': 'h4',
+            '4': 'h3',
+            '5': 'h2',
+            '10': 'h1'
         }
         return _dict.get(str(bid), None)
 
     def get_bid(self, format_id):
         _dict = {
-            'h6'   : '1',
-            'h5'   : '2',
-            'h4'   : '3',
-            'h3'   : '4',
-            'h2'   : '5',
-            'h1'   : '10',
-            'best' : 'best'
+            'h6': '1',
+            'h5': '2',
+            'h4': '3',
+            'h3': '4',
+            'h2': '5',
+            'h1': '10',
+            'best': 'best'
         }
         return _dict.get(format_id, None)
 
@@ -174,12 +161,11 @@ 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)
@@ -193,21 +179,16 @@ class IqiyiIE(InfoExtractor):
 
         title = data['vi']['vn']
 
-        format = self._downloader.params.get('format', None)
-        bid = self.get_bid(format) if format else 'best'
-        if not bid:
-            raise ExtractorError('Can\'t get format.')
-
         # generate video_urls_dict
         video_urls_dict = self.construct_video_urls(
-            data, video_id, _uuid, bid)
+            data, video_id, _uuid)
 
         # construct info
         entries = []
         for format_id in video_urls_dict:
             video_urls = video_urls_dict[format_id]
             for i, video_url_info in enumerate(video_urls):
-                if len(entries) < i+1:
+                if len(entries) < i + 1:
                     entries.append({'formats': []})
                 entries[i]['formats'].append(
                     {
@@ -222,7 +203,7 @@ class IqiyiIE(InfoExtractor):
             self._sort_formats(entries[i]['formats'])
             entries[i].update(
                 {
-                    'id': '_part%d' % (i+1),
+                    'id': '_part%d' % (i + 1),
                     'title': title,
                 }
             )