aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/comcarcoff.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-12-23 01:10:31 +0600
committerSergey M․ <dstftw@gmail.com>2015-12-23 01:16:14 +0600
commit4c24ed94640b148882f1ceb400127b3b3afcafd4 (patch)
tree386fcf2f6fc02f7d25ee873556c78a970fd3fa9e /youtube_dl/extractor/comcarcoff.py
parent11208ebbf164dd6335581ccbdab30a7bb4af63d6 (diff)
downloadyoutube-dl-4c24ed94640b148882f1ceb400127b3b3afcafd4.zip
youtube-dl-4c24ed94640b148882f1ceb400127b3b3afcafd4.tar.gz
youtube-dl-4c24ed94640b148882f1ceb400127b3b3afcafd4.tar.bz2
[comcarcoff] Improve json data regex and modernize
Diffstat (limited to 'youtube_dl/extractor/comcarcoff.py')
-rw-r--r--youtube_dl/extractor/comcarcoff.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/youtube_dl/extractor/comcarcoff.py b/youtube_dl/extractor/comcarcoff.py
index 4391b7c..edf5b29 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<json>.+?);\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]