From 987f3b27dbace9d5c0444aff19cfc77e751e1240 Mon Sep 17 00:00:00 2001 From: carsten demming Date: Tue, 20 Feb 2018 13:07:16 +0100 Subject: [PATCH 1/3] - added a new test case that is still available --- youtube_dl/extractor/ard.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py index ef73d5a93..9e143a556 100644 --- a/youtube_dl/extractor/ard.py +++ b/youtube_dl/extractor/ard.py @@ -24,6 +24,20 @@ class ARDMediathekIE(InfoExtractor): _VALID_URL = r'^https?://(?:(?:www\.)?ardmediathek\.de|mediathek\.(?:daserste|rbb-online)\.de)/(?:.*/)(?P[0-9]+|[^0-9][^/\?]+)[^/\?]*(?:\?.*)?' _TESTS = [{ + 'url': 'http://www.ardmediathek.de/tv/Der-Blaue-Planet/Der-Blaue-Planet-1/Das-Erste/Video?bcastId=49529922&documentId=50144564', + 'info_dict': { + 'id': '50144564', + 'ext': 'mp4', + 'title': 'Der Blaue Planet (1)', + 'description': 'md5:e028897573e395b442e4ef1ec0f0fb85', + 'duration': 2608, + }, + 'params': { + # m3u8 download + 'skip_download': True, + } + }, + { 'url': 'http://www.ardmediathek.de/tv/Dokumentation-und-Reportage/Ich-liebe-das-Leben-trotzdem/rbb-Fernsehen/Video?documentId=29582122&bcastId=3822114', 'info_dict': { 'id': '29582122', From 5ae18f7e128cd5d7738f47c6ba8097d12c90b530 Mon Sep 17 00:00:00 2001 From: carsten demming Date: Wed, 21 Feb 2018 00:26:00 +0100 Subject: [PATCH 2/3] - changed test case with a case that is available until 2022 --- youtube_dl/extractor/ard.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py index 9e143a556..c48a472ee 100644 --- a/youtube_dl/extractor/ard.py +++ b/youtube_dl/extractor/ard.py @@ -24,13 +24,13 @@ class ARDMediathekIE(InfoExtractor): _VALID_URL = r'^https?://(?:(?:www\.)?ardmediathek\.de|mediathek\.(?:daserste|rbb-online)\.de)/(?:.*/)(?P[0-9]+|[^0-9][^/\?]+)[^/\?]*(?:\?.*)?' _TESTS = [{ - 'url': 'http://www.ardmediathek.de/tv/Der-Blaue-Planet/Der-Blaue-Planet-1/Das-Erste/Video?bcastId=49529922&documentId=50144564', + 'url': 'http://www.ardmediathek.de/tv/S%C3%9CDLICHT/Was-ist-die-Kunst-der-Zukunft-liebe-Ann/BR-Fernsehen/Video?bcastId=34633636&documentId=44726822', 'info_dict': { - 'id': '50144564', + 'id': '44726822', 'ext': 'mp4', - 'title': 'Der Blaue Planet (1)', - 'description': 'md5:e028897573e395b442e4ef1ec0f0fb85', - 'duration': 2608, + 'title': 'Was ist die Kunst der Zukunft, liebe Anna McCarthy?', + 'description': 'md5:4ada28b3e3b5df01647310e41f3a62f5', + 'duration': 1740, }, 'params': { # m3u8 download From 7458f669cf51c1f36f58cdb7b5f0cf1f39c824f2 Mon Sep 17 00:00:00 2001 From: carsten demming Date: Wed, 21 Feb 2018 00:39:48 +0100 Subject: [PATCH 3/3] - Updated the ARD Extractor with a new case as well valid until 2019 --- youtube_dl/extractor/ard.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py index c48a472ee..8d3dd78a3 100644 --- a/youtube_dl/extractor/ard.py +++ b/youtube_dl/extractor/ard.py @@ -266,7 +266,20 @@ class ARDMediathekIE(InfoExtractor): class ARDIE(InfoExtractor): _VALID_URL = r'(?Phttps?://(www\.)?daserste\.de/[^?#]+/videos/(?P[^/?#]+)-(?P[0-9]+))\.html' - _TEST = { + _TESTS = [{ + 'url': 'http://www.daserste.de/information/talk/maischberger/videos/das-groko-drama-zerlegen-sich-die-volksparteien-video-102.html', + 'md5': '8e4ec85f31be7c7fc08a26cdbc5a1f49', + 'info_dict': { + 'display_id': 'das-groko-drama-zerlegen-sich-die-volksparteien-video', + 'id': '102', + 'ext': 'mp4', + 'duration': 4435.0, + 'title': 'Das GroKo-Drama: Zerlegen sich die Volksparteien?', + 'upload_date': '20180214', + 'thumbnail': r're:^https?://.*\.jpg$', + }, + }, + { 'url': 'http://www.daserste.de/information/reportage-dokumentation/dokus/videos/die-story-im-ersten-mission-unter-falscher-flagge-100.html', 'md5': 'd216c3a86493f9322545e045ddc3eb35', 'info_dict': { @@ -279,7 +292,7 @@ class ARDIE(InfoExtractor): 'thumbnail': r're:^https?://.*\.jpg$', }, 'skip': 'HTTP Error 404: Not Found', - } + }] def _real_extract(self, url): mobj = re.match(self._VALID_URL, url)