diff options
| author | Sergey M․ <dstftw@gmail.com> | 2016-08-21 21:01:01 +0700 | 
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2016-08-21 21:01:01 +0700 | 
| commit | 92d4cfa358bacff0e79da30ffb0908c7096e82f7 (patch) | |
| tree | d095cf56246117c910dcd52b18309ebc7f832d68 | |
| parent | 3d47ee0a9eb37b2c91dfae80c7f22fda0242dd61 (diff) | |
[kaltura] Fallback ext calculation on caption's format
| -rw-r--r-- | youtube_dl/extractor/kaltura.py | 11 | 
1 files changed, 10 insertions, 1 deletions
| diff --git a/youtube_dl/extractor/kaltura.py b/youtube_dl/extractor/kaltura.py index e0f7366c2..6a8464998 100644 --- a/youtube_dl/extractor/kaltura.py +++ b/youtube_dl/extractor/kaltura.py @@ -36,6 +36,12 @@ class KalturaIE(InfoExtractor):                  '''      _SERVICE_URL = 'http://cdnapi.kaltura.com'      _SERVICE_BASE = '/api_v3/index.php' +    # See https://github.com/kaltura/server/blob/master/plugins/content/caption/base/lib/model/enums/CaptionType.php +    _CAPTION_TYPES = { +        1: 'srt', +        2: 'ttml', +        3: 'vtt', +    }      _TESTS = [          {              'url': 'kaltura:269692:1_1jc2y3e4', @@ -285,9 +291,12 @@ class KalturaIE(InfoExtractor):                  # Continue if caption is not ready                  if f.get('status') != 2:                      continue +                if not caption.get('id'): +                    continue +                caption_format = int_or_none(caption.get('format'))                  subtitles.setdefault(caption.get('languageCode') or caption.get('language'), []).append({                      'url': '%s/api_v3/service/caption_captionasset/action/serve/captionAssetId/%s' % (self._SERVICE_URL, caption['id']), -                    'ext': caption.get('fileExt', 'ttml'), +                    'ext': caption.get('fileExt') or self._CAPTION_TYPES.get(caption_format) or 'ttml',                  })          return { | 
