Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[condenast] fallback to loader.js if video.js fail

pull/10158/merge
Remita Amine 2016-08-05 21:01:16 +01:00
parent 491c42e690
commit e563c0d73b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/condenast.py
View File

@ -113,11 +113,19 @@ class CondeNastIE(InfoExtractor):
'target': params['id'], 'target': params['id'],
}) })
video_id = query['videoId'] video_id = query['videoId']
video_info = None
info_page = self._download_webpage( info_page = self._download_webpage(
'http://player.cnevids.com/player/video.js', 'http://player.cnevids.com/player/video.js',
video_id, 'Downloading video info', query=query) video_id, 'Downloading video info', query=query, fatal=False)
if info_page:
video_info = self._parse_json(self._search_regex( video_info = self._parse_json(self._search_regex(
r'loadCallback\(({.+})\)', info_page, 'video info'), video_id)['video'] r'loadCallback\(({.+})\)', info_page, 'video info'), video_id)['video']
else:
info_page = self._download_webpage(
'http://player.cnevids.com/player/loader.js',
video_id, 'Downloading loader info', query=query)
video_info = self._parse_json(self._search_regex(
r'var\s+video\s*=\s*({.+?});', info_page, 'video info'), video_id)
title = video_info['title'] title = video_info['title']
formats = [] formats = []