Merge remote-tracking branch 'origin/master' into pr-bbcnews
authorfnord <fnord@fnord.mobi>
Thu, 25 Jun 2015 05:34:46 +0000 (00:34 -0500)
committerfnord <fnord@fnord.mobi>
Thu, 25 Jun 2015 05:34:46 +0000 (00:34 -0500)
1  2 
youtube_dl/extractor/__init__.py
youtube_dl/extractor/bbc.py

Simple merge
index bb671d47310675087d9f49b1131e0b6676a1a309,0000000000000000000000000000000000000000..471d865d26c5feb03a66e3eca42fae5ccbe21e39
mode 100644,000000..100644
--- /dev/null
@@@ -1,570 -1,0 +1,555 @@@
-             ps = captions.findall('./{0}body/{0}div/{0}p'.format('{http://www.w3.org/2006/10/ttaf1}'))
-             srt = ''
-             def _extract_text(p):
-                 if p.text is not None:
-                     stripped_text = p.text.strip()
-                     if stripped_text:
-                         return stripped_text
-                 return ' '.join(span.text.strip() for span in p.findall('{http://www.w3.org/2006/10/ttaf1}span'))
-             for pos, p in enumerate(ps):
-                 srt += '%s\r\n%s --> %s\r\n%s\r\n\r\n' % (str(pos), p.get('begin'), p.get('end'), _extract_text(p))
 +from __future__ import unicode_literals
 +
 +import xml.etree.ElementTree
 +
 +from .common import InfoExtractor
 +from ..utils import (
 +    ExtractorError,
 +    parse_duration,
 +    int_or_none,
 +)
 +from ..compat import compat_HTTPError
 +import re
 +
 +
 +class BBCCoUkIE(InfoExtractor):
 +    IE_NAME = 'bbc.co.uk'
 +    IE_DESC = 'BBC iPlayer'
 +    _VALID_URL = r'https?://(?:www\.)?bbc\.co\.uk/(?:(?:(?:programmes|iplayer(?:/[^/]+)?/(?:episode|playlist))/)|music/clips[/#])(?P<id>[\da-z]{8})'
 +
 +    mediaselector_url = 'http://open.live.bbc.co.uk/mediaselector/5/select/version/2.0/mediaset/pc/vpid/%s'
 +
 +    _TESTS = [
 +        {
 +            'url': 'http://www.bbc.co.uk/programmes/b039g8p7',
 +            'info_dict': {
 +                'id': 'b039d07m',
 +                'ext': 'flv',
 +                'title': 'Kaleidoscope, Leonard Cohen',
 +                'description': 'The Canadian poet and songwriter reflects on his musical career.',
 +                'duration': 1740,
 +            },
 +            'params': {
 +                # rtmp download
 +                'skip_download': True,
 +            }
 +        },
 +        {
 +            'url': 'http://www.bbc.co.uk/iplayer/episode/b00yng5w/The_Man_in_Black_Series_3_The_Printed_Name/',
 +            'info_dict': {
 +                'id': 'b00yng1d',
 +                'ext': 'flv',
 +                'title': 'The Man in Black: Series 3: The Printed Name',
 +                'description': "Mark Gatiss introduces Nicholas Pierpan's chilling tale of a writer's devilish pact with a mysterious man. Stars Ewan Bailey.",
 +                'duration': 1800,
 +            },
 +            'params': {
 +                # rtmp download
 +                'skip_download': True,
 +            },
 +            'skip': 'Episode is no longer available on BBC iPlayer Radio',
 +        },
 +        {
 +            'url': 'http://www.bbc.co.uk/iplayer/episode/b03vhd1f/The_Voice_UK_Series_3_Blind_Auditions_5/',
 +            'info_dict': {
 +                'id': 'b00yng1d',
 +                'ext': 'flv',
 +                'title': 'The Voice UK: Series 3: Blind Auditions 5',
 +                'description': "Emma Willis and Marvin Humes present the fifth set of blind auditions in the singing competition, as the coaches continue to build their teams based on voice alone.",
 +                'duration': 5100,
 +            },
 +            'params': {
 +                # rtmp download
 +                'skip_download': True,
 +            },
 +            'skip': 'Currently BBC iPlayer TV programmes are available to play in the UK only',
 +        },
 +        {
 +            'url': 'http://www.bbc.co.uk/iplayer/episode/p026c7jt/tomorrows-worlds-the-unearthly-history-of-science-fiction-2-invasion',
 +            'info_dict': {
 +                'id': 'b03k3pb7',
 +                'ext': 'flv',
 +                'title': "Tomorrow's Worlds: The Unearthly History of Science Fiction",
 +                'description': '2. Invasion',
 +                'duration': 3600,
 +            },
 +            'params': {
 +                # rtmp download
 +                'skip_download': True,
 +            },
 +            'skip': 'Currently BBC iPlayer TV programmes are available to play in the UK only',
 +        }, {
 +            'url': 'http://www.bbc.co.uk/programmes/b04v20dw',
 +            'info_dict': {
 +                'id': 'b04v209v',
 +                'ext': 'flv',
 +                'title': 'Pete Tong, The Essential New Tune Special',
 +                'description': "Pete has a very special mix - all of 2014's Essential New Tunes!",
 +                'duration': 10800,
 +            },
 +            'params': {
 +                # rtmp download
 +                'skip_download': True,
 +            }
 +        }, {
 +            'url': 'http://www.bbc.co.uk/music/clips/p02frcc3',
 +            'note': 'Audio',
 +            'info_dict': {
 +                'id': 'p02frcch',
 +                'ext': 'flv',
 +                'title': 'Pete Tong, Past, Present and Future Special, Madeon - After Hours mix',
 +                'description': 'French house superstar Madeon takes us out of the club and onto the after party.',
 +                'duration': 3507,
 +            },
 +            'params': {
 +                # rtmp download
 +                'skip_download': True,
 +            }
 +        }, {
 +            'url': 'http://www.bbc.co.uk/music/clips/p025c0zz',
 +            'note': 'Video',
 +            'info_dict': {
 +                'id': 'p025c103',
 +                'ext': 'flv',
 +                'title': 'Reading and Leeds Festival, 2014, Rae Morris - Closer (Live on BBC Three)',
 +                'description': 'Rae Morris performs Closer for BBC Three at Reading 2014',
 +                'duration': 226,
 +            },
 +            'params': {
 +                # rtmp download
 +                'skip_download': True,
 +            }
 +        }, {
 +            'url': 'http://www.bbc.co.uk/iplayer/episode/b054fn09/ad/natural-world-20152016-2-super-powered-owls',
 +            'info_dict': {
 +                'id': 'p02n76xf',
 +                'ext': 'flv',
 +                'title': 'Natural World, 2015-2016: 2. Super Powered Owls',
 +                'description': 'md5:e4db5c937d0e95a7c6b5e654d429183d',
 +                'duration': 3540,
 +            },
 +            'params': {
 +                # rtmp download
 +                'skip_download': True,
 +            },
 +            'skip': 'geolocation',
 +        }, {
 +            'url': 'http://www.bbc.co.uk/iplayer/episode/b05zmgwn/royal-academy-summer-exhibition',
 +            'info_dict': {
 +                'id': 'b05zmgw1',
 +                'ext': 'flv',
 +                'description': 'Kirsty Wark and Morgan Quaintance visit the Royal Academy as it prepares for its annual artistic extravaganza, meeting people who have come together to make the show unique.',
 +                'title': 'Royal Academy Summer Exhibition',
 +                'duration': 3540,
 +            },
 +            'params': {
 +                # rtmp download
 +                'skip_download': True,
 +            },
 +            'skip': 'geolocation',
 +        }, {
 +            'url': 'http://www.bbc.co.uk/iplayer/playlist/p01dvks4',
 +            'only_matching': True,
 +        }, {
 +            'url': 'http://www.bbc.co.uk/music/clips#p02frcc3',
 +            'only_matching': True,
 +        }, {
 +            'url': 'http://www.bbc.co.uk/iplayer/cbeebies/episode/b0480276/bing-14-atchoo',
 +            'only_matching': True,
 +        }
 +    ]
 +
 +    def _extract_asx_playlist(self, connection, programme_id):
 +        asx = self._download_xml(connection.get('href'), programme_id, 'Downloading ASX playlist')
 +        return [ref.get('href') for ref in asx.findall('./Entry/ref')]
 +
 +    def _extract_connection(self, connection, programme_id):
 +        formats = []
 +        protocol = connection.get('protocol')
 +        supplier = connection.get('supplier')
 +        if protocol == 'http':
 +            href = connection.get('href')
 +            # ASX playlist
 +            if supplier == 'asx':
 +                for i, ref in enumerate(self._extract_asx_playlist(connection, programme_id)):
 +                    formats.append({
 +                        'url': ref,
 +                        'format_id': 'ref%s_%s' % (i, supplier),
 +                    })
 +            # Direct link
 +            else:
 +                formats.append({
 +                    'url': href,
 +                    'format_id': supplier,
 +                })
 +        elif protocol == 'rtmp':
 +            application = connection.get('application', 'ondemand')
 +            auth_string = connection.get('authString')
 +            identifier = connection.get('identifier')
 +            server = connection.get('server')
 +            formats.append({
 +                'url': '%s://%s/%s?%s' % (protocol, server, application, auth_string),
 +                'play_path': identifier,
 +                'app': '%s?%s' % (application, auth_string),
 +                'page_url': 'http://www.bbc.co.uk',
 +                'player_url': 'http://www.bbc.co.uk/emp/releases/iplayer/revisions/617463_618125_4/617463_618125_4_emp.swf',
 +                'rtmp_live': False,
 +                'ext': 'flv',
 +                'format_id': supplier,
 +            })
 +        return formats
 +
 +    def _extract_items(self, playlist):
 +        return playlist.findall('./{http://bbc.co.uk/2008/emp/playlist}item')
 +
 +    def _extract_medias(self, media_selection):
 +        error = media_selection.find('./{http://bbc.co.uk/2008/mp/mediaselection}error')
 +        if error is not None:
 +            raise ExtractorError(
 +                '%s returned error: %s' % (self.IE_NAME, error.get('id')), expected=True)
 +        return media_selection.findall('./{http://bbc.co.uk/2008/mp/mediaselection}media')
 +
 +    def _extract_connections(self, media):
 +        return media.findall('./{http://bbc.co.uk/2008/mp/mediaselection}connection')
 +
 +    def _extract_video(self, media, programme_id):
 +        formats = []
 +        vbr = int(media.get('bitrate'))
 +        vcodec = media.get('encoding')
 +        service = media.get('service')
 +        width = int(media.get('width'))
 +        height = int(media.get('height'))
 +        file_size = int(media.get('media_file_size'))
 +        for connection in self._extract_connections(media):
 +            conn_formats = self._extract_connection(connection, programme_id)
 +            for format in conn_formats:
 +                format.update({
 +                    'format_id': '%s_%s' % (service, format['format_id']),
 +                    'width': width,
 +                    'height': height,
 +                    'vbr': vbr,
 +                    'vcodec': vcodec,
 +                    'filesize': file_size,
 +                })
 +            formats.extend(conn_formats)
 +        return formats
 +
 +    def _extract_audio(self, media, programme_id):
 +        formats = []
 +        abr = int(media.get('bitrate'))
 +        acodec = media.get('encoding')
 +        service = media.get('service')
 +        for connection in self._extract_connections(media):
 +            conn_formats = self._extract_connection(connection, programme_id)
 +            for format in conn_formats:
 +                format.update({
 +                    'format_id': '%s_%s' % (service, format['format_id']),
 +                    'abr': abr,
 +                    'acodec': acodec,
 +                })
 +            formats.extend(conn_formats)
 +        return formats
 +
 +    def _get_subtitles(self, media, programme_id):
 +        subtitles = {}
 +        for connection in self._extract_connections(media):
 +            captions = self._download_xml(connection.get('href'), programme_id, 'Downloading captions')
 +            lang = captions.get('{http://www.w3.org/XML/1998/namespace}lang', 'en')
