aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/common.py
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2016-02-20 22:02:03 +0100
committerremitamine <remitamine@gmail.com>2016-02-20 22:02:03 +0100
commitcafcf657a4e16f0bcf90195f8e35bfcce7faad8e (patch)
treed4b4ffd697459393f72b952a98afdc7495031776 /youtube_dl/extractor/common.py
parent7360db05b43741c2dfa1fd024e9c2f013ed97c9e (diff)
downloadyoutube-dl-cafcf657a4e16f0bcf90195f8e35bfcce7faad8e.tar.xz
add more subtitles mime types to mimetype2ext and fix the platform subtitle extraction
Diffstat (limited to 'youtube_dl/extractor/common.py')
-rw-r--r--youtube_dl/extractor/common.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index f411ea763..c85dcda0c 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -46,6 +46,7 @@ from ..utils import (
xpath_with_ns,
determine_protocol,
parse_duration,
+ mimetype2ext,
)
@@ -1277,16 +1278,7 @@ class InfoExtractor(object):
if not src or src in urls:
continue
urls.append(src)
- ext = textstream.get('ext') or determine_ext(src)
- if not ext:
- type_ = textstream.get('type')
- SUBTITLES_TYPES = {
- 'text/vtt': 'vtt',
- 'text/srt': 'srt',
- 'application/smptett+xml': 'tt',
- }
- if type_ in SUBTITLES_TYPES:
- ext = SUBTITLES_TYPES[type_]
+ ext = textstream.get('ext') or determine_ext(src) or mimetype2ext(textstream.get('type'))
lang = textstream.get('systemLanguage') or textstream.get('systemLanguageName') or textstream.get('lang') or subtitles_lang
subtitles.setdefault(lang, []).append({
'url': src,