projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
958d0b6
)
[iqiyi] Improve some variable names and add download notes
author
Yen Chi Hsuan
<yan12125@gmail.com>
Sat, 6 Jun 2015 17:52:51 +0000
(
01:52
+0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Sat, 6 Jun 2015 17:52:51 +0000
(
01:52
+0800)
youtube_dl/extractor/iqiyi.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/iqiyi.py
b/youtube_dl/extractor/iqiyi.py
index 36029361a87d11fc52869662ae42ca5da57700dc..c17e1fde4c3ff969c45e37acd0e3cbab723325f8 100644
(file)
--- a/
youtube_dl/extractor/iqiyi.py
+++ b/
youtube_dl/extractor/iqiyi.py
@@
-48,35
+48,37
@@
class IqiyiIE(InfoExtractor):
s += chr(a)
return s[::-1]
s += chr(a)
return s[::-1]
- def get_path_key(x):
+ def get_path_key(x
, format_id, segment_index
):
mg = ')(*&^flash@#$%a'
tm = self._download_json(
mg = ')(*&^flash@#$%a'
tm = self._download_json(
- 'http://data.video.qiyi.com/t?tn=' + str(random.random()), video_id)['t']
+ 'http://data.video.qiyi.com/t?tn=' + str(random.random()), video_id,
+ note='Download path key of segment %d for format %s' % (segment_index + 1, format_id)
+ )['t']
t = str(int(math.floor(int(tm) / (600.0))))
return hashlib.md5((t + mg + x).encode('utf8')).hexdigest()
video_urls_dict = {}
t = str(int(math.floor(int(tm) / (600.0))))
return hashlib.md5((t + mg + x).encode('utf8')).hexdigest()
video_urls_dict = {}
- for
i
in data['vp']['tkl'][0]['vs']:
- if 0 < int(
i
['bid']) <= 10:
- format_id = self.get_format(
i
['bid'])
+ for
format_item
in data['vp']['tkl'][0]['vs']:
+ if 0 < int(
format_item
['bid']) <= 10:
+ format_id = self.get_format(
format_item
['bid'])
else:
continue
video_urls = []
else:
continue
video_urls = []
- video_urls_info =
i
['fs']
- if not
i
['fs'][0]['l'].startswith('/'):
- t = get_encode_code(
i
['fs'][0]['l'])
+ video_urls_info =
format_item
['fs']
+ if not
format_item
['fs'][0]['l'].startswith('/'):
+ t = get_encode_code(
format_item
['fs'][0]['l'])
if t.endswith('mp4'):
if t.endswith('mp4'):
- video_urls_info =
i
['flvs']
+ video_urls_info =
format_item
['flvs']
- for
ii in video_urls_info
:
- vl =
ii
['l']
+ for
segment_index, segment in enumerate(video_urls_info)
:
+ vl =
segment
['l']
if not vl.startswith('/'):
vl = get_encode_code(vl)
key = get_path_key(
if not vl.startswith('/'):
vl = get_encode_code(vl)
key = get_path_key(
- vl.split('/')[-1].split('.')[0])
- filesize =
ii
['b']
+ vl.split('/')[-1].split('.')[0]
, format_id, segment_index
)
+ filesize =
segment
['b']
base_url = data['vp']['du'].split('/')
base_url.insert(-1, key)
base_url = '/'.join(base_url)
base_url = data['vp']['du'].split('/')
base_url.insert(-1, key)
base_url = '/'.join(base_url)
@@
-91,7
+93,9
@@
class IqiyiIE(InfoExtractor):
}
api_video_url = base_url + vl + '?' + \
compat_urllib_parse.urlencode(param)
}
api_video_url = base_url + vl + '?' + \
compat_urllib_parse.urlencode(param)
- js = self._download_json(api_video_url, video_id)
+ js = self._download_json(
+ api_video_url, video_id,
+ note='Download video info of segment %d for format %s' % (segment_index + 1, format_id))
video_url = js['l']
video_urls.append(
(video_url, filesize))
video_url = js['l']
video_urls.append(
(video_url, filesize))