Prepare for release.

[youtubedl] / youtube_dl / extractor / youku.py

diff --git a/youtube_dl/extractor/youku.py b/youtube_dl/extractor/youku.py
index 78caeb8b36e0be8cf4e97365d9e28251723059b7..69ecc837a4d6d94c82a1055cb7cc41d6e6663763 100644 (file)
--- a/youtube_dl/extractor/youku.py
+++ b/youtube_dl/extractor/youku.py
@@ -4,12 +4,13 @@ from __future__ import unicode_literals
 import base64
 
 from .common import InfoExtractor
 import base64
 
 from .common import InfoExtractor

-from ..utils import ExtractorError
-

 from ..compat import (
     compat_urllib_parse,
     compat_ord,
 from ..compat import (
     compat_urllib_parse,
     compat_ord,

-    compat_urllib_request,
+)
+from ..utils import (
+    ExtractorError,
+    sanitized_Request,

 )
 
 
 )
 
 


@@ -49,6 +50,17 @@ class YoukuIE(InfoExtractor):
         },
         'playlist_count': 13,
         'skip': 'Available in China only',
         },
         'playlist_count': 13,
         'skip': 'Available in China only',

+    }, {
+        'url': 'http://v.youku.com/v_show/id_XNjA1NzA2Njgw.html',
+        'note': 'Video protected with password',
+        'info_dict': {
+            'id': 'XNjA1NzA2Njgw',
+            'title': '邢義田复旦讲座之想象中的胡人—从“左衽孔子”说起',
+        },
+        'playlist_count': 19,
+        'params': {
+            'videopassword': '100600',
+        },

     }]
 
     def construct_video_urls(self, data1, data2):
     }]
 
     def construct_video_urls(self, data1, data2):


@@ -176,7 +188,7 @@ class YoukuIE(InfoExtractor):
         video_id = self._match_id(url)
 
         def retrieve_data(req_url, note):
         video_id = self._match_id(url)
 
         def retrieve_data(req_url, note):

-            req = compat_urllib_request.Request(req_url)
+            req = sanitized_Request(req_url)

 
             cn_verification_proxy = self._downloader.params.get('cn_verification_proxy')
             if cn_verification_proxy:
 
             cn_verification_proxy = self._downloader.params.get('cn_verification_proxy')
             if cn_verification_proxy:


@@ -185,9 +197,15 @@ class YoukuIE(InfoExtractor):
             raw_data = self._download_json(req, video_id, note=note)
             return raw_data['data'][0]
 
             raw_data = self._download_json(req, video_id, note=note)
             return raw_data['data'][0]
 

+        video_password = self._downloader.params.get('videopassword', None)
+

         # request basic data
         # request basic data

+        basic_data_url = 'http://v.youku.com/player/getPlayList/VideoIDS/%s' % video_id
+        if video_password:
+            basic_data_url += '?password=%s' % video_password
+

         data1 = retrieve_data(
         data1 = retrieve_data(

-            'http://v.youku.com/player/getPlayList/VideoIDS/%s' % video_id,
+            basic_data_url,

             'Downloading JSON metadata 1')
         data2 = retrieve_data(
             'http://v.youku.com/player/getPlayList/VideoIDS/%s/Pf/4/ctype/12/ev/1' % video_id,
             'Downloading JSON metadata 1')
         data2 = retrieve_data(
             'http://v.youku.com/player/getPlayList/VideoIDS/%s/Pf/4/ctype/12/ev/1' % video_id,