From 5c1088c542306212584c85d7caed825c8c21f222 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Tue, 26 Aug 2014 21:01:33 +0930
Subject: [PATCH] version 10.6 ready for merge

---
 changelog.txt                              | 8 ++++++++
 nzbtomedia/__init__.py                     | 2 +-
 nzbtomedia/autoProcess/autoProcessMovie.py | 2 +-
 nzbtomedia/autoProcess/autoProcessTV.py    | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 44cc1145..14cc7bb0 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,13 @@
 Change_LOG / History
 
+V10.6 26/08/2014
+
+Impacts All
+Bug Fixes.
+
+Impacts NZBs
+Added FailureLink style feedback to dognzb for failed and corrupt downloads.
+
 V10.5 05/08/2014
 
 Impacts All
diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py
index 775f9089..09a5e86f 100644
--- a/nzbtomedia/__init__.py
+++ b/nzbtomedia/__init__.py
@@ -269,7 +269,7 @@ def initialize(section=None):
     nzbToMediaDB.upgradeDatabase(nzbToMediaDB.DBConnection(), mainDB.InitialSchema)
 
     # Set Version and GIT variables
-    NZBTOMEDIA_VERSION = '10.5'
+    NZBTOMEDIA_VERSION = '10.6'
     VERSION_NOTIFY = int(CFG['General']['version_notify'])
     AUTO_UPDATE = int(CFG['General']['auto_update'])
     GIT_REPO = 'nzbToMedia'
diff --git a/nzbtomedia/autoProcess/autoProcessMovie.py b/nzbtomedia/autoProcess/autoProcessMovie.py
index de251076..b4f20f30 100644
--- a/nzbtomedia/autoProcess/autoProcessMovie.py
+++ b/nzbtomedia/autoProcess/autoProcessMovie.py
@@ -189,7 +189,7 @@ class autoProcessMovie:
                 status = 0
         elif num_files > 0 and good_files < num_files:
             logger.info("Status shown as success from Downloader, but corrupt video files found. Setting as failed.", section)
-            if ('NZBNA_EVENT' in os.environ or 'NZBPP_DIRECTORY' in os.environ) and 'NZBOP_ARTICLECACHE' in os.environ:
+            if os.environ.has_key('NZBOP_VERSION') and os.environ['NZBOP_VERSION'][0:5] >= '14.0':
                 print('[NZB] MARK=BAD')
             if failureLink:
                 failureLink = failureLink + '&corrupt=true'
diff --git a/nzbtomedia/autoProcess/autoProcessTV.py b/nzbtomedia/autoProcess/autoProcessTV.py
index ebb55922..e925c0fb 100644
--- a/nzbtomedia/autoProcess/autoProcessTV.py
+++ b/nzbtomedia/autoProcess/autoProcessTV.py
@@ -130,7 +130,7 @@ class autoProcessTV:
                 logger.info('Found corrupt videos. Setting status Failed')
                 status = 1
                 failed = 1
-                if ('NZBNA_EVENT' in os.environ or 'NZBPP_DIRECTORY' in os.environ) and 'NZBOP_ARTICLECACHE' in os.environ:
+                if os.environ.has_key('NZBOP_VERSION') and os.environ['NZBOP_VERSION'][0:5] >= '14.0':
                     print('[NZB] MARK=BAD')
                 if failureLink:
                     failureLink = failureLink + '&corrupt=true'