aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-09-15 16:10:52 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-09-15 16:10:52 +0200
commitacd9db590293bd914a0ec02e76cae546fd6e473f (patch)
treed337b4d98c5dceef83736639d2bf973208fd285b
parentc15dd1538882be9614ebf3b6100e52b659022146 (diff)
parentd0e8b3d59bbb0951a4bf7e85baca8c40d3824dd6 (diff)
Merge remote-tracking branch 'naglis/nosvideo'
-rw-r--r--youtube_dl/extractor/nosvideo.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/youtube_dl/extractor/nosvideo.py b/youtube_dl/extractor/nosvideo.py
index 8c2c428fc..f3be8f552 100644
--- a/youtube_dl/extractor/nosvideo.py
+++ b/youtube_dl/extractor/nosvideo.py
@@ -8,11 +8,11 @@ from ..utils import (
ExtractorError,
compat_urllib_request,
urlencode_postdata,
+ xpath_text,
xpath_with_ns,
)
_x = lambda p: xpath_with_ns(p, {'xspf': 'http://xspf.org/ns/0/'})
-_find = lambda el, p: el.find(_x(p)).text.strip()
class NosVideoIE(InfoExtractor):
@@ -53,9 +53,15 @@ class NosVideoIE(InfoExtractor):
playlist = self._download_xml(playlist_url, video_id)
track = playlist.find(_x('.//xspf:track'))
- title = _find(track, './xspf:title')
- url = _find(track, './xspf:file')
- thumbnail = _find(track, './xspf:image')
+ if track is None:
+ raise ExtractorError(
+ 'XML playlist is missing the \'track\' element',
+ expected=True)
+ title = xpath_text(track, _x('./xspf:title'), 'title')
+ url = xpath_text(track, _x('./xspf:file'), 'URL', fatal=True)
+ thumbnail = xpath_text(track, _x('./xspf:image'), 'thumbnail')
+ if title is not None:
+ title = title.strip()
formats = [{
'format_id': 'sd',