X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fcrackle.py;h=25c5e7d0420a8e1afaded3be54a00c041ea69baa;hb=ec85ded83cbfa652ba94cb080aab52d8b270212a;hp=21f94d33cab20b006d7a826600e213afb02d02f1;hpb=b54a2da4333556baa3b34fc595060223181320d1;p=youtube-dl

diff --git a/youtube_dl/extractor/crackle.py b/youtube_dl/extractor/crackle.py
index 21f94d33c..25c5e7d04 100644
--- a/youtube_dl/extractor/crackle.py
+++ b/youtube_dl/extractor/crackle.py
@@ -1,8 +1,6 @@
 # coding: utf-8
 from __future__ import unicode_literals, division
 
-import re
-
 from .common import InfoExtractor
 from ..utils import int_or_none
 
@@ -16,7 +14,7 @@ class CrackleIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Everybody Respects A Bloody Nose',
             'description': 'Jerry is kaffeeklatsching in L.A. with funnyman J.B. Smoove (Saturday Night Live, Real Husbands of Hollywood). They’re headed for brew at 10 Speed Coffee in a 1964 Studebaker Avanti.',
-            'thumbnail': 're:^https?://.*\.jpg',
+            'thumbnail': r're:^https?://.*\.jpg',
             'duration': 906,
             'series': 'Comedians In Cars Getting Coffee',
             'season_number': 8,
@@ -34,6 +32,7 @@ class CrackleIE(InfoExtractor):
     }
 
     # extracted from http://legacyweb-us.crackle.com/flash/ReferrerRedirect.ashx
+    _THUMBNAIL_TEMPLATE = 'http://images-us-am.crackle.com/%stnl_1920x1080.jpg?ts=20140107233116?c=635333335057637614'
     _MEDIA_FILE_SLOTS = {
         'c544.flv': {
             'width': 544,
@@ -69,8 +68,10 @@ class CrackleIE(InfoExtractor):
         formats = self._extract_m3u8_formats(
             'http://content.uplynk.com/ext/%s/%s.m3u8' % (config_doc.attrib['strUplynkOwnerId'], video_id),
             video_id, 'mp4', m3u8_id='hls', fatal=None)
+        thumbnail = None
         path = item.attrib.get('p')
         if path:
+            thumbnail = self._THUMBNAIL_TEMPLATE % path
             http_base_url = 'http://ahttp.crackle.com/' + path
             for mfs_path, mfs_info in self._MEDIA_FILE_SLOTS.items():
                 formats.append({
@@ -91,22 +92,6 @@ class CrackleIE(InfoExtractor):
                     }]
         self._sort_formats(formats, ('width', 'height', 'tbr', 'format_id'))
 
-        media_details = self._download_json(
-            'https://web-api-us.crackle.com/Service.svc/details/media/%s/TW?format=json' % video_id,
-            video_id, fatal=False)
-        thumbnails = []
-        if media_details:
-            for key, value in media_details.items():
-                mobj = re.match('^Thumbnail_(\d+)x(\d+)$', key)
-                if mobj:
-                    width, height = list(map(int, mobj.groups()))
-                    thumbnails.append({
-                        'id': '%dp' % height,
-                        'url': value,
-                        'width': width,
-                        'height': height,
-                    })
-
         return {
             'id': video_id,
             'title': title,
@@ -115,7 +100,7 @@ class CrackleIE(InfoExtractor):
             'series': item.attrib.get('sn'),
             'season_number': int_or_none(item.attrib.get('se')),
             'episode_number': int_or_none(item.attrib.get('ep')),
-            'thumbnails': thumbnails,
+            'thumbnail': thumbnail,
             'subtitles': subtitles,
             'formats': formats,
         }