Madeorsk
/
youtube-dl
mirror of https://codeberg.org/polarisfm/youtube-dl
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge dd256a8d05 into 48c5663c5f

This commit is contained in:
Qingfan Wu 2020-10-22 17:51:29 +02:00 committed by GitHub
parent 48c5663c5f dd256a8d05
commit cbb1079bf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
youtube_dl/extractor/iqiyi.py
View File

@ -343,17 +343,22 @@ class IqiyiIE(InfoExtractor):
# There's no simple way to determine whether an URL is a playlist or not
# Sometimes there are playlist links in individual videos, so treat it
# as a single video first
tvid = self._search_regex(
r'data-(?:player|shareplattrigger)-tvid\s*=\s*[\'"](\d+)', webpage, 'tvid', default=None)
tvid = self._search_regex([
r'data-(?:player|shareplattrigger)-tvid\s*=\s*[\'"](\d+)',
r'param\[\'tvid\'\]\s*=\s*"(.+?)"',
r'"tvid":"(\d+)"',
], webpage, 'tvid', default=None)
if tvid is None:
playlist_result = self._extract_playlist(webpage)
if playlist_result:
return playlist_result
raise ExtractorError('Can\'t find any video')
video_id = self._search_regex(
r'data-(?:player|shareplattrigger)-videoid\s*=\s*[\'"]([a-f\d]+)', webpage, 'video_id')
video_id = self._search_regex([
r'data-(?:player|shareplattrigger)-videoid\s*=\s*[\'"]([a-f\d]+)',
r'param\[\'vid\'\]\s*=\s*"(.+?)"',
r'"vid":"(\w+)"'
], webpage, 'video_id')
formats = []
for _ in range(5):
raw_data = self.get_raw_data(tvid, video_id)
@ -385,8 +390,7 @@ class IqiyiIE(InfoExtractor):
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 self._html_search_regex(r'<span[^>]+data-videochanged-title="word"[^>]*>([^<]+)</span>', webpage, 'title'))
or self._html_search_regex(r'<title>([^<]+)</title>', webpage, 'title'))
return {
'id': video_id,
'title': title,