From 09203a19ecc58b284f72c6cbedda9f6023a11afb Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Tue, 15 Jul 2014 22:22:46 +0930 Subject: [PATCH] set the order for auto fork testing. Fixes #491 --- nzbtomedia/nzbToMediaAutoFork.py | 5 ++++- tests/general.py | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nzbtomedia/nzbToMediaAutoFork.py b/nzbtomedia/nzbToMediaAutoFork.py index bfedd90b..67e2a368 100644 --- a/nzbtomedia/nzbToMediaAutoFork.py +++ b/nzbtomedia/nzbToMediaAutoFork.py @@ -62,7 +62,10 @@ def autoFork(section, inputCategory): elif fork == "auto": logger.info("Attempting to auto-detect %s fork" % inputCategory) - for fork in sorted(nzbtomedia.FORKS.iteritems(), reverse=True): + # define the order to test. Default must be first since the default fork doesn't reject parameters. + # then in order of most unique parameters. + for name in [ nzbtomedia.FORK_DEFAULT, nzbtomedia.FORK_FAILED, nzbtomedia.FORK_SICKRAGE, nzbtomedia.FORK_FAILED_TORRENT ]: + fork = [name, nzbtomedia.FORKS[name]] url = "%s%s:%s%s/home/postprocess/processEpisode?%s" % (protocol,host,port,web_root,urllib.urlencode(fork[1])) # attempting to auto-detect fork diff --git a/tests/general.py b/tests/general.py index 6e1a6fce..64383633 100755 --- a/tests/general.py +++ b/tests/general.py @@ -3,6 +3,7 @@ import os import datetime import re import nzbtomedia +from nzbtomedia.nzbToMediaAutoFork import autoFork from nzbtomedia import nzbToMediaDB from nzbtomedia.nzbToMediaUtil import get_downloadInfo @@ -12,6 +13,7 @@ nzbtomedia.initialize() test = nzbtomedia.CFG['SickBeard','NzbDrone']['tv'].isenabled() section = nzbtomedia.CFG.findsection('tv').isenabled() print section +fork, fork_params = autoFork('SickBeard', 'tv') from babelfish import Language print Language('eng')