projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[iqiyi] Simplify and improve regex patterns
[youtube-dl]
/
youtube_dl
/
extractor
/
iqiyi.py
diff --git
a/youtube_dl/extractor/iqiyi.py
b/youtube_dl/extractor/iqiyi.py
index 597441baf702b0df566b788dfe5805b92be75b09..18a7587a257ae1f4fb2dfcb48978afec06ad113a 100644
(file)
--- a/
youtube_dl/extractor/iqiyi.py
+++ b/
youtube_dl/extractor/iqiyi.py
@@
-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):
a = y % 3
if a == 1:
def do_xor(x, y):
a = y % 3
if a == 1:
@@
-58,13
+58,6
@@
class IqiyiIE(InfoExtractor):
t = str(int(math.floor(int(tm) / (600.0))))
return hashlib.md5((t + mg + x).encode('utf8')).hexdigest()
t = str(int(math.floor(int(tm) / (600.0))))
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 = {}
for i in data['vp']['tkl'][0]['vs']:
if 0 < int(i['bid']) <= 10:
video_urls_dict = {}
for i in data['vp']['tkl'][0]['vs']:
if 0 < int(i['bid']) <= 10:
@@
-80,12
+73,6
@@
class IqiyiIE(InfoExtractor):
if t.endswith('mp4'):
video_urls_info = i['flvs']
if t.endswith('mp4'):
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:
vl = ii['l']
if not vl.startswith('/'):
for ii in video_urls_info:
vl = ii['l']
if not vl.startswith('/'):
@@
-174,12
+161,11
@@
class IqiyiIE(InfoExtractor):
webpage = self._download_webpage(
url, 'temp_id', note='download video page')
tvid = self._search_regex(
webpage = self._download_webpage(
url, 'temp_id', note='download video page')
tvid = self._search_regex(
- r'
tvId ?= ?(\'|\")(?P<tvid>\d+)', webpage, 'tvid', flags=re.I, group=
'tvid')
+ r'
data-player-tvid\s*=\s*[\'"](\d+)', webpage,
'tvid')
video_id = self._search_regex(
video_id = self._search_regex(
- r'videoId ?= ?(\'|\")(?P<video_id>[a-z\d]+)',
- webpage, 'video_id', flags=re.I, group='video_id')
+ r'data-player-videoid\s*=\s*[\'"]([a-f\d]+)', webpage, 'video_id')
swf_url = self._search_regex(
swf_url = self._search_regex(
- r'(
?P<swf>http://.+?MainPlayer.+?\.swf)', webpage, 'swf
')
+ r'(
http://.+?MainPlayer.+?\.swf)', webpage, 'swf player URL
')
_uuid = uuid.uuid4().hex
enc_key = self.get_enc_key(swf_url, video_id)
_uuid = uuid.uuid4().hex
enc_key = self.get_enc_key(swf_url, video_id)
@@
-193,14
+179,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
video_urls_dict = self.construct_video_urls(
# generate video_urls_dict
video_urls_dict = self.construct_video_urls(
- data, video_id, _uuid
, bid
)
+ data, video_id, _uuid)
# construct info
entries = []
# construct info
entries = []