diff options
Diffstat (limited to 'youtube_dl/extractor/bbc.py')
| -rw-r--r-- | youtube_dl/extractor/bbc.py | 13 | 
1 files changed, 9 insertions, 4 deletions
| diff --git a/youtube_dl/extractor/bbc.py b/youtube_dl/extractor/bbc.py index 7fb80aa38..691aecc0d 100644 --- a/youtube_dl/extractor/bbc.py +++ b/youtube_dl/extractor/bbc.py @@ -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 @@ -112,7 +111,8 @@ class BBCCoUkIE(InfoExtractor):              'params': {                  # rtmp download                  'skip_download': True, -            } +            }, +            'skip': 'Episode is no longer available on BBC iPlayer Radio',          }, {              'url': 'http://www.bbc.co.uk/music/clips/p02frcc3',              'note': 'Audio', @@ -454,6 +454,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 +474,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) @@ -587,6 +590,7 @@ class BBCIE(BBCCoUkIE):              'ext': 'mp4',              'title': '''Judge Mindy Glazer: "I'm sorry to see you here... I always wondered what happened to you"''',              'duration': 56, +            'description': '''Judge Mindy Glazer: "I'm sorry to see you here... I always wondered what happened to you"''',          },          'params': {              'skip_download': True, @@ -729,6 +733,7 @@ class BBCIE(BBCCoUkIE):          # article with multiple videos embedded with playlist.sxml (e.g.          # http://www.bbc.com/sport/0/football/34475836)          playlists = re.findall(r'<param[^>]+name="playlist"[^>]+value="([^"]+)"', webpage) +        playlists.extend(re.findall(r'data-media-id="([^"]+/playlist\.sxml)"', webpage))          if playlists:              entries = [                  self._extract_from_playlist_sxml(playlist_url, playlist_id, timestamp) | 
