projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0c20ee7
)
[common] Add 'fatal' to _extract_m3u8_formats
author
Yen Chi Hsuan
<yan12125@gmail.com>
Mon, 6 Jul 2015 00:39:38 +0000
(08:39 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Mon, 6 Jul 2015 00:39:38 +0000
(08:39 +0800)
youtube_dl/extractor/common.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 81623bfe3d6b2ff8b82b1baf1d8aeda749c38331..d859aea5285f331c43e44b95b41a12aee0f41f87 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-846,7
+846,8
@@
class InfoExtractor(object):
def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None,
entry_protocol='m3u8', preference=None,
def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None,
entry_protocol='m3u8', preference=None,
- m3u8_id=None, note=None, errnote=None):
+ m3u8_id=None, note=None, errnote=None,
+ fatal=True):
formats = [{
'format_id': '-'.join(filter(None, [m3u8_id, 'meta'])),
formats = [{
'format_id': '-'.join(filter(None, [m3u8_id, 'meta'])),
@@
-866,7
+867,10
@@
class InfoExtractor(object):
m3u8_doc = self._download_webpage(
m3u8_url, video_id,
note=note or 'Downloading m3u8 information',
m3u8_doc = self._download_webpage(
m3u8_url, video_id,
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:
+ return m3u8_doc
last_info = None
last_media = None
kv_rex = re.compile(
last_info = None
last_media = None
kv_rex = re.compile(