From 4f4648a4447a8eddb602329cd20351a784dd62fa Mon Sep 17 00:00:00 2001 From: Jan Gampe Date: Fri, 31 Aug 2018 10:43:36 +0200 Subject: [PATCH 1/4] Add 'one.ard.de' to valid URLs of ARD Mediathek extractor --- youtube_dl/extractor/ard.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py index 23f574d36..a7640c94a 100644 --- a/youtube_dl/extractor/ard.py +++ b/youtube_dl/extractor/ard.py @@ -21,7 +21,7 @@ from ..compat import compat_etree_fromstring class ARDMediathekIE(InfoExtractor): IE_NAME = 'ARD:mediathek' - _VALID_URL = r'^https?://(?:(?:www\.)?ardmediathek\.de|mediathek\.(?:daserste|rbb-online)\.de)/(?:.*/)(?P[0-9]+|[^0-9][^/\?]+)[^/\?]*(?:\?.*)?' + _VALID_URL = r'^https?://(?:(?:www\.)?ardmediathek\.de|mediathek\.(?:daserste|rbb-online)\.de|one\.ard\.de)/(?:.*/)(?P[0-9]+|[^0-9][^/\?]+)[^/\?]*(?:\?.*)?' _TESTS = [{ # available till 26.07.2022 @@ -282,3 +282,4 @@ class ARDIE(InfoExtractor): 'upload_date': upload_date, 'thumbnail': thumbnail, } + From 3ac28c6e6f63a057ce9a5fb77e5968f2fe0e75dd Mon Sep 17 00:00:00 2001 From: Jan Gampe Date: Fri, 31 Aug 2018 10:58:31 +0200 Subject: [PATCH 2/4] Add 'one.ard.de' to valid URLs of ARD Mediathek extractor --- youtube_dl/extractor/ard.py | 1 - 1 file changed, 1 deletion(-) diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py index a7640c94a..c611c617c 100644 --- a/youtube_dl/extractor/ard.py +++ b/youtube_dl/extractor/ard.py @@ -282,4 +282,3 @@ class ARDIE(InfoExtractor): 'upload_date': upload_date, 'thumbnail': thumbnail, } - From 948c5abb26e44e28b8ec5f48c2e7cf3ff1014772 Mon Sep 17 00:00:00 2001 From: Jan Gampe Date: Fri, 31 Aug 2018 11:45:46 +0200 Subject: [PATCH 3/4] Add Test for one.ard.de URL --- 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 c611c617c..0d7c02b1e 100644 --- a/youtube_dl/extractor/ard.py +++ b/youtube_dl/extractor/ard.py @@ -37,6 +37,20 @@ class ARDMediathekIE(InfoExtractor): # m3u8 download 'skip_download': True, } + }, { + # available till 30.11.2018 + 'url': 'https://one.ard.de/tv/Mord-mit-Aussicht/Mord-mit-Aussicht-6-39-T%C3%B6dliche-Nach/ONE/Video?bcastId=46384294&documentId=55586872', + 'info_dict': { + 'id': '55586872', + 'ext': 'mp4', + 'title': 'Mord mit Aussicht (6/39) - Tödliche Nachbarschaft', + 'description': 'md5:4eba4c90e1fc0a072ba0e941ebb8170a', + 'duration': 2850, + }, + 'params': { + # m3u8 download + 'skip_download': True, + } }, { # audio 'url': 'http://www.ardmediathek.de/tv/WDR-H%C3%B6rspiel-Speicher/Tod-eines-Fu%C3%9Fballers/WDR-3/Audio-Podcast?documentId=28488308&bcastId=23074086', From 61968de31f48a35472c630d90d818cbfc4732820 Mon Sep 17 00:00:00 2001 From: Jan Gampe Date: Fri, 31 Aug 2018 13:24:04 +0200 Subject: [PATCH 4/4] Changed Test to an only_matching test --- youtube_dl/extractor/ard.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py index 0d7c02b1e..8cda9e692 100644 --- a/youtube_dl/extractor/ard.py +++ b/youtube_dl/extractor/ard.py @@ -38,19 +38,8 @@ class ARDMediathekIE(InfoExtractor): 'skip_download': True, } }, { - # available till 30.11.2018 'url': 'https://one.ard.de/tv/Mord-mit-Aussicht/Mord-mit-Aussicht-6-39-T%C3%B6dliche-Nach/ONE/Video?bcastId=46384294&documentId=55586872', - 'info_dict': { - 'id': '55586872', - 'ext': 'mp4', - 'title': 'Mord mit Aussicht (6/39) - Tödliche Nachbarschaft', - 'description': 'md5:4eba4c90e1fc0a072ba0e941ebb8170a', - 'duration': 2850, - }, - 'params': { - # m3u8 download - 'skip_download': True, - } + 'only_matching': True, }, { # audio 'url': 'http://www.ardmediathek.de/tv/WDR-H%C3%B6rspiel-Speicher/Tod-eines-Fu%C3%9Fballers/WDR-3/Audio-Podcast?documentId=28488308&bcastId=23074086',