From 898e1b63cf523df3a124fb9b4c67d703f5d1ffcc Mon Sep 17 00:00:00 2001
From: Mort Yao <mort.yao@gmail.com>
Date: Thu, 24 Jan 2013 21:12:15 +0100
Subject: [PATCH] iQIYI: fix #77, iambus/youku-lixian#44,
 iambus/youku-lixian#52

---
 CHANGELOG.txt               |  8 ++++++++
 you_get/downloader/iqiyi.py | 16 ++++++++++++----
 you_get/version.py          |  4 ++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0c2d2b81..c75732bd 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+0.3dev-20130125
+---------------
+
+*Date: 2013-01-25*
+
+* Dailymotion: downloading best quality available now.
+* iQIYI: fix `#77 <https://github.com/soimort/you-get/issues/77>`_.
+
 0.3dev-20130118
 ---------------
 
diff --git a/you_get/downloader/iqiyi.py b/you_get/downloader/iqiyi.py
index d0c87ef3..c8693dbf 100644
--- a/you_get/downloader/iqiyi.py
+++ b/you_get/downloader/iqiyi.py
@@ -14,6 +14,7 @@ def iqiyi_download(url, output_dir = '.', merge = True, info_only = False):
     #info_url = 'http://cache.video.qiyi.com/v/%s/%s/%s/' % (videoId, pid, ptype)
     videoId = r1(r'''["']videoId["'][:=]["']([^"']+)["']''', html)
     assert videoId
+    
     info_url = 'http://cache.video.qiyi.com/v/%s' % videoId
     info_xml = get_html(info_url)
     
@@ -23,12 +24,19 @@ def iqiyi_download(url, output_dir = '.', merge = True, info_only = False):
     size = int(doc.getElementsByTagName('totalBytes')[0].firstChild.nodeValue)
     urls = [n.firstChild.nodeValue for n in doc.getElementsByTagName('file')]
     assert urls[0].endswith('.f4v'), urls[0]
-    tss = ["http://61.155.192.31/videos2" + url[33:-4] + ".ts" for url in urls] # use MPEG-TS .ts files temporarily
-    # FIXME: find the key to access .f4v files
     
-    print_info(site_info, title, 'ts', size)
+    for i in range(len(urls)):
+        temp_url = "http://data.video.qiyi.com/%s" % urls[i].split("/")[-1].split(".")[0] + ".ts"
+        try:
+            response = request.urlopen(temp_url)
+        except request.HTTPError as e:
+            key = r1(r'key=(.*)', e.geturl())
+        assert key
+        urls[i] += "?key=%s" % key
+    
+    print_info(site_info, title, 'flv', size)
     if not info_only:
-        download_urls_chunked(tss, title, 'ts', size, output_dir = output_dir, merge = merge) # use MPEG-TS .ts files temporarily
+        download_urls(urls, title, 'flv', size, output_dir = output_dir, merge = merge)
 
 site_info = "iQIYI.com"
 download = iqiyi_download
diff --git a/you_get/version.py b/you_get/version.py
index 46e257c4..7d443436 100644
--- a/you_get/version.py
+++ b/you_get/version.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 
-__version__ = '0.3dev-20130118'
-__date__ = '2013-01-18'
+__version__ = '0.3dev-20130125'
+__date__ = '2013-01-25'