Merge tag 'upstream/2015.11.27.1'

[youtubedl] / youtube_dl / extractor / iqiyi.py

diff --git a/youtube_dl/extractor/iqiyi.py b/youtube_dl/extractor/iqiyi.py
index afb7f4e6153ac84795503dabf049de5ed5ecf5bb..2df1da3f00a9d9655a0c9f6a447510dcf9e2caf0 100644 (file)
--- a/youtube_dl/extractor/iqiyi.py
+++ b/youtube_dl/extractor/iqiyi.py
@@ -95,6 +95,10 @@ class IqiyiIE(InfoExtractor):
         ('10', 'h1'),
     ]
 
         ('10', 'h1'),
     ]
 

+    @staticmethod
+    def md5_text(text):
+        return hashlib.md5(text.encode('utf-8')).hexdigest()
+

     def construct_video_urls(self, data, video_id, _uuid):
         def do_xor(x, y):
             a = y % 3
     def construct_video_urls(self, data, video_id, _uuid):
         def do_xor(x, y):
             a = y % 3


@@ -121,7 +125,7 @@ class IqiyiIE(InfoExtractor):
                 note='Download path key of segment %d for format %s' % (segment_index + 1, format_id)
             )['t']
             t = str(int(math.floor(int(tm) / (600.0))))
                 note='Download path key of segment %d for format %s' % (segment_index + 1, format_id)
             )['t']
             t = str(int(math.floor(int(tm) / (600.0))))

-            return hashlib.md5((t + mg + x).encode('utf8')).hexdigest()
+            return self.md5_text(t + mg + x)

 
         video_urls_dict = {}
         for format_item in data['vp']['tkl'][0]['vs']:
 
         video_urls_dict = {}
         for format_item in data['vp']['tkl'][0]['vs']:


@@ -179,20 +183,19 @@ class IqiyiIE(InfoExtractor):
 
     def get_raw_data(self, tvid, video_id, enc_key, _uuid):
         tm = str(int(time.time()))
 
     def get_raw_data(self, tvid, video_id, enc_key, _uuid):
         tm = str(int(time.time()))

+        tail = tm + tvid

         param = {
             'key': 'fvip',
         param = {
             'key': 'fvip',

-            'src': hashlib.md5(b'youtube-dl').hexdigest(),
+            'src': self.md5_text('youtube-dl'),

             'tvId': tvid,
             'vid': video_id,
             'vinfo': 1,
             'tm': tm,
             'tvId': tvid,
             'vid': video_id,
             'vinfo': 1,
             'tm': tm,

-            'enc': hashlib.md5(
-                (enc_key + tm + tvid).encode('utf8')).hexdigest(),
+            'enc': self.md5_text(enc_key + tail),

             'qyid': _uuid,
             'tn': random.random(),
             'um': 0,
             'qyid': _uuid,
             'tn': random.random(),
             'um': 0,

-            'authkey': hashlib.md5(
-                (tm + tvid).encode('utf8')).hexdigest()
+            'authkey': self.md5_text(self.md5_text('') + tail),

         }
 
         api_url = 'http://cache.video.qiyi.com/vms' + '?' + \
         }
 
         api_url = 'http://cache.video.qiyi.com/vms' + '?' + \


@@ -201,7 +204,10 @@ class IqiyiIE(InfoExtractor):
         return raw_data
 
     def get_enc_key(self, swf_url, video_id):
         return raw_data
 
     def get_enc_key(self, swf_url, video_id):

-        enc_key = '8e29ab5666d041c3a1ea76e06dabdffb'
+        # TODO: automatic key extraction
+        # last update at 2015-10-22 for Zombie::bite
+        # '7223c67061dbea1259d0ceb44f44b6d62288f4f80c972170de5201d2321060270e05'[2:66][0::2]
+        enc_key = '2c76de15dcb44bd28ff0927d50d31620'

         return enc_key
 
     def _real_extract(self, url):
         return enc_key
 
     def _real_extract(self, url):