Merge branch 'shahid' of https://github.com/remitamine/youtube-dl into remitamine...

[youtube-dl] / youtube_dl / extractor / comcarcoff.py

diff --git a/youtube_dl/extractor/comcarcoff.py b/youtube_dl/extractor/comcarcoff.py
index a2211ee4495eabdc3cc8bada7b4197c84544a0ff..81f3d7697b843d3d9abb23fbc047b8230a69b351 100644 (file)
--- a/youtube_dl/extractor/comcarcoff.py
+++ b/youtube_dl/extractor/comcarcoff.py
@@ -36,7 +36,7 @@ class ComCarCoffIE(InfoExtractor):
             webpage, 'full data json'))
 
         video_id = full_data['activeVideo']['video']
-        video_data = full_data['videos'][video_id]
+        video_data = full_data.get('videos', {}).get(video_id) or full_data['singleshots'][video_id]
         thumbnails = [{
             'url': video_data['images']['thumb'],
         }, {
@@ -53,4 +53,5 @@ class ComCarCoffIE(InfoExtractor):
             'timestamp': parse_iso8601(video_data.get('pubDate')),
             'thumbnails': thumbnails,
             'formats': formats,
+            'webpage_url': 'http://comediansincarsgettingcoffee.com/%s' % (video_data.get('urlSlug', video_data.get('slug'))),
         }