From 3d7228a893c1bd101525074fd7031d40898c624c Mon Sep 17 00:00:00 2001 From: echel0n Date: Mon, 31 Mar 2014 00:43:04 -0700 Subject: [PATCH] Added in code to delete params that are not being used before we pass them to SB this way we don't have any potential issues arise from passing a NoneType param --- autoProcess/autoProcessTV.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/autoProcess/autoProcessTV.py b/autoProcess/autoProcessTV.py index bdccdb24..3d5293e3 100644 --- a/autoProcess/autoProcessTV.py +++ b/autoProcess/autoProcessTV.py @@ -146,8 +146,10 @@ def processEpisode(dirName, nzbName=None, failed=False, clientAgent=None, inputC if watch_dir != "" and (not host in ['localhost', '127.0.0.1'] or nzbName == "Manual Run"): dirName = watch_dir - # don't have sickbeard display any output + # configure SB params to pass params['quiet'] = 1 + if nzbName is not None: + params['nzbName'] = nzbName for param in copy.copy(params): if param is "failed": @@ -162,8 +164,8 @@ def processEpisode(dirName, nzbName=None, failed=False, clientAgent=None, inputC else: del params[param] - if nzbName != None: - params['nzbName'] = nzbName + # delete any unused params so we don't pass them to SB by mistake + [params.pop(k) for k,v in params.iteritems() if v is None] if status == 0: Logger.info("The download succeeded. Sending process request to SickBeard's %s branch", fork)