From 4a7a1153286004e3bd5f0f839329f888d14dce8d Mon Sep 17 00:00:00 2001 From: echel0n Date: Sat, 19 Apr 2014 17:08:27 -0700 Subject: [PATCH] Missed another line of code, had to add --- nzbtomedia/__init__.py | 4 ++-- tests/general.py | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py index 09742db0..6e1373c4 100644 --- a/nzbtomedia/__init__.py +++ b/nzbtomedia/__init__.py @@ -283,7 +283,7 @@ def initialize(section=None): FFPROBE = 'ffprobe' if subprocess.call(['which', 'ffmpeg']) != 0: res = subprocess.call([os.path.join(PROGRAM_DIR, 'getffmpeg.sh')], stdout=bitbucket, stderr=bitbucket) - if res or subprocess.call(['which', 'ffmpeg']) != 0: # did not install or ffmpeg still not found. + if res or subprocess.call(['which', 'ffmpeg'], stdout=bitbucket, stderr=bitbucket) != 0: # did not install or ffmpeg still not found. logger.error("Failed to install ffmpeg. Please install manually") logger.info("Cannot transcode video files, disabling transcoding!") TRANSCODE = 0 @@ -291,7 +291,7 @@ def initialize(section=None): if subprocess.call(['which', 'ffprobe']) != 0: res = subprocess.call([os.path.join(PROGRAM_DIR, 'getffmpeg.sh')], stdout=bitbucket, stderr=bitbucket) - if res or subprocess.call(['which', 'ffprobe']) != 0: + if res or subprocess.call(['which', 'ffprobe'], stdout=bitbucket, stderr=bitbucket) != 0: logger.error("Failed to install ffprobe. Please install manually") logger.info("Cannot detect corrupt video files, disabling corrupt video detection!") FFPROBE = None diff --git a/tests/general.py b/tests/general.py index 74549f76..cd4e1f33 100644 --- a/tests/general.py +++ b/tests/general.py @@ -1,7 +1,9 @@ import os import sys import TorrentToMedia -import nzbToMedia +import nzbtomedia +from nzbtomedia.Transcoder import Transcoder +from nzbtomedia.nzbToMediaUtil import listMediaFiles os.environ['TR_TORRENT_DIR']="z:/downloads/complete/movie/The.Lego.Movie.2014.R5.x264.English.XviD-vTg.nfo_0166_-_The.Lego.Movie.2014.R5.x264.English.XviD-vTg.nfo_yEn.cp(tt1490017)" os.environ['TR_TORRENT_NAME']="The.Lego.Movie.2014.R5.x264.English.XviD-vTg.nfo_0166_-_The.Lego.Movie.2014.R5.x264.English.XviD-vTg.nfo_yEn.cp(tt1490017)" @@ -9,4 +11,10 @@ os.environ['TR_TORRENT_ID']="7855bb5c20189a73ea45aaf80c2541dfcf897f9d" os.environ['TR_TORRENT_HASH']="7855bb5c20189a73ea45aaf80c2541dfcf897f9d" # Initialize the config -nzbToMedia.main(sys.argv) +nzbtomedia.initialize() + +for video in listMediaFiles('Y:\Movies\Jobs (2013)'): + if nzbtomedia.TRANSCODE and Transcoder().isVideoGood(video): + print 'Good' + else: + print 'Bad'