pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-16 10:32:40 +09:00
Code Issues Projects Releases Wiki Activity

Correct detect_executables on Windows (Closes #447, #457)

Browse Source
This commit is contained in:
Philipp Hagemeister 2012-10-08 22:14:19 +02:00
parent b7b4796bf2
commit 65f934dc93
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/PostProcessor.py
View File

@ -71,13 +71,14 @@ class FFmpegExtractAudioPP(PostProcessor):
@staticmethod @staticmethod
def detect_executables(): def detect_executables():
available = {'avprobe' : False, 'avconv' : False, 'ffmpeg' : False, 'ffprobe' : False} def executable(exe):
for path in os.environ["PATH"].split(os.pathsep): try:
for program in available.keys(): subprocess.check_output([exe, '-version'])
exe_file = os.path.join(path, program) except OSError:
if os.path.isfile(exe_file) and os.access(exe_file, os.X_OK): return False
available[program] = exe_file return exe
return available programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']
return dict((program, executable(program)) for program in programs)
def get_audio_codec(self, path): def get_audio_codec(self, path):
if not self._exes['ffprobe'] and not self._exes['avprobe']: return None if not self._exes['ffprobe'] and not self._exes['avprobe']: return None