|
@@ -2,6 +2,7 @@
|
|
from __future__ import unicode_literals
|
|
from __future__ import unicode_literals
|
|
|
|
|
|
from .common import InfoExtractor
|
|
from .common import InfoExtractor
|
|
|
|
+from ..compat import compat_str
|
|
from ..utils import (
|
|
from ..utils import (
|
|
int_or_none,
|
|
int_or_none,
|
|
parse_duration,
|
|
parse_duration,
|
|
@@ -14,14 +15,13 @@ class ComCarCoffIE(InfoExtractor):
|
|
_TESTS = [{
|
|
_TESTS = [{
|
|
'url': 'http://comediansincarsgettingcoffee.com/miranda-sings-happy-thanksgiving-miranda/',
|
|
'url': 'http://comediansincarsgettingcoffee.com/miranda-sings-happy-thanksgiving-miranda/',
|
|
'info_dict': {
|
|
'info_dict': {
|
|
- 'id': 'miranda-sings-happy-thanksgiving-miranda',
|
|
|
|
|
|
+ 'id': '2494164',
|
|
'ext': 'mp4',
|
|
'ext': 'mp4',
|
|
'upload_date': '20141127',
|
|
'upload_date': '20141127',
|
|
'timestamp': 1417107600,
|
|
'timestamp': 1417107600,
|
|
'duration': 1232,
|
|
'duration': 1232,
|
|
'title': 'Happy Thanksgiving Miranda',
|
|
'title': 'Happy Thanksgiving Miranda',
|
|
'description': 'Jerry Seinfeld and his special guest Miranda Sings cruise around town in search of coffee, complaining and apologizing along the way.',
|
|
'description': 'Jerry Seinfeld and his special guest Miranda Sings cruise around town in search of coffee, complaining and apologizing along the way.',
|
|
- 'thumbnail': 'http://ccc.crackle.com/images/s5e4_thumb.jpg',
|
|
|
|
},
|
|
},
|
|
'params': {
|
|
'params': {
|
|
'skip_download': 'requires ffmpeg',
|
|
'skip_download': 'requires ffmpeg',
|
|
@@ -39,15 +39,14 @@ class ComCarCoffIE(InfoExtractor):
|
|
r'window\.app\s*=\s*({.+?});\n', webpage, 'full data json'),
|
|
r'window\.app\s*=\s*({.+?});\n', webpage, 'full data json'),
|
|
display_id)['videoData']
|
|
display_id)['videoData']
|
|
|
|
|
|
- video_id = full_data['activeVideo']['video']
|
|
|
|
- video_data = full_data.get('videos', {}).get(video_id) or full_data['singleshots'][video_id]
|
|
|
|
|
|
+ display_id = full_data['activeVideo']['video']
|
|
|
|
+ video_data = full_data.get('videos', {}).get(display_id) or full_data['singleshots'][display_id]
|
|
|
|
+ video_id = compat_str(video_data['mediaId'])
|
|
thumbnails = [{
|
|
thumbnails = [{
|
|
'url': video_data['images']['thumb'],
|
|
'url': video_data['images']['thumb'],
|
|
}, {
|
|
}, {
|
|
'url': video_data['images']['poster'],
|
|
'url': video_data['images']['poster'],
|
|
}]
|
|
}]
|
|
- formats = self._extract_m3u8_formats(
|
|
|
|
- video_data['mediaUrl'], video_id, ext='mp4')
|
|
|
|
|
|
|
|
timestamp = int_or_none(video_data.get('pubDateTime')) or parse_iso8601(
|
|
timestamp = int_or_none(video_data.get('pubDateTime')) or parse_iso8601(
|
|
video_data.get('pubDate'))
|
|
video_data.get('pubDate'))
|
|
@@ -55,6 +54,8 @@ class ComCarCoffIE(InfoExtractor):
|
|
video_data.get('duration'))
|
|
video_data.get('duration'))
|
|
|
|
|
|
return {
|
|
return {
|
|
|
|
+ '_type': 'url_transparent',
|
|
|
|
+ 'url': 'crackle:%s' % video_id,
|
|
'id': video_id,
|
|
'id': video_id,
|
|
'display_id': display_id,
|
|
'display_id': display_id,
|
|
'title': video_data['title'],
|
|
'title': video_data['title'],
|
|
@@ -62,6 +63,7 @@ class ComCarCoffIE(InfoExtractor):
|
|
'timestamp': timestamp,
|
|
'timestamp': timestamp,
|
|
'duration': duration,
|
|
'duration': duration,
|
|
'thumbnails': thumbnails,
|
|
'thumbnails': thumbnails,
|
|
- 'formats': formats,
|
|
|
|
|
|
+ 'season_number': int_or_none(video_data.get('season')),
|
|
|
|
+ 'episode_number': int_or_none(video_data.get('episode')),
|
|
'webpage_url': 'http://comediansincarsgettingcoffee.com/%s' % (video_data.get('urlSlug', video_data.get('slug'))),
|
|
'webpage_url': 'http://comediansincarsgettingcoffee.com/%s' % (video_data.get('urlSlug', video_data.get('slug'))),
|
|
}
|
|
}
|