diff --git a/youtube_dl/extractor/tele5.py b/youtube_dl/extractor/tele5.py index f9990d23e..cfa8d2475 100644 --- a/youtube_dl/extractor/tele5.py +++ b/youtube_dl/extractor/tele5.py @@ -1,12 +1,14 @@ # coding: utf-8 from __future__ import unicode_literals +import re + from .common import InfoExtractor from .nexx import NexxIE class Tele5IE(InfoExtractor): - _VALID_URL = r'https://www.tele5.de/[mediathek/filme-online/videos|tv/]' + _VALID_URL = r'https://www\.tele5\.de/(?:mediathek/filme-online/videos\?vid=|tv/)(?P[\w-]+)' _TESTS = [{ 'url': 'https://www.tele5.de/mediathek/filme-online/videos?vid=1550589', @@ -15,26 +17,23 @@ class Tele5IE(InfoExtractor): 'ext': 'mp4', 'upload_date': '20180822', 'timestamp': 1534927316, - 'title': 'SchleFaZ: Atomic Shark' + 'title': 'SchleFaZ: Atomic Shark', } }, { 'url': 'https://www.tele5.de/tv/dark-matter/videos', - 'info_dict': { - 'id': '1548206', - 'ext': 'mp4', - 'title': 'Folge Sechsundzwanzig', - 'timestamp': 1533664358, - 'upload_date': '20180807' - } + 'only_matching': True, }] def _real_extract(self, url): - webpage = self._download_webpage(url, 'N/A') + mobj = re.match(self._VALID_URL, url) + display_id = mobj.group('display_id') + + webpage = self._download_webpage(url, display_id) video_id = self._html_search_regex( - r'id="video-player"\sdata-id="(?P[0-9]+)"', - webpage, 'id') + r'id\s*=\s*["\']video-player["\']\s*data-id\s*=\s*["\']([0-9]+)["\']', + webpage, 'video_id') return self.url_result( - 'https://api.nexx.cloud/v3/759/videos/byid/%s' - % video_id, ie=NexxIE.ie_key()) + 'https://api.nexx.cloud/v3/759/videos/byid/%s' % video_id, + ie=NexxIE.ie_key(), video_id=video_id)