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