[extractor/common] Add support for float durations in _parse_mpd_formats (closes...

[youtube-dl] / youtube_dl / extractor / sportschau.py

diff --git a/youtube_dl/extractor/sportschau.py b/youtube_dl/extractor/sportschau.py
index bf9b075db7e4e4fd8e6b1430620eeda08f8d444d..0d7925a08d43cdcf1acf94f44383a94d16f9c435 100644 (file)
--- a/youtube_dl/extractor/sportschau.py
+++ b/youtube_dl/extractor/sportschau.py
@@ -1,47 +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<id>\w+)\.html'
+    _VALID_URL = r'https?://(?:www\.)?sportschau\.de/(?:[^/]+/)+video-?(?P<id>[^/#?]+)\.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"',
-            '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 = get_element_by_attribute('class', 'headline', webpage)
-        desc = self._html_search_meta('description', 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