From 2ae79f8f93059d8ba4a46422df0efaffa3101fcf Mon Sep 17 00:00:00 2001
From: ivan <qw7692336@gmail.com>
Date: Wed, 15 Feb 2017 20:07:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BA=86=E6=87=92=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E7=9A=84=E5=90=8C=E6=97=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BA=86=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/you_get/extractors/qq.py | 49 ++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/you_get/extractors/qq.py b/src/you_get/extractors/qq.py
index 1a421c8e..a2d97540 100644
--- a/src/you_get/extractors/qq.py
+++ b/src/you_get/extractors/qq.py
@@ -151,17 +151,6 @@ class QQ(VideoExtractor):
         {'id': 'sd'},
     ]
 
-    def _getvkey(self, vid, format, idx):
-        import uuid
-        appver = '3.2.38.401'
-        guid = uuid.uuid4().hex
-        platform = 11
-        cKey = echo_ckeyv3(vid=vid, guid=guid, player_version=appver, platform=platform)
-        key_api = 'http://vv.video.qq.com/getvkey?vid={vid}&appver={appver}&platform={platform}&otype=json&filename={vid}.p{format1000}.{idx}.mp4&format={format}&cKey={cKey}&guid={guid}&charge=0&encryptVer=5.4&lnk={vid}'.format(vid=vid, appver=appver, format1000=format%1000, format=format, cKey=cKey, guid=guid, platform=platform, idx=idx)
-        part_info = get_html(key_api)
-        key_json = json.loads(match1(part_info, r'QZOutputJson=(.*)')[:-1])
-        return key_json['key']
-
     def prepare(self, **kwargs):
         # vid = kwargs['vid'] if 'vid' in kwargs else None
         # vid = vid if vid is not None else self.vid
@@ -181,12 +170,30 @@ class QQ(VideoExtractor):
         fi = video_json['fl']['fi']  # streams
         self.streams = {}
 
-        def lazy_urls(fid):
-            for idx in range(1, vi0['cl']['fc']+1):
-                yield '{prefix}/{vid}.p{format1000}.{idx}.mp4?vkey={vkey}'.format(prefix=url_prefix, vid=vid, format1000=fid%1000, idx=idx, vkey=self._getvkey(vid, fid, idx))
+        class LazyDict(dict):
+            def __init__(self, stream_id=None, **kwargs):
+                dict.__init__(self, **kwargs)
+                self.stream_id = stream_id
+
+            def _getvkey(self, vid, format, idx):
+                import uuid
+                appver = '3.2.38.401'
+                guid = uuid.uuid4().hex
+                platform = 11
+                cKey = echo_ckeyv3(vid=vid, guid=guid, player_version=appver, platform=platform)
+                key_api = 'http://vv.video.qq.com/getvkey?vid={vid}&appver={appver}&platform={platform}&otype=json&filename={vid}.p{format1000}.{idx}.mp4&format={format}&cKey={cKey}&guid={guid}&charge=0&encryptVer=5.4&lnk={vid}'.format(vid=vid, appver=appver, format1000=format%1000, format=format, cKey=cKey, guid=guid, platform=platform, idx=idx)
+                part_info = get_html(key_api)
+                key_json = json.loads(match1(part_info, r'QZOutputJson=(.*)')[:-1])
+                return key_json['key']
+
+            def __getitem__(self, key):
+                if key == 'src' and 'src' not in self:
+                    self['src'] = ['{prefix}/{vid}.p{format1000}.{idx}.mp4?vkey={vkey}'.format(prefix=url_prefix, vid=vid, format1000=self.stream_id%1000, idx=idx, vkey=self._getvkey(vid, self.stream_id, idx)) for idx in range(1, vi0['cl']['fc']+1)]
+                    return self['src']
+                else:
+                    return dict.__getitem__(self, key)
 
         for f in fi:
-
             # urls = ['{prefix}/{vid}.p{format1000}.{idx}.mp4?vkey={vkey}'.format(prefix=url_prefix, vid=vid, format1000=f['id']%1000, idx=idx, vkey=self._getvkey(vid, f['id'], idx)) for idx in range(1, vi0['cl']['fc']+1)]
 
             # print(vi0['ul']['ui'])
@@ -195,12 +202,12 @@ class QQ(VideoExtractor):
             #     test = '{prefix}/{vid}.p{format1000}.1.mp4?vkey={vkey}'.format(prefix=ui['url'], vid=vid, format1000=f['id']%1000, vkey=vkey)
             #     print(test)
 
-            self.streams[f['name']] = {
-                'video_profile': f['cname'],
-                'size': f['fs'],
-                'container': 'mp4',
-                'src': lazy_urls(f['id']),
-            }
+            self.streams[f['name']] = LazyDict(
+                video_profile=f['cname'],
+                size=f['fs'],
+                container='mp4',
+                stream_id=f['id']
+            )
 
 
 site = QQ()