From 0df6c1c4fe969931919632917122321132598ffa Mon Sep 17 00:00:00 2001 From: echel0n Date: Sat, 19 Apr 2014 17:17:08 -0700 Subject: [PATCH] Corrected a conditional check mistake for testing corrupt videos --- TorrentToMedia.py | 18 +++++++----------- nzbToMedia.py | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/TorrentToMedia.py b/TorrentToMedia.py index 8391b810..a096d578 100755 --- a/TorrentToMedia.py +++ b/TorrentToMedia.py @@ -53,7 +53,7 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID, status = 0 # Check video files for corruption for video in listMediaFiles(inputDirectory): - if not nzbtomedia.FFPROBE and Transcoder().isVideoGood(video): + if nzbtomedia.FFPROBE and not Transcoder().isVideoGood(video): status = 1 logger.info("Calling autoProcessTV to post-process: %s",inputName) @@ -193,21 +193,17 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID, return status result = 0 - if nzbtomedia.CFG['CouchPotato'][inputCategory]: - # Check video files for corruption - for video in listMediaFiles(inputDirectory): - if not nzbtomedia.FFPROBE and Transcoder().isVideoGood(video): - status = 1 + # Check video files for corruption + for video in listMediaFiles(inputDirectory): + if nzbtomedia.FFPROBE and not Transcoder().isVideoGood(video): + status = 1 + + if nzbtomedia.CFG['CouchPotato'][inputCategory]: logger.info("Calling CouchPotato:" + inputCategory + " to post-process: %s" % (inputName)) download_id = inputHash result = autoProcessMovie().process(outputDestination, inputName, status, clientAgent, download_id, inputCategory) elif nzbtomedia.CFG['SickBeard'][inputCategory]: - # Check video files for corruption - for video in listMediaFiles(inputDirectory): - if not nzbtomedia.FFPROBE and Transcoder().isVideoGood(video): - status = 1 - logger.info("Calling Sick-Beard:" + inputCategory + " to post-process: %s" % (inputName)) result = autoProcessTV().processEpisode(outputDestination, inputName, status, clientAgent, inputCategory) elif nzbtomedia.CFG['NzbDrone'][inputCategory]: diff --git a/nzbToMedia.py b/nzbToMedia.py index 5079f3a5..abd88bd3 100755 --- a/nzbToMedia.py +++ b/nzbToMedia.py @@ -292,7 +292,7 @@ def process(nzbDir, inputName=None, status=0, clientAgent='manual', download_id= if section: # Check video files for corruption for video in listMediaFiles(nzbDir): - if not nzbtomedia.FFPROBE and Transcoder().isVideoGood(video): + if nzbtomedia.FFPROBE and not Transcoder().isVideoGood(video): status = 1 logger.info("Sending %s to %s for post-processing ..." % (inputName, str(section).upper()))