Merge tag 'upstream/2016.06.25'

[youtubedl] / youtube_dl / downloader / __init__.py

diff --git a/youtube_dl/downloader/__init__.py b/youtube_dl/downloader/__init__.py
index dccc59212d3028bb9a96f0eb9ffff4acb0be681e..817591d97e88606b966b7055026f691faab840dc 100644 (file)
--- a/youtube_dl/downloader/__init__.py
+++ b/youtube_dl/downloader/__init__.py
@@ -1,14 +1,16 @@
 from __future__ import unicode_literals
 
 from .common import FileDownloader
 from __future__ import unicode_literals
 
 from .common import FileDownloader

-from .external import get_external_downloader

 from .f4m import F4mFD
 from .hls import HlsFD
 from .f4m import F4mFD
 from .hls import HlsFD

-from .hls import NativeHlsFD

 from .http import HttpFD
 from .http import HttpFD

-from .rtsp import RtspFD

 from .rtmp import RtmpFD
 from .dash import DashSegmentsFD
 from .rtmp import RtmpFD
 from .dash import DashSegmentsFD

+from .rtsp import RtspFD
+from .external import (
+    get_external_downloader,
+    FFmpegFD,
+)

 
 from ..utils import (
     determine_protocol,
 
 from ..utils import (
     determine_protocol,


@@ -16,8 +18,8 @@ from ..utils import (
 
 PROTOCOL_MAP = {
     'rtmp': RtmpFD,
 
 PROTOCOL_MAP = {
     'rtmp': RtmpFD,

-    'm3u8_native': NativeHlsFD,
-    'm3u8': HlsFD,
+    'm3u8_native': HlsFD,
+    'm3u8': FFmpegFD,

     'mms': RtspFD,
     'rtsp': RtspFD,
     'f4m': F4mFD,
     'mms': RtspFD,
     'rtsp': RtspFD,
     'f4m': F4mFD,


@@ -30,14 +32,20 @@ def get_suitable_downloader(info_dict, params={}):
     protocol = determine_protocol(info_dict)
     info_dict['protocol'] = protocol
 
     protocol = determine_protocol(info_dict)
     info_dict['protocol'] = protocol
 

+    # if (info_dict.get('start_time') or info_dict.get('end_time')) and not info_dict.get('requested_formats') and FFmpegFD.can_download(info_dict):
+    #     return FFmpegFD
+

     external_downloader = params.get('external_downloader')
     if external_downloader is not None:
         ed = get_external_downloader(external_downloader)
     external_downloader = params.get('external_downloader')
     if external_downloader is not None:
         ed = get_external_downloader(external_downloader)

-        if ed.supports(info_dict):
+        if ed.can_download(info_dict):

             return ed
 
             return ed
 

-    if protocol == 'm3u8' and params.get('hls_prefer_native'):
-        return NativeHlsFD
+    if protocol == 'm3u8' and params.get('hls_prefer_native') is True:
+        return HlsFD
+
+    if protocol == 'm3u8_native' and params.get('hls_prefer_native') is False:
+        return FFmpegFD

 
     return PROTOCOL_MAP.get(protocol, HttpFD)
 
 
     return PROTOCOL_MAP.get(protocol, HttpFD)