github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-21 05:43:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #289 from echel0n/dev

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

15
autoProcess/autoProcessTV.py
View file

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

3
autoProcess/migratecfg.py
View file

@ -60,6 +60,9 @@ def migrate():
option = "sbCategory"
if option == "failed_fork": # change this old format
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"
if option == "fork" and value in ["TPB", "TPB-failed", "Pistachitos"]: # Merge all these to "auto"
value = "auto"