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

[common] Add fatal parameter to _extract_* method

Browse Source
This commit is contained in:
Pierre-Louis Bonicoli 2015-06-15 13:29:24 +02:00
parent 4af98ecdfb
commit 6b3d3f0fbf
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
youtube_dl/extractor/common.py
View File

@ -815,10 +815,14 @@ class InfoExtractor(object):
self.to_screen(msg) self.to_screen(msg)
time.sleep(timeout) time.sleep(timeout)
def _extract_f4m_formats(self, manifest_url, video_id, preference=None, f4m_id=None): def _extract_f4m_formats(self, manifest_url, video_id, preference=None, f4m_id=None, fatal=True):
manifest = self._download_xml( manifest = self._download_xml(
manifest_url, video_id, 'Downloading f4m manifest', manifest_url, video_id, note='Downloading f4m manifest',
'Unable to download f4m manifest') errnote='Unable to download f4m manifest', fatal=fatal)
if manifest is False:
assert not fatal
return []
formats = [] formats = []
manifest_version = '1.0' manifest_version = '1.0'
@ -846,7 +850,7 @@ class InfoExtractor(object):
def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None, def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None,
entry_protocol='m3u8', preference=None, entry_protocol='m3u8', preference=None,
m3u8_id=None, note=None, errnote=None): m3u8_id=None, note=None, errnote=None, fatal=True):
formats = [{ formats = [{
'format_id': '-'.join(filter(None, [m3u8_id, 'meta'])), 'format_id': '-'.join(filter(None, [m3u8_id, 'meta'])),
@ -866,7 +870,13 @@ class InfoExtractor(object):
m3u8_doc = self._download_webpage( m3u8_doc = self._download_webpage(
m3u8_url, video_id, m3u8_url, video_id,
note=note or 'Downloading m3u8 information', note=note or 'Downloading m3u8 information',
errnote=errnote or 'Failed to download m3u8 information') errnote=errnote or 'Failed to download m3u8 information',
fatal=fatal)
if m3u8_doc is False:
assert not fatal
return []
last_info = None last_info = None
last_media = None last_media = None
kv_rex = re.compile( kv_rex = re.compile(