aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/common.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-02-02 23:38:35 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-02-02 23:38:35 +0100
commit995029a142cd0046ee43b583f2d09fc3d5fa321a (patch)
tree8a34ac50e00be86ef8015a60e42cd349e2c429f4 /youtube_dl/extractor/common.py
parent531572578e542fcee26f1a30fd9f87ad158e6594 (diff)
downloadyoutube-dl-995029a142cd0046ee43b583f2d09fc3d5fa321a.tar.xz
[nerdist] Add new extractor (Fixes #4851)
Diffstat (limited to 'youtube_dl/extractor/common.py')
-rw-r--r--youtube_dl/extractor/common.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 8b4ef3f09..9e517e3ac 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -860,10 +860,13 @@ class InfoExtractor(object):
return formats
# TODO: improve extraction
- def _extract_smil_formats(self, smil_url, video_id):
+ def _extract_smil_formats(self, smil_url, video_id, fatal=True):
smil = self._download_xml(
smil_url, video_id, 'Downloading SMIL file',
- 'Unable to download SMIL file')
+ 'Unable to download SMIL file', fatal=fatal)
+ if smil is False:
+ assert not fatal
+ return []
base = smil.find('./head/meta').get('base')