depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-26 20:22:14 +00:00
Code Issues Releases Wiki Activity

[comcarcoff] Improve json data regex and modernize

Browse source
This commit is contained in:
Sergey M․ 2015-12-23 01:10:31 +06:00
parent 11208ebbf1
commit 4c24ed9464
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
youtube_dl/extractor/comcarcoff.py
View file

@ -31,9 +31,10 @@ class ComCarCoffIE(InfoExtractor):
display_id = 'comediansincarsgettingcoffee.com' display_id = 'comediansincarsgettingcoffee.com'
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
full_data = json.loads(self._search_regex( full_data = self._parse_json(
r'\nwindow.app = (?P<json>.+?);\n', self._search_regex(
webpage, 'full data json'))['videoData'] r'window\.app\s*=\s*({.+?});\n', webpage, 'full data json'),
display_id)['videoData']
video_id = full_data['activeVideo']['video'] video_id = full_data['activeVideo']['video']
video_data = full_data.get('videos', {}).get(video_id) or full_data['singleshots'][video_id] video_data = full_data.get('videos', {}).get(video_id) or full_data['singleshots'][video_id]