projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[huffpost] Add support
[youtube-dl]
/
youtube_dl
/
downloader
/
__init__.py
diff --git
a/youtube_dl/downloader/__init__.py
b/youtube_dl/downloader/__init__.py
index 0d9eb0001e774bdf75ccdf31c636947dfeecd330..aaa92bc758e59fce78265ebf01f87236c540e326 100644
(file)
--- a/
youtube_dl/downloader/__init__.py
+++ b/
youtube_dl/downloader/__init__.py
@@
-1,3
+1,5
@@
+from __future__ import unicode_literals
+
from .common import FileDownloader
from .hls import HlsFD
from .http import HttpFD
from .common import FileDownloader
from .hls import HlsFD
from .http import HttpFD
@@
-12,10
+14,11
@@
from ..utils import (
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