aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-10-31 22:45:45 +0600
committerSergey M․ <dstftw@gmail.com>2015-10-31 22:45:45 +0600
commit11465da70257663ee52c7be50debe1c1e825ec67 (patch)
treeba95f2dea14df82ce356a909383d0e24fe3982cb /youtube_dl
parent578c074575f45ffdfd032d7b84f6fe449614f511 (diff)
[mdr] Simplify xpath
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/mdr.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/youtube_dl/extractor/mdr.py b/youtube_dl/extractor/mdr.py
index e05577496..a63257c56 100644
--- a/youtube_dl/extractor/mdr.py
+++ b/youtube_dl/extractor/mdr.py
@@ -74,8 +74,7 @@ class MDRIE(InfoExtractor):
doc = self._download_xml(
compat_urlparse.urljoin(url, data_url), video_id)
- title = (xpath_text(doc, './title', 'title', default=None) or
- xpath_text(doc, './broadcast/broadcastName', 'title'))
+ title = xpath_text(doc, ['./title', './broadcast/broadcastName'], 'title', fatal=True)
formats = []
processed_urls = []
@@ -149,8 +148,12 @@ class MDRIE(InfoExtractor):
description = xpath_text(doc, './broadcast/broadcastDescription', 'description')
timestamp = parse_iso8601(
- xpath_text(doc, './broadcast/broadcastDate', 'timestamp', default=None) or
- xpath_text(doc, './broadcast/broadcastStartDate', 'timestamp', default=None))
+ xpath_text(
+ doc, [
+ './broadcast/broadcastDate',
+ './broadcast/broadcastStartDate',
+ './broadcast/broadcastEndDate'],
+ 'timestamp', default=None))
duration = parse_duration(xpath_text(doc, './duration', 'duration'))
uploader = xpath_text(doc, './rights', 'uploader')