mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-30 02:14:37 +01:00
Merge remote-tracking branch 'soult/br'
This commit is contained in:
commit
9b69af5342
@ -9,21 +9,35 @@ from ..utils import ExtractorError
|
|||||||
|
|
||||||
class BRIE(InfoExtractor):
|
class BRIE(InfoExtractor):
|
||||||
IE_DESC = "Bayerischer Rundfunk Mediathek"
|
IE_DESC = "Bayerischer Rundfunk Mediathek"
|
||||||
_VALID_URL = r"^https?://(?:www\.)?br\.de/mediathek/video/(?:sendungen/)?(?P<id>[a-z0-9\-]+)\.html$"
|
_VALID_URL = r"^https?://(?:www\.)?br\.de/mediathek/video/(?:sendungen/)?(?:[a-z0-9\-/]+/)?(?P<id>[a-z0-9\-]+)\.html$"
|
||||||
_BASE_URL = "http://www.br.de"
|
_BASE_URL = "http://www.br.de"
|
||||||
|
|
||||||
_TEST = {
|
_TESTS = [
|
||||||
"url": "http://www.br.de/mediathek/video/anselm-gruen-114.html",
|
{
|
||||||
"md5": "c4f83cf0f023ba5875aba0bf46860df2",
|
"url": "http://www.br.de/mediathek/video/anselm-gruen-114.html",
|
||||||
"info_dict": {
|
"md5": "c4f83cf0f023ba5875aba0bf46860df2",
|
||||||
"id": "2c8d81c5-6fb7-4a74-88d4-e768e5856532",
|
"info_dict": {
|
||||||
"ext": "mp4",
|
"id": "2c8d81c5-6fb7-4a74-88d4-e768e5856532",
|
||||||
"title": "Feiern und Verzichten",
|
"ext": "mp4",
|
||||||
"description": "Anselm Grün: Feiern und Verzichten",
|
"title": "Feiern und Verzichten",
|
||||||
"uploader": "BR/Birgit Baier",
|
"description": "Anselm Grün: Feiern und Verzichten",
|
||||||
"upload_date": "20140301"
|
"uploader": "BR/Birgit Baier",
|
||||||
|
"upload_date": "20140301"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "http://www.br.de/mediathek/video/sendungen/unter-unserem-himmel/unter-unserem-himmel-alpen-ueber-den-pass-100.html",
|
||||||
|
"md5": "ab451b09d861dbed7d7cc9ab0be19ebe",
|
||||||
|
"info_dict": {
|
||||||
|
"id": "2c060e69-3a27-4e13-b0f0-668fac17d812",
|
||||||
|
"ext": "mp4",
|
||||||
|
"title": "Über den Pass",
|
||||||
|
"description": "Die Eroberung der Alpen: Über den Pass",
|
||||||
|
"uploader": None,
|
||||||
|
"upload_date": None
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
@ -33,16 +47,21 @@ class BRIE(InfoExtractor):
|
|||||||
r"return BRavFramework\.register\(BRavFramework\('avPlayer_(?:[a-f0-9-]{36})'\)\.setup\({dataURL:'(/mediathek/video/[a-z0-9/~_.-]+)'}\)\);", page, "XMLURL")
|
r"return BRavFramework\.register\(BRavFramework\('avPlayer_(?:[a-f0-9-]{36})'\)\.setup\({dataURL:'(/mediathek/video/[a-z0-9/~_.-]+)'}\)\);", page, "XMLURL")
|
||||||
xml = self._download_xml(self._BASE_URL + xml_url, None)
|
xml = self._download_xml(self._BASE_URL + xml_url, None)
|
||||||
|
|
||||||
videos = [{
|
videos = []
|
||||||
"id": xml_video.get("externalId"),
|
for xml_video in xml.findall("video"):
|
||||||
"title": xml_video.find("title").text,
|
video = {
|
||||||
"formats": self._extract_formats(xml_video.find("assets")),
|
"id": xml_video.get("externalId"),
|
||||||
"thumbnails": self._extract_thumbnails(xml_video.find("teaserImage/variants")),
|
"title": xml_video.find("title").text,
|
||||||
"description": " ".join(xml_video.find("shareTitle").text.splitlines()),
|
"formats": self._extract_formats(xml_video.find("assets")),
|
||||||
"uploader": xml_video.find("author").text,
|
"thumbnails": self._extract_thumbnails(xml_video.find("teaserImage/variants")),
|
||||||
"upload_date": "".join(reversed(xml_video.find("broadcastDate").text.split("."))),
|
"description": " ".join(xml_video.find("shareTitle").text.splitlines()),
|
||||||
"webpage_url": xml_video.find("permalink").text,
|
"webpage_url": xml_video.find("permalink").text
|
||||||
} for xml_video in xml.findall("video")]
|
}
|
||||||
|
if xml_video.find("author").text:
|
||||||
|
video["uploader"] = xml_video.find("author").text
|
||||||
|
if xml_video.find("broadcastDate").text:
|
||||||
|
video["upload_date"] = "".join(reversed(xml_video.find("broadcastDate").text.split(".")))
|
||||||
|
videos.append(video)
|
||||||
|
|
||||||
if len(videos) > 1:
|
if len(videos) > 1:
|
||||||
self._downloader.report_warning(
|
self._downloader.report_warning(
|
||||||
|
Loading…
Reference in New Issue
Block a user