-                 {
-                     'data': srt,
-                     'ext': 'srt',
-                 },
 +            subtitles[lang] = [
 +                {
 +                    'url': connection.get('href'),
 +                    'ext': 'ttml',
 +                },
 +            ]
 +        return subtitles
 +
 +    def _download_media_selector(self, programme_id):
 +        try:
 +            media_selection = self._download_xml(
 +                self.mediaselector_url % programme_id,
 +                programme_id, 'Downloading media selection XML')
 +        except ExtractorError as ee:
 +            if isinstance(ee.cause, compat_HTTPError) and ee.cause.code == 403:
 +                media_selection = xml.etree.ElementTree.fromstring(ee.cause.read().decode('utf-8'))
 +            else:
 +                raise
 +
 +        formats = []
 +        subtitles = None
 +
 +        for media in self._extract_medias(media_selection):
 +            kind = media.get('kind')
 +            if kind == 'audio':
 +                formats.extend(self._extract_audio(media, programme_id))
 +            elif kind == 'video':
 +                formats.extend(self._extract_video(media, programme_id))
 +            elif kind == 'captions':
 +                subtitles = self.extract_subtitles(media, programme_id)
 +
 +        return formats, subtitles
 +
 +    def _download_playlist(self, playlist_id):
 +        try:
 +            playlist = self._download_json(
 +                'http://www.bbc.co.uk/programmes/%s/playlist.json' % playlist_id,
 +                playlist_id, 'Downloading playlist JSON')
 +
 +            version = playlist.get('defaultAvailableVersion')
 +            if version:
 +                smp_config = version['smpConfig']
 +                title = smp_config['title']
 +                description = smp_config['summary']
 +                for item in smp_config['items']:
 +                    kind = item['kind']
 +                    if kind != 'programme' and kind != 'radioProgramme':
 +                        continue
 +                    programme_id = item.get('vpid')
 +                    duration = int(item.get('duration'))
 +                    formats, subtitles = self._download_media_selector(programme_id)
 +                return programme_id, title, description, duration, formats, subtitles
 +        except ExtractorError as ee:
 +            if not (isinstance(ee.cause, compat_HTTPError) and ee.cause.code == 404):
 +                raise
 +
 +        # fallback to legacy playlist
 +        playlist = self._download_xml(
 +            'http://www.bbc.co.uk/iplayer/playlist/%s' % playlist_id,
 +            playlist_id, 'Downloading legacy playlist XML')
 +
 +        no_items = playlist.find('./{http://bbc.co.uk/2008/emp/playlist}noItems')
 +        if no_items is not None:
 +            reason = no_items.get('reason')
 +            if reason == 'preAvailability':
 +                msg = 'Episode %s is not yet available' % playlist_id
 +            elif reason == 'postAvailability':
 +                msg = 'Episode %s is no longer available' % playlist_id
 +            elif reason == 'noMedia':
 +                msg = 'Episode %s is not currently available' % playlist_id
 +            else:
 +                msg = 'Episode %s is not available: %s' % (playlist_id, reason)
 +            raise ExtractorError(msg, expected=True)
 +
 +        for item in self._extract_items(playlist):
 +            kind = item.get('kind')
 +            if kind != 'programme' and kind != 'radioProgramme':
 +                continue
 +            title = playlist.find('./{http://bbc.co.uk/2008/emp/playlist}title').text
 +            description = playlist.find('./{http://bbc.co.uk/2008/emp/playlist}summary').text
 +            programme_id = item.get('identifier')
 +            duration = int(item.get('duration'))
 +            formats, subtitles = self._download_media_selector(programme_id)
 +
 +        return programme_id, title, description, duration, formats, subtitles
 +
 +    def _real_extract(self, url):
 +        group_id = self._match_id(url)
 +
 +        webpage = self._download_webpage(url, group_id, 'Downloading video page')
 +
 +        programme_id = None
 +
 +        tviplayer = self._search_regex(
 +            r'mediator\.bind\(({.+?})\s*,\s*document\.getElementById',
 +            webpage, 'player', default=None)
 +
 +        if tviplayer:
 +            player = self._parse_json(tviplayer, group_id).get('player', {})
 +            duration = int_or_none(player.get('duration'))
 +            programme_id = player.get('vpid')
 +
 +        if not programme_id:
 +            programme_id = self._search_regex(
 +                r'"vpid"\s*:\s*"([\da-z]{8})"', webpage, 'vpid', fatal=False, default=None)
 +
 +        if programme_id:
 +            formats, subtitles = self._download_media_selector(programme_id)
 +            title = self._og_search_title(webpage)
 +            description = self._search_regex(
 +                r'<p class="[^"]*medium-description[^"]*">([^<]+)</p>',
 +                webpage, 'description', fatal=False)
 +        else:
 +            programme_id, title, description, duration, formats, subtitles = self._download_playlist(group_id)
 +
 +        self._sort_formats(formats)
 +
 +        return {
 +            'id': programme_id,
 +            'title': title,
 +            'description': description,
 +            'thumbnail': self._og_search_thumbnail(webpage, default=None),
 +            'duration': duration,
 +            'formats': formats,
 +            'subtitles': subtitles,
 +        }
 +
 +
 +class BBCNewsIE(BBCCoUkIE):
 +    IE_NAME = 'bbc.com'
 +    IE_DESC = 'BBC news'
 +    _VALID_URL = r'https?://(?:www\.)?bbc\.com/.+?/(?P<id>[^/]+)$'
 +
 +    mediaselector_url = 'http://open.live.bbc.co.uk/mediaselector/4/mtis/stream/%s'
 +
 +    _TESTS = [{
 +        'url': 'http://www.bbc.com/news/world-europe-32668511',
 +        'info_dict': {
 +            'id': 'world-europe-32668511',
 +            'title': 'Russia stages massive WW2 parade despite Western boycott',
 +        },
 +        'playlist_count': 2,
 +    },{
 +        'url': 'http://www.bbc.com/news/business-28299555',
 +        'info_dict': {
 +            'id': 'business-28299555',
 +            'title': 'Farnborough Airshow: Video highlights',
 +        },
 +        'playlist_count': 9,
 +    },{
 +        'url': 'http://www.bbc.com/news/world-europe-32041533',
 +        'note': 'Video',
 +        'info_dict': {
 +            'id': 'p02mprgb',
 +            'ext': 'mp4',
 +            'title': 'Aerial footage showed the site of the crash in the Alps - courtesy BFM TV',
 +            'description': 'Germanwings plane crash site in aerial video - Aerial footage showed the site of the crash in the Alps - courtesy BFM TV',
 +            'duration': 47,
 +            'upload_date': '20150324',
 +            'uploader': 'BBC News',
 +        },
 +        'params': {
 +            'skip_download': True,
 +        }
 +    },{
 +        'url': 'http://www.bbc.com/turkce/haberler/2015/06/150615_telabyad_kentin_cogu',
 +        'note': 'Video',
 +        'info_dict': {
 +            'id': 'NA',
 +            'ext': 'mp4',
 +            'title': 'YPG: Tel Abyad\'\u0131n tamam\u0131 kontrol\xfcm\xfczde',
 +            'description': 'YPG: Tel Abyad\'\u0131n tamam\u0131 kontrol\xfcm\xfczde',
 +            'duration': 47,
 +            'upload_date': '20150615',
 +            'uploader': 'BBC News',
 +        },
 +        'params': {
 +            'skip_download': True,
 +        }
 +    },{
 +        'url': 'http://www.bbc.com/mundo/video_fotos/2015/06/150619_video_honduras_militares_hospitales_corrupcion_aw',
 +        'note': 'Video',
 +        'info_dict': {
 +            'id': '39275083',
 +            'ext': 'mp4',
 +            'title': 'Honduras militariza sus hospitales por nuevo esc\xe1ndalo de corrupci\xf3n',
 +            'description': 'Honduras militariza sus hospitales por nuevo esc\xe1ndalo de corrupci\xf3n',
 +            'duration': 87,
 +            'upload_date': '20150619',
 +            'uploader': 'BBC News',
 +        },
 +        'params': {
 +            'skip_download': True,
 +        }
 +    }]
 +
 +    def _real_extract(self, url):
 +        list_id = self._match_id(url)
 +        webpage = self._download_webpage(url, list_id)
 +
 +        list_title = self._html_search_regex(r'<title>(.*?)(?:\s*-\s*BBC [^ ]+)?</title>', webpage, 'list title')
 +
 +        pubdate = self._html_search_regex(r'"datePublished":\s*"(\d+-\d+-\d+)', webpage, 'date', default=None)
 +        if pubdate:
 +           pubdate = pubdate.replace('-','')
 +
 +        ret = []
 +        jsent = []
 +
 +        # works with bbc.com/news/something-something-123456 articles
 +        jsent = map(
 +           lambda m: self._parse_json(m,list_id),
 +           re.findall(r"data-media-meta='({[^']+})'", webpage)
 +        )
 +
 +        if len(jsent) == 0:
 +           # http://www.bbc.com/news/video_and_audio/international
 +           # and single-video articles
 +           masset = self._html_search_regex(r'mediaAssetPage\.init\(\s*({.+?}), "/', webpage, 'mediaassets', default=None)
 +           if masset:
 +              jmasset = self._parse_json(masset,list_id)
 +              for key, val in jmasset.get('videos',{}).items():
 +                  for skey, sval in val.items():
 +                      sval['id'] = skey
 +                      jsent.append(sval)
 +
 +        if len(jsent) == 0:
 +           # stubbornly generic extractor for {json with "image":{allvideoshavethis},etc}
 +           # in http://www.bbc.com/news/video_and_audio/international
 +           # prone to breaking if entries have sourceFiles list
 +           jsent = map(
 +               lambda m: self._parse_json(m,list_id),
 +               re.findall(r"({[^{}]+image\":{[^}]+}[^}]+})", webpage)
 +           )          
 +
 +        if len(jsent) == 0:
 +           raise ExtractorError('No video found', expected=True)
 +
 +        for jent in jsent:
 +            programme_id = jent.get('externalId')
 +            xml_url = jent.get('href')
 +
 +            title = jent.get('caption',list_title)
 +
 +            duration = parse_duration(jent.get('duration'))
 +            description = list_title
 +            if jent.get('caption'):
 +               description += ' - ' + jent.get('caption')
 +            thumbnail = None
 +            if jent.has_key('image'):
 +               thumbnail=jent['image'].get('href')
 +
 +            formats = []
 +            subtitles = []
 +
 +            if programme_id:
 +               formats, subtitles = self._download_media_selector(programme_id)
 +            elif jent.has_key('sourceFiles'):
 +               # mediaselector not used at
 +               # http://www.bbc.com/turkce/haberler/2015/06/150615_telabyad_kentin_cogu
 +               for key, val in jent['sourceFiles'].items():
 +                  formats.append( {
 +                     'ext': val.get('encoding'),
 +                     'url': val.get('url'),
 +                     'filesize': int(val.get('filesize')),
 +                     'format_id': key
 +                  } )
 +            elif xml_url:
 +               # Cheap fallback
 +               # http://playlists.bbc.co.uk/news/(list_id)[ABC..]/playlist.sxml
 +               xml = self._download_webpage(xml_url, programme_id, 'Downloading playlist.sxml for externalId (fallback)')
 +               programme_id = self._search_regex(r'<mediator [^>]*identifier="(.+?)"', xml, 'playlist.sxml (externalId fallback)')
 +               formats, subtitles = self._download_media_selector(programme_id)
 +
 +            if len(formats) == 0:
 +               raise ExtractorError('unsupported json media entry.\n    '+str(jent)+'\n')
 +               
 +            self._sort_formats(formats)
 +
 +            id = jent.get('id') if programme_id == None else programme_id
 +            if id == None:
 +               id = 'NA'
 +
 +            ret.append( {
 +                'id': id,
 +                'uploader': 'BBC News',
 +                'upload_date': pubdate,
 +                'title': title,
 +                'description': description,
 +                'thumbnail': thumbnail,
 +                'duration': duration,
 +                'formats': formats,
 +                'subtitles': subtitles,
 +            } )
 +
 +        if len(ret) > 0:
 +           return self.playlist_result(ret, list_id, list_title)
 +        raise ExtractorError('No video found', expected=True)