Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-02-02 18:07:49 +08:00
Code Issues Releases Wiki Activity

[iqiyi] Fix extraction video_id

Browse Source
This commit is contained in:
AnyISalIn 2018-12-26 12:40:59 +08:00
parent 63529e935c
commit 4345f57a57
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
youtube_dl/extractor/iqiyi.py
View File

@ -344,7 +344,13 @@ class IqiyiIE(InfoExtractor):
# Sometimes there are playlist links in individual videos, so treat it # Sometimes there are playlist links in individual videos, so treat it
# as a single video first # as a single video first
tvid = self._search_regex( tvid = self._search_regex(
r'data-(?:player|shareplattrigger)-tvid\s*=\s*[\'"](\d+)', webpage, 'tvid', default=None) r'param\[\'tvid\'\] = \"(.*)";', webpage, 'tvid', default=None)
if tvid is None: # if tw iqiyi
tvid = self._search_regex(
r'"tvid":\"(\d+)",', webpage, 'tvid', default=None)
if tvid is None: if tvid is None:
playlist_result = self._extract_playlist(webpage) playlist_result = self._extract_playlist(webpage)
if playlist_result: if playlist_result:
@ -352,7 +358,13 @@ class IqiyiIE(InfoExtractor):
raise ExtractorError('Can\'t find any video') raise ExtractorError('Can\'t find any video')
video_id = self._search_regex( video_id = self._search_regex(
r'data-(?:player|shareplattrigger)-videoid\s*=\s*[\'"]([a-f\d]+)', webpage, 'video_id') r'param\[\'vid\'\] = \"(.*)";', webpage, 'video_id', default=None)
if video_id is None: # if tw iqiyi
video_id = self._search_regex(
r'"vid":\"([0-9a-z]+)",', webpage, 'video_id')
formats = [] formats = []
for _ in range(5): for _ in range(5):
@ -383,9 +395,15 @@ class IqiyiIE(InfoExtractor):
self._sleep(5, video_id) self._sleep(5, video_id)
self._sort_formats(formats) self._sort_formats(formats)
title = (get_element_by_id('widget-videotitle', webpage) or
clean_html(get_element_by_attribute('class', 'mod-play-tit', webpage)) or title_link = get_element_by_attribute('class', 'title-link', webpage) or \
self._html_search_regex(r'<span[^>]+data-videochanged-title="word"[^>]*>([^<]+)</span>', webpage, 'title')) get_element_by_attribute('v-text', 'props.videoAlbumName', webpage) or ''
title_txt = get_element_by_attribute('class', 'title-txt', webpage) or \
get_element_by_attribute('v-text', 'props.videoSubTitle', webpage) or \
get_element_by_attribute('class', 'fontColor-link', webpage)
title = title_link + title_txt
return { return {
'id': video_id, 'id': video_id,