aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-01-05 18:17:03 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-01-05 18:17:03 +0100
commitdda620e88c68e995afcc3cd35b9d360cb42527a0 (patch)
treeeb5cab3d4555544af9405ff83e9e91013a9dac86
parentd7cc31b63e1efaf5762f38897d4c717901e127e3 (diff)
downloadyoutube-dl-dda620e88c68e995afcc3cd35b9d360cb42527a0.tar.xz
[radiobremen] Make code more readable and more resilient to failures
-rw-r--r--youtube_dl/extractor/radiobremen.py24
1 files changed, 15 insertions, 9 deletions
diff --git a/youtube_dl/extractor/radiobremen.py b/youtube_dl/extractor/radiobremen.py
index 057dc15ab..0d706312e 100644
--- a/youtube_dl/extractor/radiobremen.py
+++ b/youtube_dl/extractor/radiobremen.py
@@ -29,15 +29,21 @@ class RadioBremenIE(InfoExtractor):
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("<h1.*>(?P<title>.+)</h1>", meta_doc, "title")
- description = self._html_search_regex("<p>(?P<description>.*)</p>", meta_doc, "description")
- duration = parse_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)
+ 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')))