From: Sergey M․ Date: Sat, 17 May 2014 11:11:40 +0000 (+0700) Subject: [ndr] Fix title, description and duration extraction X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=c1ed1f7055ca636ef7667964d2bf7daddd60f076;p=youtube-dl [ndr] Fix title, description and duration extraction --- diff --git a/youtube_dl/extractor/ndr.py b/youtube_dl/extractor/ndr.py index 0905d7bb8..ae1fe866e 100644 --- a/youtube_dl/extractor/ndr.py +++ b/youtube_dl/extractor/ndr.py @@ -4,7 +4,10 @@ from __future__ import unicode_literals import re from .common import InfoExtractor -from ..utils import ExtractorError +from ..utils import ( + ExtractorError, + int_or_none, +) class NDRIE(InfoExtractor): @@ -45,13 +48,12 @@ class NDRIE(InfoExtractor): page = self._download_webpage(url, video_id, 'Downloading page') - title = self._og_search_title(page) + title = self._og_search_title(page).strip() description = self._og_search_description(page) + if description: + description = description.strip() - mobj = re.search( - r'
(?P\d+):(?P\d+)
', - page) - duration = int(mobj.group('minutes')) * 60 + int(mobj.group('seconds')) if mobj else None + duration = int_or_none(self._html_search_regex(r'duration: (\d+),\n', page, 'duration', fatal=False)) formats = []