X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fsportschau.py;h=0d7925a08d43cdcf1acf94f44383a94d16f9c435;hb=5b6a74856babce30e9e72701259f790322281d3a;hp=28797266f07841df4bb7617b7f26ce4c5e6282f1;hpb=8b61bfd6389b62f054cdf9dcb3436395c82a8e28;p=youtube-dl.git diff --git a/youtube_dl/extractor/sportschau.py b/youtube_dl/extractor/sportschau.py index 28797266f..0d7925a08 100644 --- a/youtube_dl/extractor/sportschau.py +++ b/youtube_dl/extractor/sportschau.py @@ -1,46 +1,38 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor +from .wdr import WDRBaseIE +from ..utils import get_element_by_attribute -class SportschauIE(InfoExtractor): +class SportschauIE(WDRBaseIE): IE_NAME = 'Sportschau' - _VALID_URL = r'https?://(?:www\.)?sportschau\.de/\w+(?:/\w+)?/video(?P\w+)\.html' + _VALID_URL = r'https?://(?:www\.)?sportschau\.de/(?:[^/]+/)+video-?(?P[^/#?]+)\.html' _TEST = { - 'url': 'http://www.sportschau.de/tourdefrance/videoseppeltkokainhatnichtsmitklassischemdopingzutun100.html', + 'url': 'http://www.sportschau.de/uefaeuro2016/videos/video-dfb-team-geht-gut-gelaunt-ins-spiel-gegen-polen-100.html', 'info_dict': { - 'id': 'seppeltkokainhatnichtsmitklassischemdopingzutun100', + 'id': 'mdb-1140188', + 'display_id': 'dfb-team-geht-gut-gelaunt-ins-spiel-gegen-polen-100', 'ext': 'mp4', - 'title': 'Seppelt: "Kokain hat nichts mit klassischem Doping zu tun" - Tour de France - sportschau.de', - 'thumbnail': 're:^https?://.*\.jpg$', - 'description': 'Der ARD-Doping Experte Hajo Seppelt gibt seine Einschätzung zum ersten Dopingfall der diesjährigen Tour de France um den Italiener Luca Paolini ab.', - }, - 'params': { - # m3u8 download - 'skip_download': True, + 'title': 'DFB-Team geht gut gelaunt ins Spiel gegen Polen', + 'description': 'Vor dem zweiten Gruppenspiel gegen Polen herrscht gute Stimmung im deutschen Team. Insbesondere Bastian Schweinsteiger strotzt vor Optimismus nach seinem Tor gegen die Ukraine.', + 'upload_date': '20160615', }, + 'skip': 'Geo-restricted to Germany', } def _real_extract(self, url): video_id = self._match_id(url) - ext = '-mc_defaultQuality-h.json' - json_url = url[:-5] + ext - - json = self._download_json(json_url, video_id) - thumb_url = json['_previewImage'] - - m3u8_url = json['_mediaArray'][1]['_mediaStreamArray'][0]['_stream'][0] - m3u8_formats = self._extract_m3u8_formats(m3u8_url, video_id, ext="mp4") webpage = self._download_webpage(url, video_id) - title = self._html_search_regex(r'(.*?)', webpage, 'title') - desc = self._html_search_meta('description', webpage) + title = get_element_by_attribute('class', 'headline', webpage) + description = self._html_search_meta('description', webpage, 'description') - return { - 'id': video_id, + info = self._extract_wdr_video(webpage, video_id) + + info.update({ 'title': title, - 'formats': m3u8_formats, - 'description': desc, - 'thumbnail': thumb_url, - } + 'description': description, + }) + + return info