R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More callbacks changed to raise ExtractorError

Browse Source
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-05-05 13:59:25 +02:00
parent d96680f58d
commit 486f0c9476
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/InfoExtractors.py
View File

@ -3125,7 +3125,7 @@ class GooglePlusIE(InfoExtractor):
pattern = '"(https\://plus\.google\.com/photos/.*?)",,"image/jpeg","video"\]' pattern = '"(https\://plus\.google\.com/photos/.*?)",,"image/jpeg","video"\]'
mobj = re.search(pattern, webpage) mobj = re.search(pattern, webpage)
if mobj is None: if mobj is None:
self._downloader.report_error(u'unable to extract video page URL') raise ExtractorError(u'Unable to extract video page URL')
video_page = mobj.group(1) video_page = mobj.group(1)
webpage = self._download_webpage(video_page, video_id, u'Downloading video page') webpage = self._download_webpage(video_page, video_id, u'Downloading video page')
@ -3137,7 +3137,7 @@ class GooglePlusIE(InfoExtractor):
pattern = '\d+,\d+,(\d+),"(http\://redirector\.googlevideo\.com.*?)"' pattern = '\d+,\d+,(\d+),"(http\://redirector\.googlevideo\.com.*?)"'
mobj = re.findall(pattern, webpage) mobj = re.findall(pattern, webpage)
if len(mobj) == 0: if len(mobj) == 0:
self._downloader.report_error(u'unable to extract video links') raise ExtractorError(u'Unable to extract video links')
# Sort in resolution # Sort in resolution
links = sorted(mobj) links = sorted(mobj)
@ -3343,14 +3343,14 @@ class FunnyOrDieIE(InfoExtractor):
m = re.search(r'<video[^>]*>\s*<source[^>]*>\s*<source src="(?P<url>[^"]+)"', webpage, re.DOTALL) m = re.search(r'<video[^>]*>\s*<source[^>]*>\s*<source src="(?P<url>[^"]+)"', webpage, re.DOTALL)
if not m: if not m:
self._downloader.report_error(u'unable to find video information') raise ExtractorError(u'Unable to find video information')
video_url = unescapeHTML(m.group('url')) video_url = unescapeHTML(m.group('url'))
m = re.search(r"<h1 class='player_page_h1'.*?>(?P<title>.*?)</h1>", webpage, flags=re.DOTALL) m = re.search(r"<h1 class='player_page_h1'.*?>(?P<title>.*?)</h1>", webpage, flags=re.DOTALL)
if not m: if not m:
m = re.search(r'<title>(?P<title>[^<]+?)</title>', webpage) m = re.search(r'<title>(?P<title>[^<]+?)</title>', webpage)
if not m: if not m:
self._downloader.report_error(u'Cannot find video title') raise ExtractorError(u'Cannot find video title')
title = clean_html(m.group('title')) title = clean_html(m.group('title'))
m = re.search(r'<meta property="og:description" content="(?P<desc>.*?)"', webpage) m = re.search(r'<meta property="og:description" content="(?P<desc>.*?)"', webpage)
@ -3402,7 +3402,7 @@ class SteamIE(InfoExtractor):
video_url = vid.group('videoURL') video_url = vid.group('videoURL')
video_thumb = thumb.group('thumbnail') video_thumb = thumb.group('thumbnail')
if not video_url: if not video_url:
self._downloader.report_error(u'Cannot find video url for %s' % video_id) raise ExtractorError(u'Cannot find video url for %s' % video_id)
info = { info = {
'id':video_id, 'id':video_id,
'url':video_url, 'url':video_url,
@ -3976,7 +3976,7 @@ class LiveLeakIE(InfoExtractor):
m = re.search(r'<meta property="og:title" content="(?P<title>.*?)"', webpage) m = re.search(r'<meta property="og:title" content="(?P<title>.*?)"', webpage)
if not m: if not m:
self._downloader.report_error(u'Cannot find video title') raise ExtractorError(u'Cannot find video title')
title = unescapeHTML(m.group('title')).replace('LiveLeak.com -', '').strip() title = unescapeHTML(m.group('title')).replace('LiveLeak.com -', '').strip()
m = re.search(r'<meta property="og:description" content="(?P<desc>.*?)"', webpage) m = re.search(r'<meta property="og:description" content="(?P<desc>.*?)"', webpage)