2
0
Эх сурвалжийг харах

[downloader/hls] Use check_executable

Jaime Marquínez Ferrándiz 11 жил өмнө
parent
commit
3c765c68c4

+ 2 - 4
youtube_dl/downloader/hls.py

@@ -3,6 +3,7 @@ import subprocess
 
 
 from .common import FileDownloader
 from .common import FileDownloader
 from ..utils import (
 from ..utils import (
+    check_executable,
     encodeFilename,
     encodeFilename,
 )
 )
 
 
@@ -19,11 +20,8 @@ class HlsFD(FileDownloader):
             encodeFilename(tmpfilename, for_subprocess=True)]
             encodeFilename(tmpfilename, for_subprocess=True)]
 
 
         for program in ['avconv', 'ffmpeg']:
         for program in ['avconv', 'ffmpeg']:
-            try:
-                subprocess.call([program, '-version'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT)
+            if check_executable(program, ['-version']):
                 break
                 break
-            except (OSError, IOError):
-                pass
         else:
         else:
             self.report_error(u'm3u8 download detected but ffmpeg or avconv could not be found. Please install one.')
             self.report_error(u'm3u8 download detected but ffmpeg or avconv could not be found. Please install one.')
         cmd = [program] + args
         cmd = [program] + args