[radiobremen] Make code more readable and more resilient to failures

This commit is contained in:
Philipp Hagemeister 2015-01-05 18:17:03 +01:00
parent d7cc31b63e
commit dda620e88c

View File

@ -29,15 +29,21 @@ class RadioBremenIE(InfoExtractor):
video_id = self._match_id(url) video_id = self._match_id(url)
meta_url = "http://www.radiobremen.de/apps/php/mediathek/metadaten.php?id=%s" % 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') meta_doc = self._download_webpage(
title = self._html_search_regex("<h1.*>(?P<title>.+)</h1>", meta_doc, "title") meta_url, video_id, 'Downloading metadata')
description = self._html_search_regex("<p>(?P<description>.*)</p>", meta_doc, "description") title = self._html_search_regex(
duration = parse_duration( r"<h1.*>(?P<title>.+)</h1>", meta_doc, "title")
self._html_search_regex("L&auml;nge:</td>\s+<td>(?P<duration>[0-9]+:[0-9]+)</td>", meta_doc, "duration")) 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') page_doc = self._download_webpage(
pattern = "ardformatplayerclassic\(\'playerbereich\',\'(?P<width>[0-9]+)\',\'.*\',\'(?P<video_id>[0-9]+)\',\'(?P<secret>[0-9]+)\',\'(?P<thumbnail>.+)\',\'\'\)" url, video_id, 'Downloading video information')
mobj = re.search(pattern, page_doc) 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 = ( video_url = (
"http://dl-ondemand.radiobremen.de/mediabase/%s/%s_%s_%s.mp4" % "http://dl-ondemand.radiobremen.de/mediabase/%s/%s_%s_%s.mp4" %
(video_id, video_id, mobj.group("secret"), mobj.group('width'))) (video_id, video_id, mobj.group("secret"), mobj.group('width')))