X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fradiobremen.py;h=0cbb15f086f4b3c747f2da80f8af813f8dbf50f0;hb=8e7020daef5477a05e6f02c3b59b0bd04b315eb6;hp=9f7e6af1510a68922f92c8b2616c5b86bfa21a4f;hpb=9d247bbd2d972953fbb9e8f9aee67472d3854883;p=youtube-dl
diff --git a/youtube_dl/extractor/radiobremen.py b/youtube_dl/extractor/radiobremen.py
index 9f7e6af15..0cbb15f08 100644
--- a/youtube_dl/extractor/radiobremen.py
+++ b/youtube_dl/extractor/radiobremen.py
@@ -20,6 +20,7 @@ class RadioBremenIE(InfoExtractor):
'duration': 1685,
'width': 512,
'title': 'buten un binnen vom 22. Dezember',
+ 'thumbnail': 're:https?://.*\.jpg$',
'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 +++',
},
}
@@ -27,16 +28,22 @@ class RadioBremenIE(InfoExtractor):
def _real_extract(self, url):
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("
(?P.+)", meta_doc, "title")
- description = self._html_search_regex("(?P.*)
", meta_doc, "description")
- duration = parse_duration(
- self._html_search_regex("Länge:\s+(?P[0-9]+:[0-9]+) | ", meta_doc, "duration"))
-
- page_doc = self._download_webpage(url, video_id, 'Downloading video information')
- pattern = "ardformatplayerclassic\(\'playerbereich\',\'(?P[0-9]+)\',\'.*\',\'(?P[0-9]+)\',\'(?P[0-9]+)\',\'(?P.+)\',\'\'\)"
- mobj = re.search(pattern, page_doc)
+ 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'(?P.+)', meta_doc, 'title')
+ description = self._html_search_regex(
+ r'(?P.*)
', meta_doc, 'description', fatal=False)
+ duration = parse_duration(self._html_search_regex(
+ r'Länge:\s+(?P[0-9]+:[0-9]+) | ',
+ meta_doc, 'duration', fatal=False))
+
+ page_doc = self._download_webpage(
+ url, video_id, 'Downloading video information')
+ mobj = re.search(
+ r"ardformatplayerclassic\(\'playerbereich\',\'(?P[0-9]+)\',\'.*\',\'(?P[0-9]+)\',\'(?P[0-9]+)\',\'(?P.+)\',\'\'\)",
+ 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')))
@@ -44,7 +51,7 @@ class RadioBremenIE(InfoExtractor):
formats = [{
'url': video_url,
'ext': 'mp4',
- 'width': int(mobj.group("width")),
+ 'width': int(mobj.group('width')),
}]
return {
'id': video_id,