From 4b1aead092c6edb40e96ec3273c58b424ee95ee3 Mon Sep 17 00:00:00 2001 From: Hier631 <34473369+Hier631@users.noreply.github.com> Date: Wed, 20 Dec 2017 21:44:53 +0100 Subject: [PATCH] Updated fix for Heise extractor --- youtube_dl/extractor/heise.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/heise.py b/youtube_dl/extractor/heise.py index eca5b5267..3039ac015 100644 --- a/youtube_dl/extractor/heise.py +++ b/youtube_dl/extractor/heise.py @@ -58,7 +58,8 @@ class HeiseIE(InfoExtractor): def _real_extract(self, url): mobile_url = re.sub(r'^(https?://)(?:www\.)?', r'\1m.', url) video_id = self._match_id(mobile_url) - webpage = self._download_webpage(mobile_url, video_id) + webpage = self._download_webpage(url, video_id) + mobile_webpage = self._download_webpage(mobile_url, video_id) title = self._html_search_meta('fulltitle', webpage, default=None) if not title or title == "c't": @@ -72,10 +73,10 @@ class HeiseIE(InfoExtractor): container_id = self._search_regex( r'
]+data-container="([0-9]+)"', - webpage, 'container ID') + mobile_webpage, 'container ID') sequenz_id = self._search_regex( r'
]+data-sequenz="([0-9]+)"', - webpage, 'sequenz ID') + mobile_webpage, 'sequenz ID') doc = self._download_xml( 'http://www.heise.de/videout/feed', video_id, query={ @@ -100,7 +101,7 @@ class HeiseIE(InfoExtractor): description = self._og_search_description( webpage, default=None) or self._html_search_meta( - 'description', webpage, default=None) + 'description', webpage) return { 'id': video_id, @@ -109,6 +110,6 @@ class HeiseIE(InfoExtractor): 'thumbnail': (xpath_text(doc, './/{http://rss.jwpcdn.com/}image') or self._og_search_thumbnail(webpage)), 'timestamp': parse_iso8601( - self._html_search_meta('date', webpage, default=None)), + self._html_search_meta('date', webpage)), 'formats': formats, }