From 035afbfadd344a25aacde4f698f1c33a7b58ec09 Mon Sep 17 00:00:00 2001 From: carsten demming Date: Tue, 20 Feb 2018 13:17:56 +0100 Subject: [PATCH 1/5] - added current ZDF test case --- youtube_dl/extractor/zdf.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index 523bb5c95..8133a1fb2 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -42,6 +42,17 @@ class ZDFIE(ZDFBaseIE): _QUALITIES = ('auto', 'low', 'med', 'high', 'veryhigh') _TESTS = [{ + 'url': 'https://www.zdf.de/dokumentation/zdfinfo-doku/polenzwei-102.html', + 'info_dict': { + 'id': 'polenzwei-102', + 'ext': 'mp4', + 'title': 'Polenfeldzug (2)', + 'description': 'md5:4771d08c3a0ce235a5477fe39ab5e72a', + 'duration': 2699, + 'timestamp': 1519030800, + 'upload_date': '20180219', + } + },{ 'url': 'https://www.zdf.de/service-und-hilfe/die-neue-zdf-mediathek/zdfmediathek-trailer-100.html', 'info_dict': { 'id': 'zdfmediathek-trailer-100', From bf0298344ab3b849269de2798c134230b114c561 Mon Sep 17 00:00:00 2001 From: carsten demming Date: Tue, 20 Feb 2018 21:26:58 +0100 Subject: [PATCH 2/5] - Removed 404 tests --- youtube_dl/extractor/zdf.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index 8133a1fb2..152477361 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -52,20 +52,6 @@ class ZDFIE(ZDFBaseIE): 'timestamp': 1519030800, 'upload_date': '20180219', } - },{ - 'url': 'https://www.zdf.de/service-und-hilfe/die-neue-zdf-mediathek/zdfmediathek-trailer-100.html', - 'info_dict': { - 'id': 'zdfmediathek-trailer-100', - 'ext': 'mp4', - 'title': 'Die neue ZDFmediathek', - 'description': 'md5:3003d36487fb9a5ea2d1ff60beb55e8d', - 'duration': 30, - 'timestamp': 1477627200, - 'upload_date': '20161028', - } - }, { - 'url': 'https://www.zdf.de/filme/taunuskrimi/die-lebenden-und-die-toten-1---ein-taunuskrimi-100.html', - 'only_matching': True, }, { 'url': 'https://www.zdf.de/dokumentation/planet-e/planet-e-uebersichtsseite-weitere-dokumentationen-von-planet-e-100.html', 'only_matching': True, From 7ad6dd8fa43839f1d510b775a9b9a6d21f691113 Mon Sep 17 00:00:00 2001 From: carsten demming Date: Tue, 20 Feb 2018 21:32:52 +0100 Subject: [PATCH 3/5] - changed test case to a case that is available till 2025 --- youtube_dl/extractor/zdf.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index 152477361..69ac9fb29 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -42,15 +42,15 @@ class ZDFIE(ZDFBaseIE): _QUALITIES = ('auto', 'low', 'med', 'high', 'veryhigh') _TESTS = [{ - 'url': 'https://www.zdf.de/dokumentation/zdfinfo-doku/polenzwei-102.html', + 'url': 'https://www.zdf.de/dokumentation/terra-x/die-magie-der-farben-von-koenigspurpur-und-jeansblau-100.html', 'info_dict': { - 'id': 'polenzwei-102', + 'id': 'die-magie-der-farben-von-koenigspurpur-und-jeansblau-100', 'ext': 'mp4', - 'title': 'Polenfeldzug (2)', - 'description': 'md5:4771d08c3a0ce235a5477fe39ab5e72a', - 'duration': 2699, - 'timestamp': 1519030800, - 'upload_date': '20180219', + 'title': 'Die Magie der Farben (2/2)', + 'description': 'md5:a89da10c928c6235401066b60a6d5c1a', + 'duration': 2615, + 'timestamp': 1465021200, + 'upload_date': '20160604', } }, { 'url': 'https://www.zdf.de/dokumentation/planet-e/planet-e-uebersichtsseite-weitere-dokumentationen-von-planet-e-100.html', From 43c323bff1558884f44bfc2ff5e332c4fc9f97ad Mon Sep 17 00:00:00 2001 From: carsten demming Date: Tue, 20 Feb 2018 23:57:43 +0100 Subject: [PATCH 4/5] - keeping old tests as matching only --- youtube_dl/extractor/zdf.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index 69ac9fb29..113dd13ee 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -53,6 +53,22 @@ class ZDFIE(ZDFBaseIE): 'upload_date': '20160604', } }, { + 'url': 'https://www.zdf.de/service-und-hilfe/die-neue-zdf-mediathek/zdfmediathek-trailer-100.html', + 'info_dict': { + 'id': 'zdfmediathek-trailer-100', + 'ext': 'mp4', + 'title': 'Die neue ZDFmediathek', + 'description': 'md5:3003d36487fb9a5ea2d1ff60beb55e8d', + 'duration': 30, + 'timestamp': 1477627200, + 'upload_date': '20161028', + }, + 'only_matching': True, + }, { + 'url': 'https://www.zdf.de/filme/taunuskrimi/die-lebenden-und-die-toten-1---ein-taunuskrimi-100.html', + 'only_matching': True, + }, + { 'url': 'https://www.zdf.de/dokumentation/planet-e/planet-e-uebersichtsseite-weitere-dokumentationen-von-planet-e-100.html', 'only_matching': True, }] From f8c3b43761f719313d33aeed8afc8dbcb9f08d5e Mon Sep 17 00:00:00 2001 From: Sergey M Date: Wed, 21 Feb 2018 21:57:12 +0700 Subject: [PATCH 5/5] Update zdf.py --- youtube_dl/extractor/zdf.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index 113dd13ee..bb9020c91 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -51,24 +51,14 @@ class ZDFIE(ZDFBaseIE): 'duration': 2615, 'timestamp': 1465021200, 'upload_date': '20160604', - } + }, }, { 'url': 'https://www.zdf.de/service-und-hilfe/die-neue-zdf-mediathek/zdfmediathek-trailer-100.html', - 'info_dict': { - 'id': 'zdfmediathek-trailer-100', - 'ext': 'mp4', - 'title': 'Die neue ZDFmediathek', - 'description': 'md5:3003d36487fb9a5ea2d1ff60beb55e8d', - 'duration': 30, - 'timestamp': 1477627200, - 'upload_date': '20161028', - }, 'only_matching': True, }, { 'url': 'https://www.zdf.de/filme/taunuskrimi/die-lebenden-und-die-toten-1---ein-taunuskrimi-100.html', 'only_matching': True, - }, - { + }, { 'url': 'https://www.zdf.de/dokumentation/planet-e/planet-e-uebersichtsseite-weitere-dokumentationen-von-planet-e-100.html', 'only_matching': True, }]