From: Sergey M․ Date: Thu, 22 May 2014 12:35:46 +0000 (+0700) Subject: [swrmediathek] Simplify X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=0f8a01d4f35d73fe90f9838e11e854e27595f9da;p=youtube-dl [swrmediathek] Simplify --- diff --git a/youtube_dl/extractor/swrmediathek.py b/youtube_dl/extractor/swrmediathek.py index 5ba3f3504..457c50411 100644 --- 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'', webpage, 'title'), + 'title': self._html_search_meta('title', webpage, 'title', fatal=True), 'thumbnail': self._search_regex(r'', webpage, 'thumbnail'), 'formats': formats, - 'description': self._html_search_regex(r'', webpage, 'description'), + 'description': self._html_search_meta('description', webpage, 'description'), }