Merge tag 'upstream/2014.07.15'

[youtubedl] / youtube_dl / downloader / __init__.py

diff --git a/youtube_dl/downloader/__init__.py b/youtube_dl/downloader/__init__.py
index f19b490f186a73f50bdc385661ebecd9b72aec4e..4ea5811a56f77180afea16b2e5fbc30056850b49 100644 (file)
--- a/youtube_dl/downloader/__init__.py
+++ b/youtube_dl/downloader/__init__.py
@@ -1,23 +1,29 @@
+from __future__ import unicode_literals
+

 from .common import FileDownloader
 from .hls import HlsFD
 from .http import HttpFD
 from .mplayer import MplayerFD
 from .rtmp import RtmpFD
 from .common import FileDownloader
 from .hls import HlsFD
 from .http import HttpFD
 from .mplayer import MplayerFD
 from .rtmp import RtmpFD

+from .f4m import F4mFD

 
 from ..utils import (
     determine_ext,
 )
 
 
 from ..utils import (
     determine_ext,
 )
 

+

 def get_suitable_downloader(info_dict):
     """Get the downloader class that can handle the info dict."""
     url = info_dict['url']
 def get_suitable_downloader(info_dict):
     """Get the downloader class that can handle the info dict."""
     url = info_dict['url']

+    protocol = info_dict.get('protocol')

 
     if url.startswith('rtmp'):
         return RtmpFD
 
     if url.startswith('rtmp'):
         return RtmpFD

-    if determine_ext(url) == u'm3u8':
+    if (protocol == 'm3u8') or (protocol is None and determine_ext(url) == 'm3u8'):

         return HlsFD
     if url.startswith('mms') or url.startswith('rtsp'):
         return MplayerFD
         return HlsFD
     if url.startswith('mms') or url.startswith('rtsp'):
         return MplayerFD

+    if determine_ext(url) == 'f4m':
+        return F4mFD

     else:
         return HttpFD
     else:
         return HttpFD

-