X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fbr.py;h=4e2960c6260ebf6bf0d242a6b0bfc38baf40b25c;hb=fc96eb4e2180d9a2371d84daa4305a5f34f12321;hp=888c5c23906a11d4e9505f803076e11107379035;hpb=3eb38acb43f30c94a9b93894b1d8171f3e6fa809;p=youtube-dl diff --git a/youtube_dl/extractor/br.py b/youtube_dl/extractor/br.py index 888c5c239..4e2960c62 100644 --- a/youtube_dl/extractor/br.py +++ b/youtube_dl/extractor/br.py @@ -1,70 +1,133 @@ # coding: utf-8 +from __future__ import unicode_literals + +import re from .common import InfoExtractor +from ..utils import ( + ExtractorError, + int_or_none, + parse_duration, +) -class BRIE(InfoExtractor): - IE_DESC = u"Bayerischer Rundfunk Mediathek" - _VALID_URL = r"^https?://(?:www\.)?br\.de/mediathek/video/(?:sendungen/)?(?:[a-z0-9\-]+\.html)$" - _BASE_URL = u"http://www.br.de" +class BRIE(InfoExtractor): + IE_DESC = 'Bayerischer Rundfunk Mediathek' + _VALID_URL = r'https?://(?:www\.)?br\.de/(?:[a-z0-9\-_]+/)+(?P[a-z0-9\-_]+)\.html' + _BASE_URL = 'http://www.br.de' - _TESTS = [] + _TESTS = [ + { + 'url': 'http://www.br.de/mediathek/video/sendungen/heimatsound/heimatsound-festival-2014-trailer-100.html', + 'md5': '93556dd2bcb2948d9259f8670c516d59', + 'info_dict': { + 'id': '25e279aa-1ffd-40fd-9955-5325bd48a53a', + 'ext': 'mp4', + 'title': 'Wenn das Traditions-Theater wackelt', + 'description': 'Heimatsound-Festival 2014: Wenn das Traditions-Theater wackelt', + 'duration': 34, + } + }, + { + 'url': 'http://www.br.de/nachrichten/schaeuble-haushaltsentwurf-bundestag-100.html', + 'md5': '3db0df1a9a9cd9fa0c70e6ea8aa8e820', + 'info_dict': { + 'id': 'c6aae3de-2cf9-43f2-957f-f17fef9afaab', + 'ext': 'aac', + 'title': '"Keine neuen Schulden im nächsten Jahr"', + 'description': 'Haushaltsentwurf: "Keine neuen Schulden im nächsten Jahr"', + 'duration': 64, + } + }, + { + 'url': 'http://www.br.de/radio/bayern1/service/team/videos/team-video-erdelt100.html', + 'md5': 'dbab0aef2e047060ea7a21fc1ce1078a', + 'info_dict': { + 'id': '6ba73750-d405-45d3-861d-1ce8c524e059', + 'ext': 'mp4', + 'title': 'Umweltbewusster Häuslebauer', + 'description': 'Uwe Erdelt: Umweltbewusster Häuslebauer', + 'duration': 116, + } + }, + { + 'url': 'http://www.br.de/fernsehen/br-alpha/sendungen/kant-fuer-anfaenger/kritik-der-reinen-vernunft/kant-kritik-01-metaphysik100.html', + 'md5': '23bca295f1650d698f94fc570977dae3', + 'info_dict': { + 'id': 'd982c9ce-8648-4753-b358-98abb8aec43d', + 'ext': 'mp4', + 'title': 'Folge 1 - Metaphysik', + 'description': 'Kant für Anfänger: Folge 1 - Metaphysik', + 'duration': 893, + 'uploader': 'Eva Maria Steimle', + 'upload_date': '20140117', + } + }, + ] def _real_extract(self, url): - page = self._download_webpage(url, None) - xml_url = self._search_regex(r"return BRavFramework\.register\(BRavFramework\('avPlayer_(?:[a-f0-9-]{36})'\)\.setup\({dataURL:'(/mediathek/video/[a-z0-9/~_.-]+)'}\)\);", page, "XMLURL") + mobj = re.match(self._VALID_URL, url) + display_id = mobj.group('id') + page = self._download_webpage(url, display_id) + xml_url = self._search_regex( + r"return BRavFramework\.register\(BRavFramework\('avPlayer_(?:[a-f0-9-]{36})'\)\.setup\({dataURL:'(/(?:[a-z0-9\-]+/)+[a-z0-9/~_.-]+)'}\)\);", page, 'XMLURL') xml = self._download_xml(self._BASE_URL + xml_url, None) - videos = [] - for xml_video in xml.findall("video"): - video = {} - video["id"] = xml_video.get("externalId") - video["title"] = xml_video.find("title").text - video["formats"] = self._extract_formats(xml_video.find("assets")) - video["thumbnails"] = self._extract_thumbnails(xml_video.find("teaserImage/variants")) - video["thumbnail"] = video["thumbnails"][0]["url"] - video["description"] = " ".join(xml_video.find("shareTitle").text.splitlines()) - video["uploader"] = xml_video.find("author").text - video["upload_date"] = "".join(reversed(xml_video.find("broadcastDate").text.split("."))) - video["webpage_url"] = xml_video.find("permalink").text - videos.append(video) + medias = [] + + for xml_media in xml.findall('video') + xml.findall('audio'): + media = { + 'id': xml_media.get('externalId'), + 'title': xml_media.find('title').text, + 'duration': parse_duration(xml_media.find('duration').text), + 'formats': self._extract_formats(xml_media.find('assets')), + 'thumbnails': self._extract_thumbnails(xml_media.find('teaserImage/variants')), + 'description': ' '.join(xml_media.find('shareTitle').text.splitlines()), + 'webpage_url': xml_media.find('permalink').text + } + if xml_media.find('author').text: + media['uploader'] = xml_media.find('author').text + if xml_media.find('broadcastDate').text: + media['upload_date'] = ''.join(reversed(xml_media.find('broadcastDate').text.split('.'))) + medias.append(media) - if len(videos) > 1: - self._downloader.report_warning(u'found multiple videos; please' - u'report this with the video URL to http://yt-dl.org/bug') - return videos[0] + if len(medias) > 1: + self._downloader.report_warning( + 'found multiple medias; please ' + 'report this with the video URL to http://yt-dl.org/bug') + if not medias: + raise ExtractorError('No media entries found') + return medias[0] def _extract_formats(self, assets): - vformats = [] - for asset in assets.findall("asset"): - if asset.find("downloadUrl") is None: - continue - vformat = {} - vformat["url"] = asset.find("downloadUrl").text - vformat["ext"] = asset.find("mediaType").text - vformat["format_id"] = asset.get("type") - vformat["width"] = int(asset.find("frameWidth").text) - vformat["height"] = int(asset.find("frameHeight").text) - vformat["resolution"] = "%ix%i" % (vformat["width"], vformat["height"]) - vformat["tbr"] = int(asset.find("bitrateVideo").text) - vformat["abr"] = int(asset.find("bitrateAudio").text) - vformat["vcodec"] = asset.find("codecVideo").text - vformat["container"] = vformat["ext"] - vformat["filesize"] = int(asset.find("size").text) - vformat["preference"] = vformat["quality"] = -1 - vformat["format"] = "%s container with %i Kbps %s" % (vformat["container"], vformat["tbr"], vformat["vcodec"]) - vformats.append(vformat) - self._sort_formats(vformats) - return vformats + + def text_or_none(asset, tag): + elem = asset.find(tag) + return None if elem is None else elem.text + + formats = [{ + 'url': text_or_none(asset, 'downloadUrl'), + 'ext': text_or_none(asset, 'mediaType'), + 'format_id': asset.get('type'), + 'width': int_or_none(text_or_none(asset, 'frameWidth')), + 'height': int_or_none(text_or_none(asset, 'frameHeight')), + 'tbr': int_or_none(text_or_none(asset, 'bitrateVideo')), + 'abr': int_or_none(text_or_none(asset, 'bitrateAudio')), + 'vcodec': text_or_none(asset, 'codecVideo'), + 'acodec': text_or_none(asset, 'codecAudio'), + 'container': text_or_none(asset, 'mediaType'), + 'filesize': int_or_none(text_or_none(asset, 'size')), + } for asset in assets.findall('asset') + if asset.find('downloadUrl') is not None] + + self._sort_formats(formats) + return formats def _extract_thumbnails(self, variants): - thumbnails = [] - for variant in variants.findall("variant"): - thumbnail = {} - thumbnail["url"] = self._BASE_URL + variant.find("url").text - thumbnail["width"] = int(variant.find("width").text) - thumbnail["height"] = int(variant.find("height").text) - thumbnail["resolution"] = "%ix%i" % (thumbnail["width"], thumbnail["height"]) - thumbnails.append(thumbnail) - thumbnails.sort(key = lambda x: x["width"] * x["height"], reverse=True) + thumbnails = [{ + 'url': self._BASE_URL + variant.find('url').text, + 'width': int_or_none(variant.find('width').text), + 'height': int_or_none(variant.find('height').text), + } for variant in variants.findall('variant')] + thumbnails.sort(key=lambda x: x['width'] * x['height'], reverse=True) return thumbnails