Cool_Tools/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-01 10:47:26 +01:00
Code Releases Activity

[iqiyi] Remove format selection codes

Browse Source
This commit is contained in:
Yen Chi Hsuan 2015-06-07 00:44:54 +08:00
parent f1da861018
commit 7012620e2b
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
youtube_dl/extractor/iqiyi.py
View File

@ -32,7 +32,7 @@ class IqiyiIE(InfoExtractor):
} }
} }
def construct_video_urls(self, data, video_id, _uuid, bid): def construct_video_urls(self, data, video_id, _uuid):
def do_xor(x, y): def do_xor(x, y):
a = y % 3 a = y % 3
if a == 1: if a == 1:
@ -58,13 +58,6 @@ class IqiyiIE(InfoExtractor):
t = str(int(math.floor(int(tm) / (600.0)))) t = str(int(math.floor(int(tm) / (600.0))))
return hashlib.md5((t + mg + x).encode('utf8')).hexdigest() return hashlib.md5((t + mg + x).encode('utf8')).hexdigest()
# get accept format
# getting all format will spend minutes for a big video.
if bid == 'best':
bids = [int(i['bid']) for i in data['vp']['tkl'][0]['vs']
if 0 < int(i['bid']) <= 10]
bid = str(max(bids))
video_urls_dict = {} video_urls_dict = {}
for i in data['vp']['tkl'][0]['vs']: for i in data['vp']['tkl'][0]['vs']:
if 0 < int(i['bid']) <= 10: if 0 < int(i['bid']) <= 10:
@ -80,12 +73,6 @@ class IqiyiIE(InfoExtractor):
if t.endswith('mp4'): if t.endswith('mp4'):
video_urls_info = i['flvs'] video_urls_info = i['flvs']
if int(i['bid']) != int(bid): # ignore missing match format
video_urls.extend(
[('http://example.com/v.flv', ii['b']) for ii in video_urls_info])
video_urls_dict[format_id] = video_urls
continue
for ii in video_urls_info: for ii in video_urls_info:
vl = ii['l'] vl = ii['l']
if not vl.startswith('/'): if not vl.startswith('/'):
@ -193,14 +180,9 @@ class IqiyiIE(InfoExtractor):
title = data['vi']['vn'] title = data['vi']['vn']
format = self._downloader.params.get('format', None)
bid = self.get_bid(format) if format else 'best'
if not bid:
raise ExtractorError('Can\'t get format.')
# generate video_urls_dict # generate video_urls_dict
video_urls_dict = self.construct_video_urls( video_urls_dict = self.construct_video_urls(
data, video_id, _uuid, bid) data, video_id, _uuid)
# construct info # construct info
entries = [] entries = []