From f56a9dbdbc20eebc7c93a5ea45ddcdf841236e9c Mon Sep 17 00:00:00 2001 From: Nehal Patel Date: Wed, 6 Jul 2016 23:53:10 -0500 Subject: [PATCH] [BrainPOP] Clean up code and account for non-mandatory fields --- youtube_dl/extractor/brainpop.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/youtube_dl/extractor/brainpop.py b/youtube_dl/extractor/brainpop.py index 6b3dd6a92..1dee770e8 100644 --- a/youtube_dl/extractor/brainpop.py +++ b/youtube_dl/extractor/brainpop.py @@ -24,19 +24,19 @@ class BrainPOPIE(InfoExtractor): self.report_extraction(video_id) - ec_token = self._html_search_regex(r'ec_token : \'(.+)\'', webpage, "token") - movie_cdn_path = self._html_search_regex(r'movie_cdn_path : \'(.+)\'', webpage, "cdn path") - mp4 = self._html_search_regex(r'mp4":"([^"]*)', webpage, "mp4") + ec_token = self._html_search_regex(r'ec_token : \'(.+)\'', webpage, 'token') + movie_cdn_path = self._html_search_regex(r'movie_cdn_path : \'(.+)\'', webpage, 'cdn path') + mp4 = self._html_search_regex(r'mp4":"([^"]*)', webpage, 'mp4') - url = movie_cdn_path + mp4.replace("\\", "") + "?" + ec_token + url = movie_cdn_path + mp4.replace('\\', '') + '?' + ec_token - title = self._html_search_regex(r'type":"Movie","name":"([^"]*)"', webpage, "title") + title = self._html_search_regex(r'type":"Movie","name":"([^"]*)"', webpage, 'title') or self._html_search_regex(r'(.+?)', webpage, 'title') - thumbnail_cdn = self._html_search_regex(r"'cdn_path' : '([^']*)'", webpage, "thumbnail cdn") - thumbnail_image = self._html_search_regex(r'type":"Movie","name":"[^"]*","image":"([^"]*)"', webpage, "thumbnail") - thumbnail = thumbnail_cdn + thumbnail_image.replace("\\", "") + thumbnail_cdn = self._html_search_regex(r"'cdn_path' : '([^']*)'", webpage, 'thumbnail cdn', fatal=False) + thumbnail_image = self._html_search_regex(r'type":"Movie","name":"[^"]*","image":"([^"]*)"', webpage, 'thumbnail', fatal=False) + thumbnail = thumbnail_cdn + thumbnail_image.replace('\\', '') - description = self._html_search_regex(r'type":"Movie","name":"[^"]*","image":"[^"]*","description":"([^"]*)"', webpage, "description") + description = self._html_search_regex(r'type":"Movie","name":"[^"]*","image":"[^"]*","description":"([^"]*)"', webpage, 'description', fatal=False) return { 'id': video_id,