1
0
Fork 0
mirror of https://gitlab.com/dstftw/youtube-dl.git synced 2020-11-16 09:42:26 +00:00

[iqiyi] Fix playlist detection (#12504)

This commit is contained in:
Yen Chi Hsuan 2017-04-22 22:11:37 +08:00
parent 54f54fcca7
commit fbf56be213
No known key found for this signature in database
GPG key ID: 7F902A182457CA23
2 changed files with 10 additions and 6 deletions

View file

@ -5,6 +5,7 @@ Core
* [socks] Handle cases where credentials are required but missing
Extractors
* [iqiyi] Fix playlist detection (#12504)
- [azubu] Remove extractor (#12813)
* [porn91] Fix extraction (#12814)
+ [generic] Support Brightcove videos in <iframe> (#12482)

View file

@ -337,13 +337,16 @@ class IqiyiIE(InfoExtractor):
url, 'temp_id', note='download video page')
# There's no simple way to determine whether an URL is a playlist or not
# So detect it
playlist_result = self._extract_playlist(webpage)
if playlist_result:
return playlist_result
# Sometimes there are playlist links in individual videos, so treat it
# as a single video first
tvid = self._search_regex(
r'data-player-tvid\s*=\s*[\'"](\d+)', webpage, 'tvid')
r'data-player-tvid\s*=\s*[\'"](\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-videoid\s*=\s*[\'"]([a-f\d]+)', webpage, 'video_id')