fenix
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[downloader/external] Use generalized cli option converters

This commit is contained in:
Sergey M․ 2015-09-05 03:06:28 +06:00
parent 66e289bab4
commit 1195a38f46
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
youtube_dl/downloader/external.py
View File

@ -5,6 +5,10 @@ import subprocess
from .common import FileDownloader from .common import FileDownloader
from ..utils import ( from ..utils import (
cli_option,
cli_valueless_option,
cli_bool_option,
cli_configuration_args,
encodeFilename, encodeFilename,
encodeArgument, encodeArgument,
) )
@ -46,29 +50,16 @@ class ExternalFD(FileDownloader):
return info_dict['protocol'] in ('http', 'https', 'ftp', 'ftps') return info_dict['protocol'] in ('http', 'https', 'ftp', 'ftps')
def _option(self, command_option, param): def _option(self, command_option, param):
param = self.params.get(param) return cli_option(self.params, command_option, param)
if param is None:
return []
return [command_option, param]
def _bool_option(self, command_option, param, true_value='true', false_value='false', separator=None): def _bool_option(self, command_option, param, true_value='true', false_value='false', separator=None):
param = self.params.get(param) return cli_bool_option(self.params, command_option, param, true_value, false_value, separator)
if not isinstance(param, bool):
return []
if separator:
return [command_option + separator + (true_value if param else false_value)]
return [command_option, true_value if param else false_value]
def _valueless_option(self, command_option, param, expected_value=True): def _valueless_option(self, command_option, param, expected_value=True):
param = self.params.get(param) return cli_valueless_option(self.params, command_option, param, expected_value)
return [command_option] if param == expected_value else []
def _configuration_args(self, default=[]): def _configuration_args(self, default=[]):
ex_args = self.params.get('external_downloader_args') return cli_configuration_args(self.params, 'external_downloader_args', default)
if ex_args is None:
return default
assert isinstance(ex_args, list)
return ex_args
def _call_downloader(self, tmpfilename, info_dict): def _call_downloader(self, tmpfilename, info_dict):
""" Either overwrite this or implement _make_cmd """ """ Either overwrite this or implement _make_cmd """