Browse Source

[downloader/external] add can_download mathod for checking downloader availibilty and support

totalwebcasting
remitamine 9 years ago
parent
commit
2cb99ebbd0
2 changed files with 6 additions and 2 deletions
  1. +2
    -2
      youtube_dl/downloader/__init__.py
  2. +4
    -0
      youtube_dl/downloader/external.py

+ 2
- 2
youtube_dl/downloader/__init__.py View File

@ -31,13 +31,13 @@ def get_suitable_downloader(info_dict, params={}):
protocol = determine_protocol(info_dict)
info_dict['protocol'] = protocol
if (info_dict.get('start_time') or info_dict.get('end_time')) and FFmpegFD.available() and FFmpegFD.supports(info_dict):
if (info_dict.get('start_time') or info_dict.get('end_time')) 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)
if ed.available() and ed.supports(info_dict):
if ed.can_download(info_dict):
return ed
if protocol == 'm3u8' and params.get('hls_prefer_native'):


+ 4
- 0
youtube_dl/downloader/external.py View File

@ -59,6 +59,10 @@ class ExternalFD(FileDownloader):
def supports(cls, info_dict):
return info_dict['protocol'] in ('http', 'https', 'ftp', 'ftps')
@classmethod
def can_download(cls, info_dict):
return cls.available() and cls.supports(info_dict)
def _option(self, command_option, param):
return cli_option(self.params, command_option, param)


Loading…
Cancel
Save