From: Sergey M․ Date: Tue, 22 Dec 2015 19:10:31 +0000 (+0600) Subject: [comcarcoff] Improve json data regex and modernize X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=4c24ed94640b148882f1ceb400127b3b3afcafd4;p=youtube-dl [comcarcoff] Improve json data regex and modernize --- diff --git a/youtube_dl/extractor/comcarcoff.py b/youtube_dl/extractor/comcarcoff.py index 4391b7ce4..edf5b29a0 100644 --- a/youtube_dl/extractor/comcarcoff.py +++ b/youtube_dl/extractor/comcarcoff.py @@ -31,9 +31,10 @@ class ComCarCoffIE(InfoExtractor): display_id = 'comediansincarsgettingcoffee.com' webpage = self._download_webpage(url, display_id) - full_data = json.loads(self._search_regex( - r'\nwindow.app = (?P.+?);\n', - webpage, 'full data json'))['videoData'] + full_data = self._parse_json( + self._search_regex( + r'window\.app\s*=\s*({.+?});\n', webpage, 'full data json'), + display_id)['videoData'] video_id = full_data['activeVideo']['video'] video_data = full_data.get('videos', {}).get(video_id) or full_data['singleshots'][video_id]