youtube-dl

commit c1ed1f7055ca636ef7667964d2bf7daddd60f076
parent 1514f74967c0ce7f06a956c9faf02048da7a6486
Author: Sergey M․ <dstftw@gmail.com>
Date:   Sat, 17 May 2014 18:11:40 +0700

[ndr] Fix title, description and duration extraction

Diffstat:
M
youtube_dl/extractor/ndr.py
 | 
14
++++++++------

1 file changed, 8 insertions(+), 6 deletions(-)
diff --git 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'<div class="duration"><span class="min">(?P<minutes>\d+)</span>:<span class="sec">(?P<seconds>\d+)</span></div>',
-            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 = []