commit 0f8a01d4f35d73fe90f9838e11e854e27595f9da
parent e2bf499b142cf34e5eee10041f5adf1fa361f69a
Author: Sergey M․ <dstftw@gmail.com>
Date: Thu, 22 May 2014 19:35:46 +0700
[swrmediathek] Simplify
Diffstat:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/extractor/swrmediathek.py b/youtube_dl/extractor/swrmediathek.py
@@ -43,7 +43,7 @@ class SWRMediathekIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
smilurl = 'http://swrmediathek.de/rtmpQuals/%s/clips.smil'
- smildoc = self._download_xml(smilurl % video_id, video_id, note='Downloading SMIL page')
+ smildoc = self._download_xml(smilurl % video_id, video_id, 'Downloading SMIL page')
baseurl = smildoc.find('.//meta').attrib['base']
@@ -67,8 +67,8 @@ class SWRMediathekIE(InfoExtractor):
return {
'id': video_id,
- 'title': self._html_search_regex(r'<meta name="title" content="(.+)" />', webpage, 'title'),
+ 'title': self._html_search_meta('title', webpage, 'title', fatal=True),
'thumbnail': self._search_regex(r'<link rel="image_src".+href="(.+)" />', webpage, 'thumbnail'),
'formats': formats,
- 'description': self._html_search_regex(r'<meta name="description" content="(.+)" />', webpage, 'description'),
+ 'description': self._html_search_meta('description', webpage, 'description'),
}