]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[bbc.co.uk] Fix test_BBCCoUk
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 5 Dec 2015 08:45:24 +0000 (16:45 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 5 Dec 2015 08:55:53 +0000 (16:55 +0800)
This is similar to the one in #7756, So also fixes #7756.

youtube_dl/extractor/bbc.py

index 7fb80aa38fc39825fd7338b40fc994ccc0c8a185..cd129ba71725e2c0db8dc6df58c1e57ed7434a1b 100644 (file)
@@ -47,9 +47,8 @@ class BBCCoUkIE(InfoExtractor):
             'info_dict': {
                 'id': 'b039d07m',
                 'ext': 'flv',
-                'title': 'Kaleidoscope, Leonard Cohen',
+                'title': 'Leonard Cohen, Kaleidoscope - BBC Radio 4',
                 'description': 'The Canadian poet and songwriter reflects on his musical career.',
-                'duration': 1740,
             },
             'params': {
                 # rtmp download
@@ -454,6 +453,7 @@ class BBCCoUkIE(InfoExtractor):
         webpage = self._download_webpage(url, group_id, 'Downloading video page')
 
         programme_id = None
+        duration = None
 
         tviplayer = self._search_regex(
             r'mediator\.bind\(({.+?})\s*,\s*document\.getElementById',
@@ -473,7 +473,9 @@ class BBCCoUkIE(InfoExtractor):
             title = self._og_search_title(webpage)
             description = self._search_regex(
                 r'<p class="[^"]*medium-description[^"]*">([^<]+)</p>',
-                webpage, 'description', fatal=False)
+                webpage, 'description', default=None)
+            if not description:
+                description = self._html_search_meta('description', webpage)
         else:
             programme_id, title, description, duration, formats, subtitles = self._download_playlist(group_id)