set the order for auto fork testing. Fixes #491

This commit is contained in:
clinton-hall 2014-07-15 22:22:46 +09:30
commit 09203a19ec
2 changed files with 6 additions and 1 deletions

View file

@ -62,7 +62,10 @@ def autoFork(section, inputCategory):
elif fork == "auto": elif fork == "auto":
logger.info("Attempting to auto-detect %s fork" % inputCategory) 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])) url = "%s%s:%s%s/home/postprocess/processEpisode?%s" % (protocol,host,port,web_root,urllib.urlencode(fork[1]))
# attempting to auto-detect fork # attempting to auto-detect fork

View file

@ -3,6 +3,7 @@ import os
import datetime import datetime
import re import re
import nzbtomedia import nzbtomedia
from nzbtomedia.nzbToMediaAutoFork import autoFork
from nzbtomedia import nzbToMediaDB from nzbtomedia import nzbToMediaDB
from nzbtomedia.nzbToMediaUtil import get_downloadInfo from nzbtomedia.nzbToMediaUtil import get_downloadInfo
@ -12,6 +13,7 @@ nzbtomedia.initialize()
test = nzbtomedia.CFG['SickBeard','NzbDrone']['tv'].isenabled() test = nzbtomedia.CFG['SickBeard','NzbDrone']['tv'].isenabled()
section = nzbtomedia.CFG.findsection('tv').isenabled() section = nzbtomedia.CFG.findsection('tv').isenabled()
print section print section
fork, fork_params = autoFork('SickBeard', 'tv')
from babelfish import Language from babelfish import Language
print Language('eng') print Language('eng')