From 0155549d6cec6f49279ebe4a5a73cf6dcc6716fe Mon Sep 17 00:00:00 2001
From: Mats <d912e3@gmail.com>
Date: Sat, 27 Sep 2014 19:28:01 +0200
Subject: [PATCH 1/2] [heise] Add new extractor

---
 youtube_dl/extractor/__init__.py |   1 +
 youtube_dl/extractor/heise.py    | 120 +++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 youtube_dl/extractor/heise.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 1f1fc0eb2..d0417a1f2 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -141,6 +141,7 @@
 from .goshgay import GoshgayIE
 from .grooveshark import GroovesharkIE
 from .hark import HarkIE
+from .heise import HeiseIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .hornbunny import HornBunnyIE
diff --git a/youtube_dl/extractor/heise.py b/youtube_dl/extractor/heise.py
new file mode 100644
index 000000000..b3cb10fde
--- /dev/null
+++ b/youtube_dl/extractor/heise.py
@@ -0,0 +1,120 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+import re
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    compat_urllib_parse,
+    get_meta_content,
+    parse_iso8601,
+)
+
+
+class HeiseIE(InfoExtractor):
+    _VALID_URL = (
+        r'^https?://(?:www\.)?heise\.de/video/artikel/' +
+        r'.+?(?P<id>[0-9]+)\.html$'
+    )
+    _TEST = {
+        'url': (
+            'http://www.heise.de/video/artikel/Podcast-c-t-uplink-3-3-' +
+            'Owncloud-Tastaturen-Peilsender-Smartphone-2404147.html'
+        ),
+        'md5': 'ffed432483e922e88545ad9f2f15d30e',
+        'info_dict': {
+            'id': '2404147',
+            'ext': 'mp4',
+            'title': (
+                "Podcast: c't uplink 3.3 – Owncloud / Tastaturen / " +
+                "Peilsender Smartphone"
+            ),
+            'format_id': 'mp4_720',
+            'timestamp': 1411812600,
+            'upload_date': '20140927',
+        }
+    }
+
+    _CONFIG = (
+        r'".+?\?sequenz=(?P<sequenz>.+?)&container=(?P<container>.+?)' +
+        r'(?:&hd=(?P<hd>.+?))?(?:&signature=(?P<signature>.+?))?&callback=\?"'
+    )
+    _PREFIX = 'http://www.heise.de/videout/info?'
+
+    def _warn(self, fmt, *args):
+        self.report_warning(fmt.format(*args), self._id)
+
+    def _parse_config_url(self, html):
+        m = re.search(self._CONFIG, html)
+        if not m:
+            raise ExtractorError('No config found')
+
+        qs = compat_urllib_parse.urlencode(dict((k, v) for k, v
+                                                in m.groupdict().items()
+                                                if v is not None))
+        return self._PREFIX + qs
+
+    def _real_extract(self, url):
+        mobj = re.match(self._VALID_URL, url)
+        self._id = mobj.group('id')
+
+        html = self._download_webpage(url, self._id)
+        config = self._download_json(self._parse_config_url(html), self._id)
+
+        info = {
+            'id': self._id
+        }
+
+        title = get_meta_content('fulltitle', html)
+        if title:
+            info['title'] = title
+        elif config.get('title'):
+            info['title'] = config['title']
+        else:
+            self._warn('title: not found')
+            info['title'] = 'heise'
+
+        if (not config.get('formats') or
+                not hasattr(config['formats'], 'items')):
+            raise ExtractorError('No formats found')
+
+        formats = []
+        for t, rs in config['formats'].items():
+            if not rs or not hasattr(rs, 'items'):
+                self._warn('formats: {0}: no resolutions', t)
+                continue
+
+            for res, obj in rs.items():
+                format_id = '{0}_{1}'.format(t, res)
+
+                if (not obj or not obj.get('url') or
+                        not isinstance(obj['url'], str)):
+                    self._warn('formats: {0}: no url', format_id)
+                    continue
+
+                fmt = {
+                    'url': obj['url'],
+                    'format_id': format_id
+                }
+                try:
+                    fmt['height'] = int(res)
+                except ValueError as e:
+                    self._warn('formats: {0}: height: {1}', t, e)
+
+                formats.append(fmt)
+
+        self._sort_formats(formats)
+        info['formats'] = formats
+
+        if config.get('poster') and isinstance(config['poster'], str):
+            info['thumbnail'] = config['poster']
+
+        date = get_meta_content('date', html)
+        if date and isinstance(date, str):
+            try:
+                info['timestamp'] = parse_iso8601(date)
+            except ValueError as e:
+                self._warn('timestamp: {0}', e)
+
+        return info

From 7b7518124ee433484b485502671e011017bc1897 Mon Sep 17 00:00:00 2001
From: Mats <d912e3@gmail.com>
Date: Sat, 27 Sep 2014 21:12:23 +0200
Subject: [PATCH 2/2] [heise] Don't check string type

Before Python 3 could be unicode, so don't check at all.
---
 youtube_dl/extractor/heise.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/youtube_dl/extractor/heise.py b/youtube_dl/extractor/heise.py
index b3cb10fde..73c953181 100644
--- a/youtube_dl/extractor/heise.py
+++ b/youtube_dl/extractor/heise.py
@@ -88,8 +88,7 @@ def _real_extract(self, url):
             for res, obj in rs.items():
                 format_id = '{0}_{1}'.format(t, res)
 
-                if (not obj or not obj.get('url') or
-                        not isinstance(obj['url'], str)):
+                if not obj or not obj.get('url'):
                     self._warn('formats: {0}: no url', format_id)
                     continue
 
@@ -107,11 +106,11 @@ def _real_extract(self, url):
         self._sort_formats(formats)
         info['formats'] = formats
 
-        if config.get('poster') and isinstance(config['poster'], str):
+        if config.get('poster'):
             info['thumbnail'] = config['poster']
 
         date = get_meta_content('date', html)
-        if date and isinstance(date, str):
+        if date:
             try:
                 info['timestamp'] = parse_iso8601(date)
             except ValueError as e: