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

[ellentv] Make video url extraction fatal

pull/5365/head
Sergey M․ 2015-04-05 00:00:04 +06:00
parent f67dcc09f5
commit 27fe5e3473
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
youtube_dl/extractor/ellentv.py
View File

@ -40,14 +40,15 @@ class EllenTVIE(InfoExtractor):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
video_url = self._html_search_meta('VideoURL', webpage, 'url')
video_url = self._html_search_meta('VideoURL', webpage, 'url', fatal=True)
title = self._og_search_title(webpage, default=None) or self._search_regex( title = self._og_search_title(webpage, default=None) or self._search_regex(
r'pageName\s*=\s*"([^"]+)"', webpage, 'title') r'pageName\s*=\s*"([^"]+)"', webpage, 'title')
description = self._html_search_meta( description = self._html_search_meta(
'description', webpage, 'description') or self._og_search_description(webpage) 'description', webpage, 'description') or self._og_search_description(webpage)
timestamp = parse_iso8601(self._search_regex( timestamp = parse_iso8601(self._search_regex(
r'<span class="publish-date"><time datetime="([^"]+)">', r'<span class="publish-date"><time datetime="([^"]+)">',
webpage, 'timestamp')) webpage, 'timestamp', fatal=False))
return { return {
'id': video_id, 'id': video_id,