about summary refs log tree commit diff
path: root/youtube_dl/extractor/sixplay.py
diff options
context:
space:
mode:
authorRemita Amine <remitamine@gmail.com>2016-07-06 09:11:46 +0100
committerRemita Amine <remitamine@gmail.com>2016-07-06 09:11:46 +0100
commitab49d7a9fae08763de549f85ba138b22f9122a99 (patch)
treed4a2c796088234b9553db074ccbd5ae1752a540c /youtube_dl/extractor/sixplay.py
parentb4173f1551c47f64745cb91451c46891e2aaac16 (diff)
downloadyoutube-dl-ab49d7a9fae08763de549f85ba138b22f9122a99.tar.gz
youtube-dl-ab49d7a9fae08763de549f85ba138b22f9122a99.tar.xz
youtube-dl-ab49d7a9fae08763de549f85ba138b22f9122a99.zip
use mimetype2ext to determine manifest ext in multiple extractors
Diffstat (limited to 'youtube_dl/extractor/sixplay.py')
-rw-r--r--youtube_dl/extractor/sixplay.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/youtube_dl/extractor/sixplay.py b/youtube_dl/extractor/sixplay.py
index 759a332d2..d3aba58a2 100644
--- a/youtube_dl/extractor/sixplay.py
+++ b/youtube_dl/extractor/sixplay.py
@@ -5,6 +5,8 @@ from .common import InfoExtractor
 from ..utils import (
     qualities,
     int_or_none,
+    mimetype2ext,
+    determine_ext,
 )
 
 
@@ -34,19 +36,21 @@ class SixPlayIE(InfoExtractor):
             source_type, source_url = source.get('type'), source.get('src')
             if not source_url or source_type == 'hls/primetime':
                 continue
-            if source_type == 'application/vnd.apple.mpegURL':
+            ext = mimetype2ext(source_type) or determine_ext(source_url)
+            if ext == 'm3u8':
                 formats.extend(self._extract_m3u8_formats(
                     source_url, video_id, 'mp4', 'm3u8_native',
                     m3u8_id='hls', fatal=False))
                 formats.extend(self._extract_f4m_formats(
                     source_url.replace('.m3u8', '.f4m'),
                     video_id, f4m_id='hds', fatal=False))
-            elif source_type == 'video/mp4':
+            elif ext == 'mp4':
                 quality = source.get('quality')
                 formats.append({
                     'url': source_url,
                     'format_id': quality,
                     'quality': quality_key(quality),
+                    'ext': ext,
                 })
         self._sort_formats(formats)