w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[mdr] Simplify xpath

Browse source
This commit is contained in:
Sergey M․ 2015-10-31 22:45:45 +06:00
parent 578c074575
commit 11465da702
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
youtube_dl/extractor/mdr.py
View file

@ -74,8 +74,7 @@ class MDRIE(InfoExtractor):
doc = self._download_xml( doc = self._download_xml(
compat_urlparse.urljoin(url, data_url), video_id) compat_urlparse.urljoin(url, data_url), video_id)
title = (xpath_text(doc, './title', 'title', default=None) or title = xpath_text(doc, ['./title', './broadcast/broadcastName'], 'title', fatal=True)
xpath_text(doc, './broadcast/broadcastName', 'title'))
formats = [] formats = []
processed_urls = [] processed_urls = []
@ -149,8 +148,12 @@ class MDRIE(InfoExtractor):
description = xpath_text(doc, './broadcast/broadcastDescription', 'description') description = xpath_text(doc, './broadcast/broadcastDescription', 'description')
timestamp = parse_iso8601( timestamp = parse_iso8601(
xpath_text(doc, './broadcast/broadcastDate', 'timestamp', default=None) or xpath_text(
xpath_text(doc, './broadcast/broadcastStartDate', 'timestamp', default=None)) doc, [
'./broadcast/broadcastDate',
'./broadcast/broadcastStartDate',
'./broadcast/broadcastEndDate'],
'timestamp', default=None))
duration = parse_duration(xpath_text(doc, './duration', 'duration')) duration = parse_duration(xpath_text(doc, './duration', 'duration'))
uploader = xpath_text(doc, './rights', 'uploader') uploader = xpath_text(doc, './rights', 'uploader')