From: Sergey M Date: Tue, 22 Dec 2015 19:05:54 +0000 (+0600) Subject: Merge pull request #7942 from ausbin/comcarcoff-json-fix X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=11208ebbf164dd6335581ccbdab30a7bb4af63d6;hp=774ce35571c08a1532fe4079224239adfdb80e43;p=youtube-dl Merge pull request #7942 from ausbin/comcarcoff-json-fix [comcarcoff] adjust for json updates --- diff --git a/youtube_dl/extractor/comcarcoff.py b/youtube_dl/extractor/comcarcoff.py index 81f3d7697..4391b7ce4 100644 --- a/youtube_dl/extractor/comcarcoff.py +++ b/youtube_dl/extractor/comcarcoff.py @@ -32,8 +32,8 @@ class ComCarCoffIE(InfoExtractor): webpage = self._download_webpage(url, display_id) full_data = json.loads(self._search_regex( - r'', - webpage, 'full data json')) + r'\nwindow.app = (?P.+?);\n', + webpage, 'full data json'))['videoData'] video_id = full_data['activeVideo']['video'] video_data = full_data.get('videos', {}).get(video_id) or full_data['singleshots'][video_id]