Merge pull request #289 from echel0n/dev

Fix to param setting code in autoProcessTV
This commit is contained in:
Clinton Hall 2014-03-21 22:03:49 +10:30
commit 719b4ed0ae
2 changed files with 12 additions and 6 deletions

View file

@ -6,6 +6,7 @@ import logging
import shutil import shutil
import time import time
import socket import socket
import copy
import Transcoder import Transcoder
from nzbToMediaEnv import * from nzbToMediaEnv import *
@ -153,13 +154,15 @@ def processEpisode(dirName, nzbName=None, failed=False, clientAgent=None, inputC
params['quiet'] = 1 params['quiet'] = 1
if hasattr(params, "failed"): for param in copy.copy(params):
params['failed'] = failed if param is "failed":
params["failed"] = failed
if hasattr(params, "dirName"): if param is "dirName":
params['dirName'] = dirName params["dirName"] = dirName
else:
params['dir'] = dirName if param is "dir":
params["dir"] = dirName
if nzbName != None: if nzbName != None:
params['nzbName'] = nzbName params['nzbName'] = nzbName

View file

@ -60,6 +60,9 @@ def migrate():
option = "sbCategory" option = "sbCategory"
if option == "failed_fork": # change this old format if option == "failed_fork": # change this old format
option = "fork" option = "fork"
if value not in ["default", "failed", "failed-torrent", "auto"]:
value = "auto"
if option == "fork" and value not in ["default", "failed", "failed-torrent", "auto"]:
value = "auto" value = "auto"
if option == "fork" and value in ["TPB", "TPB-failed", "Pistachitos"]: # Merge all these to "auto" if option == "fork" and value in ["TPB", "TPB-failed", "Pistachitos"]: # Merge all these to "auto"
value = "auto" value = "auto"