aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/InfoExtractors.py15
1 files changed, 2 insertions, 13 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 3b24f593d..d6748981b 100644
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -2995,22 +2995,15 @@ class YoukuIE(InfoExtractor):
#return ''.join(mixed)
return mixed
-
def _get_file_id(self, fileId, seed):
mixed = self._get_file_ID_mix_string(seed)
ids = fileId.split('*')
realId = []
for ch in ids:
- if ch is not '':
+ if ch:
realId.append(mixed[int(ch)])
return ''.join(realId)
- def _gen_key(self, key1, key2):
- pass
-
-
-
-
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
if mobj is None:
@@ -3019,10 +3012,6 @@ 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:
@@ -3079,7 +3068,7 @@ class YoukuIE(InfoExtractor):
temp_fileid = '%s%02X%s' % (fileid[0:8], index, fileid[10:])
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%02d' % (video_id, index),
'url': download_url,