From 5b2f81e500dd9998ff29163a69cd907d9abadd6c Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu@web.de> Date: Sat, 12 Oct 2019 14:34:54 +0200 Subject: [PATCH] [tele5] Fix extractor --- youtube_dl/extractor/nexx.py | 7 +++++++ youtube_dl/extractor/tele5.py | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/nexx.py b/youtube_dl/extractor/nexx.py index 82d526c22..f8aa7776e 100644 --- a/youtube_dl/extractor/nexx.py +++ b/youtube_dl/extractor/nexx.py @@ -364,6 +364,13 @@ class NexxIE(InfoExtractor): 'X-Request-Token': request_token, }) + # some videos have 'bumpers' (ads), the API returns a list in that case + if isinstance(video, list): + for v in video: + if compat_str(v['general']['ID']) == video_id: + # the bumpers have differing IDs + video = v + break general = video['general'] title = general['title'] diff --git a/youtube_dl/extractor/tele5.py b/youtube_dl/extractor/tele5.py index 33a72083b..1a3041609 100644 --- a/youtube_dl/extractor/tele5.py +++ b/youtube_dl/extractor/tele5.py @@ -9,13 +9,13 @@ from ..compat import compat_urlparse class Tele5IE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?tele5\.de/(?:[^/]+/)*(?P[^/?#&]+)' _TESTS = [{ - 'url': 'https://www.tele5.de/mediathek/filme-online/videos?vid=1549416', + 'url': 'https://www.tele5.de/sea-patrol/ganze-folge/lebenswege/', 'info_dict': { - 'id': '1549416', + 'id': '1630238', 'ext': 'mp4', - 'upload_date': '20180814', - 'timestamp': 1534290623, - 'title': 'Pandorum', + 'upload_date': '20190915', + 'timestamp': 1568553091, + 'title': 'Lebenswege' }, 'params': { 'skip_download': True,