Merge branch 'master' of github.com:thesues/youtube-dl

[youtube-dl] / youtube_dl / InfoExtractors.py

diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index bc26f2f30c0816be06c6a0a00b66254db5dbdbad..7221ae41e4796adc0830b4ae789556ec3d1e7d26 100644 (file)
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -3019,7 +3019,10 @@ class YoukuIE(InfoExtractor):
                video_id = mobj.group('ID')
 
                info_url = 'http://v.youku.com/player/getPlayList/VideoIDS/' + video_id
+<<<<<<< HEAD
                print info_url
+=======
+>>>>>>> 51661d86005ffbdd4debd051cd9683cf5f5c2fe9
 
                request = urllib2.Request(info_url, None, std_headers)
                try:
@@ -3078,14 +3081,13 @@ class YoukuIE(InfoExtractor):
                        download_url = 'http://f.youku.com/player/getFlvPath/sid/%s_%02X/st/flv/fileid/%s?k=%s' % (sid, index, temp_fileid, key)
                        print download_url
                        info = {
-                               'id': '%s_part%d' % (video_id, index),
+                               'id': '%s_part%02d' % (video_id, index),
                                'url': download_url,
                                'uploader': None,
-                               'title': video_title
+                               'title': video_title,
                                'ext': ext,
                                'format': u'NA'
                        }
                        files_info.append(info)
 
                return files_info
-# vim: tabstop=4 shiftwidth=4 softtabstop=4 noexpandtab