github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-20 13:23:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

added TPB and multiple fork handling. # 187

Browse source
This commit is contained in:
clinton-hall 2013-10-21 14:47:35 +10:30
commit 7f51f15d8c
6 changed files with 42 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
autoProcess/autoProcessTV.py
View file

@ -94,9 +94,9 @@ def processEpisode(dirName, nzbName=None, failed=False):
watch_dir = ""
try:
failed_fork = int(config.get("SickBeard", "failed_fork"))
fork = int(config.get("SickBeard", "fork"))
except (ConfigParser.NoOptionError, ValueError):
failed_fork = 0
fork = "default"
try:
transcode = int(config.get("Transcoder", "transcode"))
@ -116,9 +116,10 @@ def processEpisode(dirName, nzbName=None, failed=False):
mediaContainer = (config.get("Extensions", "mediaExtensions")).split(',')
minSampleSize = int(config.get("Extensions", "minSampleSize"))
process_all_exceptions(nzbName.lower(), dirName)
if fork != "TPB":
process_all_exceptions(nzbName.lower(), dirName)
if nzbName != "Manual Run":
if nzbName != "Manual Run" and fork != "TPB":
# Now check if movie files exist in destination:
video = int(0)
for dirpath, dirnames, filenames in os.walk(dirName):
@ -146,7 +147,7 @@ def processEpisode(dirName, nzbName=None, failed=False):
params['quiet'] = 1
# if you have specified you are using development branch from fork https://github.com/Tolstyak/Sick-Beard.git
if failed_fork:
if fork == "failed":
params['dirName'] = dirName
if nzbName != None:
params['nzbName'] = nzbName
@ -156,9 +157,19 @@ def processEpisode(dirName, nzbName=None, failed=False):
else:
Logger.info("The download failed. Sending 'failed' process request to SickBeard's failed branch")
# if you have specified you are using development branch from fork https://github.com/Tolstyak/Sick-Beard.git
if fork == "TPB":
params['dirName'] = dirName
if nzbName != None:
params['nzbName'] = nzbName
params['failed'] = failed
if status == 0:
Logger.info("The download succeeded. Sending process request to SickBeard's failed branch")
else:
Logger.info("The download failed. Sending 'failed' process request to SickBeard's failed branch")
# this is our default behaviour to work with the standard Master branch of SickBeard
else:
elif fork == "default":
params['dir'] = dirName
if nzbName != None:
params['nzbName'] = nzbName

10
autoProcess/migratecfg.py
View file

@ -54,6 +54,12 @@ def migrate():
option, value = item
if option == "category": # change this old format
option = "sbCategory"
if option == "failed_fork": # change this old format
option = "fork"
if int(value) == 1:
value = "failed"
else:
value = "default"
if option == "outputDirectory": # move this to new location format
value = os.path.split(os.path.normpath(value))[0]
confignew.set("Torrent", option, value)
@ -242,8 +248,8 @@ def addnzbget():
section = "SickBeard"
envKeys = ['CATEGORY', 'HOST', 'PORT', 'USERNAME', 'PASSWORD', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FAILED_FORK']
cfgKeys = ['sbCategory', 'host', 'port', 'username', 'password', 'ssl', 'web_root', 'watch_dir', 'failed_fork']
envKeys = ['CATEGORY', 'HOST', 'PORT', 'USERNAME', 'PASSWORD', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK']
cfgKeys = ['sbCategory', 'host', 'port', 'username', 'password', 'ssl', 'web_root', 'watch_dir', 'fork']
for index in range(len(envKeys)):
key = 'NZBPO_SB' + envKeys[index]
if os.environ.has_key(key):