From e24dcade19e93a3737d8a0c7af8c2eb23e7fd9a1 Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Mon, 21 Apr 2014 21:05:21 +0930 Subject: [PATCH] only set failed if we can verify corrupt. only try install if make exists. --- nzbtomedia/__init__.py | 2 +- nzbtomedia/transcoder/transcoder.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py index a573a41c..e7ea1f4b 100644 --- a/nzbtomedia/__init__.py +++ b/nzbtomedia/__init__.py @@ -284,7 +284,7 @@ def initialize(section=None): if not (FFMPEG or FFPROBE): # Auto-install FFMPEG and FFPROBE - if transcoder.install_ffmpeg(): + if subprocess.Popen(['which', 'make'], stdout=subprocess.PIPE).communicate()[0].strip() and transcoder.install_ffmpeg(): FFMPEG = subprocess.Popen(['which', 'ffmpeg'], stdout=subprocess.PIPE).communicate()[0].strip() FFPROBE = subprocess.Popen(['which', 'ffprobe'], stdout=subprocess.PIPE).communicate()[0].strip() else: diff --git a/nzbtomedia/transcoder/transcoder.py b/nzbtomedia/transcoder/transcoder.py index be737840..9056f257 100644 --- a/nzbtomedia/transcoder/transcoder.py +++ b/nzbtomedia/transcoder/transcoder.py @@ -20,7 +20,7 @@ def isVideoGood(videofile): if not nzbtomedia.FFPROBE: logger.error("Cannot detect corrupt video files!, set your ffmpeg_path in your autoProcessMedia.cfg ...", 'TRANSCODER') - return False + return True command = [nzbtomedia.FFPROBE, videofile] try: