version 10.6 ready for merge

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

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'

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'

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'