Sirius/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move check_executable into a helper ufnction

Browse source
This commit is contained in:
Philipp Hagemeister 2014-01-07 06:23:41 +01:00
parent 2a2e2770cc
commit d70ad093af
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
youtube_dl/postprocessor/ffmpeg.py
View file

@ -7,6 +7,7 @@ import time
from .common import AudioConversionError, PostProcessor
from ..utils import (
check_executable,
compat_subprocess_get_DEVNULL,
encodeFilename,
PostProcessingError,
@ -27,14 +28,8 @@ class FFmpegPostProcessor(PostProcessor):
@staticmethod
def detect_executables():
def executable(exe):
try:
subprocess.Popen([exe, '-version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
except OSError:
return False
return exe
programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']
return dict((program, executable(program)) for program in programs)
return dict((program, check_executable(program, ['-version'])) for program in programs)
def run_ffmpeg_multiple_files(self, input_paths, out_path, opts):
if not self._exes['ffmpeg'] and not self._exes['avconv']: