X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fradiobremen.py;h=2c35f9845177b6bda4dd352f207ee2e36efdcb8d;hb=HEAD;hp=68c78c4f93bad65f168e98a526207bae5d2d8f1f;hpb=f4858a71035549cf82b258d01dda5060aef707b7;p=youtube-dl

diff --git a/youtube_dl/extractor/radiobremen.py b/youtube_dl/extractor/radiobremen.py
index 68c78c4f9..2c35f9845 100644
--- a/youtube_dl/extractor/radiobremen.py
+++ b/youtube_dl/extractor/radiobremen.py
@@ -1,55 +1,63 @@
-# -*- coding: utf-8 -*-
+# coding: utf-8
 
 from __future__ import unicode_literals
 
 import re
 
 from .common import InfoExtractor
+from ..utils import parse_duration
 
 
 class RadioBremenIE(InfoExtractor):
-    _VALID_URL = r'http?://(?:www\.)?radiobremen\.de/mediathek/(index\.html)?\?id=(?P<video_id>[0-9]+)'
+    _VALID_URL = r'http?://(?:www\.)?radiobremen\.de/mediathek/(?:index\.html)?\?id=(?P<id>[0-9]+)'
     IE_NAME = 'radiobremen'
 
     _TEST = {
-        'url': 'http://www.radiobremen.de/mediathek/index.html?id=114720',
+        'url': 'http://www.radiobremen.de/mediathek/?id=141876',
         'info_dict': {
-            'id': '114720',
+            'id': '141876',
             'ext': 'mp4',
-            'height': 288,
+            'duration': 178,
             'width': 512,
-            'title': 'buten un binnen vom 22. Dezember',
-            'description': 'Unter anderem mit diesen Themen: 45 Flüchtlinge sind in Worpswede angekommen +++ Freies Internet für alle: Bremer arbeiten an einem flächendeckenden W-Lan-Netzwerk +++ Aktivisten kämpfen für das Unibad +++ So war das Wetter 2014 +++',
+            'title': 'Druck auf Patrick Öztürk',
+            'thumbnail': r're:https?://.*\.jpg$',
+            'description': 'Gegen den SPD-Bürgerschaftsabgeordneten Patrick Öztürk wird wegen Beihilfe zum gewerbsmäßigen Betrug ermittelt. Am Donnerstagabend sollte er dem Vorstand des SPD-Unterbezirks Bremerhaven dazu Rede und Antwort stehen.',
         },
     }
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('video_id')
-
-        meta_url = "http://www.radiobremen.de/apps/php/mediathek/metadaten.php?id=%s" % video_id
-        meta_doc = self._download_webpage(meta_url, video_id, 'Downloading metadata')
-        title = self._html_search_regex("<h1.*>(?P<title>.+)</h1>", meta_doc, "title")
-        description = self._html_search_regex("<p>(?P<description>.*)</p>", meta_doc, "description")
-        duration = self._html_search_regex("L&auml;nge:</td>\s+<td>(?P<duration>[0-9]+:[0-9]+)</td>", meta_doc, "duration")
-
-        page_doc = self._download_webpage(url, video_id, 'Downloading video information')
-        pattern = "ardformatplayerclassic\(\'playerbereich\',\'(?P<width>[0-9]+)\',\'.*\',\'(?P<video_id>[0-9]+)\',\'(?P<secret>[0-9]+)\',\'(?P<thumbnail>.+)\',\'\'\)"
-        mobj = re.search(pattern, page_doc)
-        width, video_id, secret, thumbnail = int(mobj.group("width")), mobj.group("video_id"), mobj.group("secret"), mobj.group("thumbnail")
-        video_url = "http://dl-ondemand.radiobremen.de/mediabase/{:}/{:}_{:}_{:}.mp4".format(video_id, video_id, secret, width)
-
+        video_id = self._match_id(url)
+
+        meta_url = 'http://www.radiobremen.de/apps/php/mediathek/metadaten.php?id=%s' % video_id
+        meta_doc = self._download_webpage(
+            meta_url, video_id, 'Downloading metadata')
+        title = self._html_search_regex(
+            r'<h1.*>(?P<title>.+)</h1>', meta_doc, 'title')
+        description = self._html_search_regex(
+            r'<p>(?P<description>.*)</p>', meta_doc, 'description', fatal=False)
+        duration = parse_duration(self._html_search_regex(
+            r'L&auml;nge:</td>\s+<td>(?P<duration>[0-9]+:[0-9]+)</td>',
+            meta_doc, 'duration', fatal=False))
+
+        page_doc = self._download_webpage(
+            url, video_id, 'Downloading video information')
+        mobj = re.search(
+            r"ardformatplayerclassic\(\'playerbereich\',\'(?P<width>[0-9]+)\',\'.*\',\'(?P<video_id>[0-9]+)\',\'(?P<secret>[0-9]+)\',\'(?P<thumbnail>.+)\',\'\'\)",
+            page_doc)
+        video_url = (
+            "http://dl-ondemand.radiobremen.de/mediabase/%s/%s_%s_%s.mp4" %
+            (video_id, video_id, mobj.group("secret"), mobj.group('width')))
+
+        formats = [{
+            'url': video_url,
+            'ext': 'mp4',
+            'width': int(mobj.group('width')),
+        }]
         return {
             'id': video_id,
             'title': title,
             'description': description,
             'duration': duration,
-            'formats': [
-                {'url': video_url,
-                 'ext': 'mp4',
-                 'width': width,
-                 'protocol': 'http'
-                 }
-            ],
-            'thumbnail': thumbnail,
+            'formats': formats,
+            'thumbnail': mobj.group('thumbnail'),
         }